From 87471b53ab9538724d28b6f212aae30cfb65d727 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 1 Oct 2019 10:58:14 +0200
Subject: [PATCH] PICARD-1618: Include compiled astrcmp in macOS package

---
 picard.spec            | 3 ++-
 scripts/package-osx.sh | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/picard.spec b/picard.spec
index ecf98fad54..b91f0472d9 100644
--- 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
index 3fbe97728c..3e31473c3b 100755
--- 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