From 9569e8f8da241d2bf1e99e20cf49d3bac3567af3 Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Thu, 15 Mar 2018 15:41:56 +0100
Subject: [PATCH] Squashed commit of the following:
commit 3fef142e067a28f95db3ffc0d8e82d625051652c
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 15:41:37 2018 +0100
Finalize appveyor works
commit c7f5cf4cdfc85521fd035131b7b69a44cdee5831
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 15:30:22 2018 +0100
Path to Qt bin
commit 2dbd771fb178172e9bb38dcc9880997aef7b79f6
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 15:18:19 2018 +0100
Add path to pyqt5 dll
commit 26efda3b85f731a99590c976543b29ff9a4813fa
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 13:31:58 2018 +0100
Fix path
commit f35c07e340dbb08630cba137acb0904aab6b42e7
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 13:24:01 2018 +0100
Fx call
commit b25de27b8d21bbfd5caf03b1b7a4f94a47611a93
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 13:15:49 2018 +0100
Fix exit ?
commit 41d3abc2df78d977c078f1ba350f4d334785085a
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 13:05:02 2018 +0100
Fix set path
commit d9e2ddd58f260f705a9ab337573efa72fb4e38eb
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu Mar 15 12:58:42 2018 +0100
Set PATH only for gen translations
commit 53a43d7e6e4ad1cfdf0ac2d44845ebb973627f8b
Author: inso <insomniak.fr@gmaiL.com>
Date: Wed Mar 14 08:41:20 2018 +0100
Fix appveyor
---
appveyor.yml | 5 +----
ci/appveyor/build.cmd | 4 +++-
ci/appveyor/gen_translations.cmd | 12 ++++++++++++
ci/appveyor/tests.cmd | 1 +
sakia.spec | 2 +-
5 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 ci/appveyor/gen_translations.cmd
diff --git a/appveyor.yml b/appveyor.yml
index 91203820..ff537056 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 a28c0711..09434902 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 00000000..6b56777c
--- /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 61e3c79a..99c90893 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 743634e9..6ff214e3 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')
--
GitLab