Skip to content

Commit ca3c5f1

Browse files
committed
removes local setup from Mac build script and ensure that lrelease on the local path is used
1 parent d201c68 commit ca3c5f1

24 files changed

+37315
-37318
lines changed

src/build-mac3.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else
1313
export PYTHON=/Library/Frameworks/Python.framework/Versions/3.6
1414
export PYTHONPATH=$PYTHON/lib/python3.6
1515
export PYTHON_V=3.6
16-
export QT_PATH=~/Qt5.10.0/5.10.0/clang_64
16+
export QT_PATH=${PYTHONPATH}/site-packages/PyQt5/Qt
1717
export MACOSX_DEPLOYMENT_TARGET=10.13
1818
fi
1919

@@ -23,7 +23,7 @@ export DYLD_FRAMEWORK_PATH=$QT_PATH/lib
2323

2424
# translations
2525
$PYTHON/bin/pylupdate5 artisan.pro
26-
$QT_PATH/bin/lrelease -verbose artisan.pro || true
26+
lrelease -verbose artisan.pro || true
2727

2828
# distribution
2929
rm -rf build dist

src/setup-mac3.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ def my_parse_makefile(filename, g):
2727
VERSION = artisanlib.__version__
2828
LICENSE = 'GNU General Public License (GPL)'
2929

30-
try:
31-
QTDIR = os.environ["QT_PATH"] + r'/'
32-
except:
33-
QTDIR = r'/Users/luther/Qt5.10.0/5.10.0/clang_64/' # qt5
30+
QTDIR = os.environ["QT_PATH"] + r'/'
3431

3532
APP = ['artisan.py']
3633

0 commit comments

Comments
 (0)