From 5063929780678d73d99bd2900236a69d18f5d745 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 15:33:54 +0200 Subject: [PATCH 01/25] Create appveyor.yml --- appveyor.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..ff9c11634 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,19 @@ +# This is a configuration file for the continuous delivery service provided +# by AppVeyor.com. Its purpose is to automatically build the CEF Python project. +# Please refer to https://github.com/cztomczak/cefpython +# for more information on CEF Python. + +os: Visual Studio 2015 + +configuration: + - Release + +before_build: + - mkdir build + +build: + - cd build + - echo "Building CEF..." + - python ../tools/automate.py --build-cef --ninja-jobs 4 + - echo "Building CEF Python..." + - python ../tools/build.py 58.0 From 0489de2b87a63d9d1455585d4c9663e2b1a55b55 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 15:40:08 +0200 Subject: [PATCH 02/25] Update appveyor.yml --- appveyor.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ff9c11634..4bc5ebeed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,9 +11,10 @@ configuration: before_build: - mkdir build -build: - - cd build - - echo "Building CEF..." - - python ../tools/automate.py --build-cef --ninja-jobs 4 - - echo "Building CEF Python..." - - python ../tools/build.py 58.0 +build_script: +- cmd: >- + cd build + echo "Building CEF..." + python ../tools/automate.py --build-cef --ninja-jobs 4 + echo "Building CEF Python..." + python ../tools/build.py 58.0 From abd5dcbc1c455f3425051c24ecd7f55b705d8d16 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 15:42:55 +0200 Subject: [PATCH 03/25] Update appveyor.yml --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4bc5ebeed..3c62499c8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,9 @@ before_build: - mkdir build build_script: -- cmd: >- - cd build - echo "Building CEF..." - python ../tools/automate.py --build-cef --ninja-jobs 4 - echo "Building CEF Python..." - python ../tools/build.py 58.0 + - cd build; + - echo "Building CEF..."; + - python ../tools/automate.py --build-cef --ninja-jobs 4; + - echo "Building CEF Python..."; + - python ../tools/build.py 58.0; + From 22d127e9be67130144c96a9fcafbfc79799547b9 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 15:44:14 +0200 Subject: [PATCH 04/25] Update appveyor.yml --- appveyor.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3c62499c8..67ac6e634 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,8 @@ before_build: - mkdir build build_script: - - cd build; - - echo "Building CEF..."; - - python ../tools/automate.py --build-cef --ninja-jobs 4; - - echo "Building CEF Python..."; - - python ../tools/build.py 58.0; - + - cd build + - echo "Building CEF..." + - python ../tools/automate.py --build-cef --ninja-jobs 4 + - echo "Building CEF Python..." + - python ../tools/build.py 58.0 From 60d69ba912d29cadabeb982dadd005520a3dc441 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 15:49:03 +0200 Subject: [PATCH 05/25] Update appveyor.yml --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 67ac6e634..95c81fd54 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,6 +8,9 @@ os: Visual Studio 2015 configuration: - Release +install: + - pip install docopt + before_build: - mkdir build From 264622f4d10f1dd090a678c0492dcf29388bb093 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 15:58:17 +0200 Subject: [PATCH 06/25] Update appveyor.yml --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 95c81fd54..d00e6045f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,11 @@ os: Visual Studio 2015 configuration: - Release +environment: + - PYTHON: "C:\\Python270-x64" + install: + - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - pip install docopt before_build: From e3171d6e5ecc7bf2c577db9d9be28ce271d1a10b Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 15:59:08 +0200 Subject: [PATCH 07/25] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d00e6045f..9f1995802 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,8 @@ configuration: - Release environment: - - PYTHON: "C:\\Python270-x64" + global: + - PYTHON: "C:\\Python270-x64" install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" From 77930ff3b991081bcb76feed250a737ce60d5799 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 16:00:01 +0200 Subject: [PATCH 08/25] Update appveyor.yml --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9f1995802..17e892e7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,7 @@ configuration: - Release environment: - global: - - PYTHON: "C:\\Python270-x64" + PYTHON: "C:\\Python270-x64" install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" From 80860b670e0a9a3da5890f8b31a8da4495b9b8fe Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 16:02:20 +0200 Subject: [PATCH 09/25] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 17e892e7d..1ca12af6b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ configuration: - Release environment: - PYTHON: "C:\\Python270-x64" + PYTHON: "C:\\Python27-x64" install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" @@ -20,6 +20,7 @@ before_build: build_script: - cd build + - pip.exe --version - echo "Building CEF..." - python ../tools/automate.py --build-cef --ninja-jobs 4 - echo "Building CEF Python..." From 7c14ba8e2a32d8120cc44d29f3655b451279d618 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 16:27:55 +0200 Subject: [PATCH 10/25] Update appveyor.yml --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1ca12af6b..1497aea37 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,18 +9,17 @@ configuration: - Release environment: - PYTHON: "C:\\Python27-x64" + PYTHON: "C:\\Python34-x64" install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - pip install docopt + - pip install --upgrade -r tools/requirements.txt before_build: - mkdir build build_script: - cd build - - pip.exe --version - echo "Building CEF..." - python ../tools/automate.py --build-cef --ninja-jobs 4 - echo "Building CEF Python..." From b9604781592665f348be1c3113c06010c568d734 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 16:29:41 +0200 Subject: [PATCH 11/25] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1497aea37..439376f56 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ configuration: - Release environment: - PYTHON: "C:\\Python34-x64" + PYTHON: "C:\\Python27-x64" install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" From d7f78ef2ca979caac2a5c56c751dd8cb7c0a715b Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 16:54:21 +0200 Subject: [PATCH 12/25] Update appveyor.yml --- appveyor.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 439376f56..4ab7f4419 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,13 +14,17 @@ environment: install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - pip install --upgrade -r tools/requirements.txt + - ps: Start-FileDownload 'https://github.com/cztomczak/cefpython/releases/download/v57-upstream/cef57_3.2987.1601.gf035232_win64.zip' before_build: - mkdir build + - 7z e cef57_3.2987.1601.gf035232_win64.zip -obuild build_script: - cd build - - echo "Building CEF..." - - python ../tools/automate.py --build-cef --ninja-jobs 4 + - https://github.com/cztomczak/cefpython/releases/download/v57-upstream/cef57_3.2987.1601.gf035232_win64.zip + # Doesnt work? CIPD seems 'stuck' + # - echo "Building CEF..." + #- python ../tools/automate.py --build-cef --ninja-jobs 4 - echo "Building CEF Python..." - - python ../tools/build.py 58.0 + - python ../tools/build.py 57.3 From 60b3ebde6f5e9ade754dca8358d3cba5299dc03a Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 16:58:25 +0200 Subject: [PATCH 13/25] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4ab7f4419..5e3ccb139 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: before_build: - mkdir build - - 7z e cef57_3.2987.1601.gf035232_win64.zip -obuild + - 7z x cef57_3.2987.1601.gf035232_win64.zip -obuild build_script: - cd build From 281c91cf480971b929e45b9e40e1bd7586f303e7 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 17:05:27 +0200 Subject: [PATCH 14/25] Update appveyor.yml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5e3ccb139..dd5e5b94e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,6 @@ before_build: build_script: - cd build - - https://github.com/cztomczak/cefpython/releases/download/v57-upstream/cef57_3.2987.1601.gf035232_win64.zip # Doesnt work? CIPD seems 'stuck' # - echo "Building CEF..." #- python ../tools/automate.py --build-cef --ninja-jobs 4 From d7114c95b372e30ef7d7048c60d2c18209d74d47 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 19:33:19 +0200 Subject: [PATCH 15/25] Update appveyor.yml --- appveyor.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dd5e5b94e..fec42f8e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,25 +5,22 @@ os: Visual Studio 2015 -configuration: - - Release - environment: PYTHON: "C:\\Python27-x64" + CEF_VERSION: "3.3029.1604.g364cd86" install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - pip install --upgrade -r tools/requirements.txt - - ps: Start-FileDownload 'https://github.com/cztomczak/cefpython/releases/download/v57-upstream/cef57_3.2987.1601.gf035232_win64.zip' + - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_%CEF_VERSION%_windows64.tar.bz2' before_build: - mkdir build - - 7z x cef57_3.2987.1601.gf035232_win64.zip -obuild + - 7z x cef_binary_%CEF_VERSION%_windows64.tar.bz2 -obuild build_script: - cd build - # Doesnt work? CIPD seems 'stuck' - # - echo "Building CEF..." - #- python ../tools/automate.py --build-cef --ninja-jobs 4 + - echo "Put prebuilt CEF in place..." + - python ../tools/automate.py --prebuilt-cef - echo "Building CEF Python..." - - python ../tools/build.py 57.3 + - python ../tools/build.py 58.0 From a747cfa7090f86d58d01c6f4d10caa7d34c11b0a Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 19:36:23 +0200 Subject: [PATCH 16/25] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fec42f8e5..a2f5a91ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - pip install --upgrade -r tools/requirements.txt - - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_%CEF_VERSION%_windows64.tar.bz2' + - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_$CEF_VERSION_windows64.tar.bz2' before_build: - mkdir build From 87f5b39067ef9c1fa59788f0f56313b203f879ab Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 19:41:02 +0200 Subject: [PATCH 17/25] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a2f5a91ef..0655fe31e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,11 +12,11 @@ environment: install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - pip install --upgrade -r tools/requirements.txt - - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_$CEF_VERSION_windows64.tar.bz2' + - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2' before_build: - mkdir build - - 7z x cef_binary_%CEF_VERSION%_windows64.tar.bz2 -obuild + - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 -obuild build_script: - cd build From 7f64e4be93ff88e10150e99b6e1003f1f24e8ffa Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 19:45:19 +0200 Subject: [PATCH 18/25] Update appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 0655fe31e..dc2449a7c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,7 @@ install: before_build: - mkdir build - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 -obuild + - dir build build_script: - cd build From 08babd2d089ee6084beed7b84243755d7c9dc1c7 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 19:47:32 +0200 Subject: [PATCH 19/25] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index dc2449a7c..96502f816 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,8 @@ install: before_build: - mkdir build - - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 -obuild + - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 + - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar -obuild - dir build build_script: From e525ad0a1df9d6f36b22e6d11292341336fb8527 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 21:26:55 +0200 Subject: [PATCH 20/25] Update appveyor.yml --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 96502f816..a20fed757 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,11 +10,13 @@ environment: CEF_VERSION: "3.3029.1604.g364cd86" install: - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - ps: Start-FileDownload 'https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip' + - 7z x ninja-win.zip -o c:\projects\ninja + - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;c:\\projects\\ninja;%PATH%" - pip install --upgrade -r tools/requirements.txt - - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2' before_build: + - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2' - mkdir build - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar -obuild From 2b72f5b3aadad73c6e20241a069ab8e84156697c Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 21:30:10 +0200 Subject: [PATCH 21/25] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a20fed757..b391403e7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ environment: install: - ps: Start-FileDownload 'https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip' - - 7z x ninja-win.zip -o c:\projects\ninja + - 7z x ninja-win.zip -oc:\projects\ninja - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;c:\\projects\\ninja;%PATH%" - pip install --upgrade -r tools/requirements.txt From 00859ac5c1d5770a2a1189c26b7a587ee40f8700 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 21:44:39 +0200 Subject: [PATCH 22/25] Update appveyor.yml --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b391403e7..9496ff5f3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,11 +20,11 @@ before_build: - mkdir build - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar -obuild - - dir build + - copy src/windows/py27/stdint.h "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include" build_script: - - cd build - - echo "Put prebuilt CEF in place..." - - python ../tools/automate.py --prebuilt-cef - - echo "Building CEF Python..." - - python ../tools/build.py 58.0 +# - cd build +# - echo "Put prebuilt CEF in place..." +# - python ../tools/automate.py --prebuilt-cef +# - echo "Building CEF Python..." +# - python ../tools/build.py 58.0 From 897d03f762ad39235e180009d15ed97ce8f4828f Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 21:50:07 +0200 Subject: [PATCH 23/25] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9496ff5f3..93d7c973d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ before_build: - mkdir build - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar -obuild - - copy src/windows/py27/stdint.h "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include" + - copy src\windows\py27\stdint.h "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include" build_script: # - cd build From a1d1a0c78207eba3bd29039908793e30cbe597c1 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 11 Sep 2017 21:52:49 +0200 Subject: [PATCH 24/25] Update appveyor.yml --- appveyor.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 93d7c973d..55494e2b8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,10 +21,11 @@ before_build: - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar -obuild - copy src\windows\py27\stdint.h "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include" + - dir "%LocalAppData%" build_script: -# - cd build -# - echo "Put prebuilt CEF in place..." -# - python ../tools/automate.py --prebuilt-cef -# - echo "Building CEF Python..." -# - python ../tools/build.py 58.0 + - cd build + - echo "Put prebuilt CEF in place..." + - python ../tools/automate.py --prebuilt-cef + - echo "Building CEF Python..." + - python ../tools/build.py 58.0 From 6806ca1ea6da1ccd0212467b8a9ab8578bde13bd Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Tue, 12 Sep 2017 12:01:41 +0200 Subject: [PATCH 25/25] Update appveyor.yml --- appveyor.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 55494e2b8..d52e057b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,20 +6,19 @@ os: Visual Studio 2015 environment: - PYTHON: "C:\\Python27-x64" - CEF_VERSION: "3.3029.1604.g364cd86" + CEFVERSION: "3.3029.1604.g364cd86" install: - ps: Start-FileDownload 'https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip' - 7z x ninja-win.zip -oc:\projects\ninja - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;c:\\projects\\ninja;%PATH%" + - "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;c:\\projects\\ninja;%PATH%" - pip install --upgrade -r tools/requirements.txt before_build: - - ps: Start-FileDownload 'http://opensource.spotify.com/cefbuilds/cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2' + - appveyor DownloadFile http://opensource.spotify.com/cefbuilds/cef_binary_%CEFVERSION%_windows64.tar.bz2 - mkdir build - - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar.bz2 - - 7z x cef_binary_3.3029.1604.g364cd86_windows64.tar -obuild + - 7z x cef_binary_%CEFVERSION%_windows64.tar.bz2 + - 7z x cef_binary_%CEFVERSION%_windows64.tar -obuild - copy src\windows\py27\stdint.h "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include" - dir "%LocalAppData%"