diff --git a/appveyor.yml b/appveyor.yml index 9120382070e3bfdfc143e11ac8475ff6d41c649f..ff5370563d18509f335607d78fba7ba38594b734 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,9 +29,7 @@ install: #- dir /b /s /ad c:\Qt\5.6 - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - # Add qt to path - - "SET PATH=%QTDIR%\\bin;%QTDIR%\\lib;%PATH%" - - "SET QT_PLUGIN_PATH=%QTDIR%\\plugins" + #- "SET QT_PLUGIN_PATH=%QTDIR%\\plugins" - echo %PATH% #- choco install -y vcredist2015 - "%CMD_IN_ENV% conda config --set always_yes yes --set changeps1 no" @@ -70,4 +68,3 @@ deploy: prerelease: true on: appveyor_repo_tag: true - diff --git a/ci/appveyor/build.cmd b/ci/appveyor/build.cmd index a28c07117b61ebb5dbcd3f008e721925e552395e..09434902ce2f402c33f35b9134fac375b7bc99a3 100644 --- a/ci/appveyor/build.cmd +++ b/ci/appveyor/build.cmd @@ -19,8 +19,10 @@ pip install packaging python gen_resources.py if %errorlevel% neq 0 exit /b 1s -python gen_translations.py +call .\\ci\\appveyor\\gen_translations.cmd if %errorlevel% neq 0 exit /b 1 +SET PATH=c:\\python35_64\\envs\\test-environment\\lib\\site-packages\\PyQt5\\Qt\\bin;%PATH% + pyinstaller sakia.spec if %errorlevel% neq 0 exit /b 1 diff --git a/ci/appveyor/gen_translations.cmd b/ci/appveyor/gen_translations.cmd new file mode 100644 index 0000000000000000000000000000000000000000..6b56777c15bf1aa3aba50c6aac7d10831519909e --- /dev/null +++ b/ci/appveyor/gen_translations.cmd @@ -0,0 +1,12 @@ +@ECHO ON + +SET PREVPATH=%PATH% +SET PATH=%QTDIR%\\bin;%QTDIR%\\lib;%PATH% + +lrelease -version + +python gen_translations.py +if %errorlevel% neq 0 exit /b 1 + +SET PATH=%PREVPATH% + diff --git a/ci/appveyor/tests.cmd b/ci/appveyor/tests.cmd index 61e3c79ae7545d9c5f931b70fee343862959e63b..99c90893b661c867033b18275f7e3e8b3db008d0 100644 --- a/ci/appveyor/tests.cmd +++ b/ci/appveyor/tests.cmd @@ -4,6 +4,7 @@ call activate test-environment echo "%PATH%" echo "%QT_PLUGIN_PATH%" + python -V call pyuic5 --version diff --git a/sakia.spec b/sakia.spec index 743634e9bcd6d0b78619e7b1aca1bfbaf2eb0cd4..6ff214e32612f6a0acc11490ea958afa469e4dc9 100644 --- a/sakia.spec +++ b/sakia.spec @@ -81,7 +81,7 @@ else: debug=True, strip=False, upx=True, - console=True, + console=False, icon='sakia.ico')