Update OSX build script, now correctly builds PyQt UIs

data/macos/build.sh

@@ -36,7 +36,7 @@ export LDLAGS=-m32
 export PATH=/opt/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=/opt/carla32/lib/pkgconfig
 
-# make posix32 $JOBS
+make posix32 $JOBS
 
 ##############################################################################################
 # Build Mac App
@@ -58,27 +58,26 @@ cp ./source/carla               ./source/Carla.pyw
 cp ./bin/resources/carla-plugin ./source/carla-plugin.pyw
 cp ./bin/resources/bigmeter-ui  ./source/bigmeter-ui.pyw
 cp ./bin/resources/notes-ui     ./source/notes-ui.pyw
-python3 ./data/macos/bundle.py bdist_mac --bundle-name=Carla
-$CXFREEZE --target-dir=./build/plugin/ ./source/carla-plugin.pyw
-$CXFREEZE --target-dir=./build/plugin/ ./source/bigmeter-ui.pyw
-$CXFREEZE --target-dir=./build/plugin/ ./source/notes-ui.pyw
+env SCRIPT_NAME=Carla        python3 ./data/macos/bundle.py bdist_mac --bundle-name=Carla
+env SCRIPT_NAME=carla-plugin python3 ./data/macos/bundle.py bdist_mac --bundle-name=carla-plugin
+env SCRIPT_NAME=bigmeter-ui  python3 ./data/macos/bundle.py bdist_mac --bundle-name=bigmeter-ui
+env SCRIPT_NAME=notes-ui     python3 ./data/macos/bundle.py bdist_mac --bundle-name=notes-ui
 rm ./source/*.pyw
 
-mkdir -p build/Carla.app/Contents/MacOS
 mkdir -p build/Carla.app/Contents/MacOS/resources
 mkdir -p build/Carla.app/Contents/MacOS/styles
-cp    bin/*.dylib           build/Carla.app/Contents/MacOS/
-cp    bin/carla-bridge-*    build/Carla.app/Contents/MacOS/
-cp    bin/carla-discovery-* build/Carla.app/Contents/MacOS/
-cp -r bin/resources/*       build/Carla.app/Contents/MacOS/resources/
-cp    bin/styles/*          build/Carla.app/Contents/MacOS/styles/
+cp     bin/*.dylib           build/Carla.app/Contents/MacOS/
+cp     bin/carla-bridge-*    build/Carla.app/Contents/MacOS/
+cp     bin/carla-discovery-* build/Carla.app/Contents/MacOS/
+cp -LR bin/resources/*       build/Carla.app/Contents/MacOS/resources/
+cp     bin/styles/*          build/Carla.app/Contents/MacOS/styles/
 
 find build/ -type f -name "*.py" -delete
-mv build/plugin/* build/Carla.app/Contents/MacOS/resources/
-rmdir build/plugin
+rm build/Carla.app/Contents/MacOS/resources/carla-plugin
+rm build/Carla.app/Contents/MacOS/resources/*-ui
 
 cd build/Carla.app/Contents/MacOS/resources/
-ln -s ../styles styles
+ln -sf ../*.so* ../Qt* ../imageformats ../platforms .
 cd ../../../../..
 
 cd build/Carla.app/Contents/MacOS/styles
@@ -87,6 +86,12 @@ install_name_tool -change "/opt/carla/lib/QtGui.framework/Versions/5/QtGui"
 install_name_tool -change "/opt/carla/lib/QtWidgets.framework/Versions/5/QtWidgets" @executable_path/QtWidgets carlastyle.dylib
 cd ../../../../..
 
+cp build/carla-plugin.app/Contents/MacOS/carla-plugin build/Carla.app/Contents/MacOS/resources/
+cp build/carla-plugin.app/Contents/MacOS/fcntl.so     build/Carla.app/Contents/MacOS/resources/
+cp build/bigmeter-ui.app/Contents/MacOS/bigmeter-ui   build/Carla.app/Contents/MacOS/resources/
+cp build/notes-ui.app/Contents/MacOS/notes-ui         build/Carla.app/Contents/MacOS/resources/
+rm -rf build/carla-plugin.app build/bigmeter-ui.app build/notes-ui.app
+
 mkdir build-lv2
 mkdir build-lv2/carla-native.lv2
 mkdir build-lv2/carla-native.lv2/resources
@@ -95,7 +100,7 @@ mkdir build-lv2/carla-native.lv2/styles
 cp bin/carla-native.lv2/*.* build-lv2/carla-native.lv2/
 cp bin/carla-bridge-*       build-lv2/carla-native.lv2/
 cp bin/carla-discovery-*    build-lv2/carla-native.lv2/
-cp -r build/Carla.app/Contents/MacOS/resources/* build-lv2/carla-native.lv2/resources/
-cp    build/Carla.app/Contents/MacOS/styles/*    build-lv2/carla-native.lv2/styles/
+cp -LR build/Carla.app/Contents/MacOS/resources/* build-lv2/carla-native.lv2/resources/
+cp     build/Carla.app/Contents/MacOS/styles/*    build-lv2/carla-native.lv2/styles/
 
 ##############################################################################################

data/macos/bundle.py

@@ -5,6 +5,7 @@
 # Imports (cx_Freeze)
 
 from cx_Freeze import setup, Executable
+from os import getenv
 
 # ------------------------------------------------------------------------------------------------------------
 # Imports (Custom Stuff)
@@ -14,7 +15,9 @@ from carla_host import VERSION
 # ------------------------------------------------------------------------------------------------------------
 
 options  = {
-  "packages": ["re", "sip", "subprocess", "inspect"]
+  "packages": ["re", "sip", "subprocess", "inspect"],
+  "create_shared_zip":    False,
+  "append_script_to_exe": True
 }
 
 boptions = {
@@ -25,6 +28,6 @@ setup(name = "Carla",
       version = VERSION,
       description = "Carla Plugin Host",
       options = {"build_exe": options, "bdist_mac": boptions},
-      executables = [Executable("./source/Carla.pyw")])
+      executables = [Executable("./source/%s.pyw" % getenv("SCRIPT_NAME"))])
 
 # ------------------------------------------------------------------------------------------------------------