removes local setup from Mac build script and ensure that lrelease on…

… the local path is used
artisan-roaster-scope · Apr 14, 2018 · ca3c5f1 · ca3c5f1
1 parent d201c68
commit ca3c5f1
Show file tree

Hide file tree

Showing 24 changed files with 37,315 additions and 37,318 deletions.
diff --git a/src/build-mac3.sh b/src/build-mac3.sh
@@ -13,7 +13,7 @@ else
     export PYTHON=/Library/Frameworks/Python.framework/Versions/3.6
     export PYTHONPATH=$PYTHON/lib/python3.6
     export PYTHON_V=3.6
-    export QT_PATH=~/Qt5.10.0/5.10.0/clang_64
+    export QT_PATH=${PYTHONPATH}/site-packages/PyQt5/Qt
     export MACOSX_DEPLOYMENT_TARGET=10.13
 fi
 
@@ -23,7 +23,7 @@ export DYLD_FRAMEWORK_PATH=$QT_PATH/lib
 
 # translations
 $PYTHON/bin/pylupdate5 artisan.pro
-$QT_PATH/bin/lrelease -verbose artisan.pro || true
+lrelease -verbose artisan.pro || true
 
 # distribution
 rm -rf build dist

diff --git a/src/setup-mac3.py b/src/setup-mac3.py
@@ -27,10 +27,7 @@ def my_parse_makefile(filename, g):
 VERSION = artisanlib.__version__
 LICENSE = 'GNU General Public License (GPL)'
 
-try:
-    QTDIR = os.environ["QT_PATH"] + r'/'
-except:
-    QTDIR = r'/Users/luther/Qt5.10.0/5.10.0/clang_64/' # qt5
+QTDIR = os.environ["QT_PATH"] + r'/'
 
 APP = ['artisan.py']