Skip to content

Commit

Permalink
make AppVeyor work again
Browse files Browse the repository at this point in the history
  • Loading branch information
wilhelmberg committed Sep 22, 2015
1 parent 207e9dc commit 529f71e
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 18 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.DS_Store
out
profiling
profiling
build
deps
22 changes: 5 additions & 17 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,11 @@ configuration:
- Debug
- Release

os: Visual Studio 2015 Preview
os: Visual Studio 2015

install:
- SET PATH=c:\python27;%PATH%
- SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
- git clone --quiet --depth 1 https://chromium.googlesource.com/external/gyp.git deps/gyp
# note windows requires --generator-output to be absolute
- python deps/gyp/gyp_main.py variant.gyp --depth=. -f msvs -G msvs_version=2013
- set MSBUILD_PLATFORM=%platform%
- if "%MSBUILD_PLATFORM%" == "x86" set MSBUILD_PLATFORM=Win32
- msbuild variant.sln /nologo /p:Configuration=%configuration%;Platform=%MSBUILD_PLATFORM%
- .\"%configuration%"\tests.exe
- CALL scripts\build-appveyor.bat

build: OFF

test: OFF

test_script: OFF

deploy: OFF
build: off
test: off
deploy: off
32 changes: 32 additions & 0 deletions scripts/build-appveyor.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@ECHO OFF
SETLOCAL

SET PATH=c:\python27;%PATH%

ECHO activating VS command prompt
IF /I "%PLATFORM"=="x64" (
CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
) ELSE (
CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
)

IF NOT EXIST deps\gyp git clone --depth 1 https://chromium.googlesource.com/external/gyp.git deps/gyp

CALL deps\gyp\gyp.bat variant.gyp --depth=. ^
-f msvs ^
-G msvs_version=2015 ^
--generator-output=build

SET MSBUILD_PLATFORM=%platform%
IF /I "%MSBUILD_PLATFORM%" == "x86" SET MSBUILD_PLATFORM=Win32


msbuild ^
build\variant.sln ^
/nologo ^
/toolsversion:14.0 ^
/p:PlatformToolset=v140 ^
/p:Configuration=%configuration% ^
/p:Platform=%MSBUILD_PLATFORM%

"%configuration%"\tests.exe
7 changes: 7 additions & 0 deletions scripts/build-local.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@ECHO OFF
SETLOCAL

SET platform=x64
SET configuration=Release

CALL scripts\build-appveyor.bat

0 comments on commit 529f71e

Please sign in to comment.