shithub: aubio

--- a/.appveyor.yml

+++ b/.appveyor.yml

@@ -7,27 +7,27 @@

     # pre-installed python version, see:

     # http://www.appveyor.com/docs/installed-software#python

-    - PYTHON: "C:\\Python27"

+    - PYTHONDIR: "C:\\Python27"

       PYTHON_VERSION: "2.7.x"

       PYTHON_ARCH: "32"

-    - PYTHON: "C:\\Python27-x64"

+    - PYTHONDIR: "C:\\Python27-x64"

       PYTHON_VERSION: "2.7.x"

       PYTHON_ARCH: "64"

-    - PYTHON: "C:\\Python34"

+    - PYTHONDIR: "C:\\Python34"

       PYTHON_VERSION: "3.4.x"

       PYTHON_ARCH: "32"

-    - PYTHON: "C:\\Python34-x64"

+    - PYTHONDIR: "C:\\Python34-x64"

       PYTHON_VERSION: "3.4.x"

       PYTHON_ARCH: "64"

-    - PYTHON: "C:\\Python35"

+    - PYTHONDIR: "C:\\Python35"

       PYTHON_VERSION: "3.5.x"

       PYTHON_ARCH: "32"

-    - PYTHON: "C:\\Python35-x64"

+    - PYTHONDIR: "C:\\Python35-x64"

       PYTHON_VERSION: "3.5.x"

       PYTHON_ARCH: "64"

       # add path required to run preprocessor step

@@ -39,13 +39,13 @@

   - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""

   # Check that we have the expected version and architecture for Python

-  - "%PYTHON%\\python.exe --version"

-  - "%PYTHON%\\python.exe -c \"import struct; print(struct.calcsize('P') * 8)\""

+  - "%PYTHONDIR%\\python.exe --version"

+  - "%PYTHONDIR%\\python.exe -c \"import struct; print(struct.calcsize('P') * 8)\""

   # We need wheel installed to build wheels

-  - "%PYTHON%\\python.exe -m pip install wheel"

+  - "%PYTHONDIR%\\python.exe -m pip install wheel"

-  - "SET PATH=%PATH_EXTRAS%;%PYTHON%;%PYTHON%\\Scripts;%PATH%"

+  - "SET PATH=%PATH_EXTRAS%;%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%"

   - "pip install --disable-pip-version-check --user --upgrade pip"

   - "pip install --upgrade setuptools"

--- a/scripts/get_waf.sh

+++ b/scripts/get_waf.sh

@@ -22,7 +22,6 @@

   tar xf $WAFTARBALL

   pushd waf-$WAFVERSION

-  [ -x $PYTHON ] || PYTHON=`which python`

   NOCLIMB=1 python waf-light --tools=c_emscripten,syms $*

   popd