From c50560b741baca2c8b7c153bd2662fa85cf6593a Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Mon, 4 Apr 2016 08:32:34 +0200
Subject: [PATCH] Force lrelease
---
ci/travis/build.sh | 6 +++++-
gen_translations.py | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ci/travis/build.sh b/ci/travis/build.sh
index f097d6d6..2fa0f5ad 100755
--- a/ci/travis/build.sh
+++ b/ci/travis/build.sh
@@ -4,6 +4,8 @@ eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
cd $HOME/build/ucoin-io/sakia
+
+
pyenv activate sakia-env
pip install coveralls
pip install pyinstaller
@@ -12,10 +14,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]
then
pip install -U git+https://github.com/posborne/dbus-python.git
pip install notify2
+
+ export PATH=/tmp/qt/5.5/5.5/gcc_64/bin:$PATH
fi
python gen_resources.py
-python gen_translations.py
+python gen_translations.py --lrelease
if [ $TRAVIS_OS_NAME == "osx" ]
then
diff --git a/gen_translations.py b/gen_translations.py
index d587a625..35c1d6b0 100644
--- a/gen_translations.py
+++ b/gen_translations.py
@@ -27,7 +27,7 @@ def prepare_qm():
for (ts_file, qm_file) in translations:
# avoid conflict with qt4 lrelease by running qtchooser directly
- if sys.platform.startswith('win') or shutil.which("qtchooser") == None:
+ if sys.platform.startswith('win') or shutil.which("qtchooser") == None or "--lrelease" in sys.argv:
subprocess.call(["lrelease", ts_file, "-qm", qm_file])
else:
subprocess.call(["qtchooser", "-run-tool=lrelease", "-qt=5", ts_file, "-qm", qm_file])
--
GitLab