PICARD-1618: Include compiled astrcmp in macOS package

phw · Oct 1, 2019 · 87471b5 · 87471b5
1 parent e50889e
commit 87471b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/picard.spec b/picard.spec
@@ -89,7 +89,8 @@ pyz = PYZ(a.pure, a.zipped_data,
 exe = EXE(pyz,
           a.scripts,
           exclude_binaries=True,
-          name='picard',
+          # Avoid name clash between picard executable and picard module folder
+          name='picard' if os_name == 'Windows' else 'picard-run',
           debug=False,
           strip=False,
           upx=False,

diff --git a/scripts/package-osx.sh b/scripts/package-osx.sh
@@ -9,9 +9,9 @@ VERSION=$(python3 -c 'import picard; print(picard.__version__)')
 
 rm -rf dist build locale
 python3 setup.py clean
-python3 setup.py build_ext
-python3 setup.py build_locales
-pyinstaller picard.spec
+python3 setup.py build
+python3 setup.py build_ext -i
+pyinstaller --noconfirm --clean picard.spec
 
 CODESIGN=0
 KEYCHAIN_PATH=picard.keychain