diff --git a/appveyor.yml b/appveyor.yml index 384606b9554c212209def28e08b6cf77907f2f19..5b7ad242ec663a87594aedbf467bde1003048f01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ environment: PYTHON_ARCH: "64" CONDA_PY: "35" CONDA_NPY: "18" - QTDIR: "C:\\Qt\\5.6\\5.6\\msvc2015_64" + QTDIR: "C:\\Qt\\5.6\\msvc2015_64" QDOWNLOAD: "http://download.qt.io/development_releases/qt/5.6/5.6.0-beta/qt-opensource-windows-x86-msvc2015_64-5.6.0-beta.exe" QINSTALLER: "qt-opensource-windows-x86-msvc2015_64-5.6.0-beta.exe" platform: x64 @@ -21,7 +21,7 @@ environment: PYTHON_ARCH: "32" CONDA_PY: "35" CONDA_NPY: "18" - QTDIR: "C:\\Qt\\5.6\\5.6\\msvc2015" + QTDIR: "C:\\Qt\\5.6\\msvc2015" QDOWNLOAD: "http://download.qt.io/development_releases/qt/5.6/5.6.0-beta/qt-opensource-windows-x86-msvc2015-5.6.0-beta.exe" QINSTALLER: "qt-opensource-windows-x86-msvc2015-5.6.0-beta.exe" platform: x86 @@ -31,15 +31,12 @@ install: # as well as pip, conda-build, and the binstar CLI - powershell .\\ci\\appveyor\\install.ps1 - - IF NOT EXIST C:\Qt\5.6\5.6 curl -kLO %QDOWNLOAD% - - IF NOT EXIST C:\Qt\5.6\5.6 %QINSTALLER% --script ci\appveyor\qt-installer-noninteractive.qs - # - dir /b /s /ad c:\Qt + - dir /b /s /ad c:\Qt\5.6 - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - "IF EXIST %QTDIR%\\include\\QtNfc MOVE %QTDIR%\\include\\QtNfc %QTDIR%\\include\\QtNfc-disable" # Add qt to path - - "set PATH=%QTDIR%\\bin;%PATH%" + - "set PATH=%QTDIR%\\bin;%QTDIR%\\lib;%PATH%" - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%QTDIR\\lib;%PATH%" - "SET QT_PLUGIN_PATH=%QTDIR%\\plugins" - choco install -y vcredist2015 - "%CMD_IN_ENV% conda config --set always_yes yes --set changeps1 no"