Update win/osx build scripts

data/macos/README

@@ -5,4 +5,4 @@ It has some nice features like automation of parameters via MIDI CC and full OSC
 Currently supports LADSPA, DSSI, LV2, VST2/3 and AU plugin formats, plus GIG, SF2 and SFZ sounds banks.
 
 For a complete and updated description of Carla, please check:
-http://kxstudio.sourceforge.net/KXStudio:Applications:Carla
+http://kxstudio.sourceforge.net/Applications:Carla

data/macos/bundle.py

@@ -17,7 +17,9 @@ from carla_host import VERSION
 options  = {
   "packages": ["re", "sip", "subprocess", "inspect"],
   "create_shared_zip":    False,
-  "append_script_to_exe": True
+  "append_script_to_exe": True,
+  "optimize":   True,
+  "compressed": True
 }
 
 boptions = {

data/windows/README.txt

@@ -5,4 +5,4 @@ It has some nice features like automation of parameters via MIDI CC and full OSC
 Currently supports LADSPA, DSSI, LV2, VST2/3 and AU plugin formats, plus GIG, SF2 and SFZ sounds banks.
 
 For a complete and updated description of Carla, please check:
-http://kxstudio.sourceforge.net/KXStudio:Applications:Carla
+http://kxstudio.sourceforge.net/Applications:Carla

data/windows/build-win32.sh

@@ -38,25 +38,7 @@ export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe
 
 export DEFAULT_QT=5
 
-# Clean build
-make clean
-
-# Build PyQt5 resources
-make $JOBS UI RES WIDGETS
-
-# Build discovery
-make $JOBS discovery
-rm -f bin/carla-discovery-win32.exe
-cp bin/carla-discovery-native.exe bin/carla-discovery-win32.exe
-
-# Build backend
-make $JOBS backend
-
-# Build Plugin bridges
-# make $JOBS bridges
-
-# Build UI bridges
-make $JOBS -C source/bridges-ui ui_lv2-windows
+make $JOBS
 
 export PYTHONPATH=`pwd`/source
 
@@ -66,9 +48,14 @@ $PYTHON_EXE ./data/windows/app.py build_exe
 rm -f ./source/Carla.pyw
 
 cd data/windows/
+
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
 rm Carla/carla-discovery-native.exe
+rm Carla/carla-lv2-export.exe
+
+# FIXME
+rm Carla/carla-bridge-lv2-windows.exe
 
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd
 
@@ -88,29 +75,28 @@ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll          Carl
 # Build unzipfx
 make -C unzipfx-carla -f Makefile.win32
 
-# Create static build
+# Create zip of Carla
 rm -f Carla.zip CarlaControl.zip
 zip -r -9 Carla.zip Carla
 
+# Create static build
 rm -f Carla.exe CarlaControl.exe
 cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe
 chmod +x Carla.exe
 
 # Cleanup
-make -C unzipfx-carla -f Makefile.win32 clean
-make -C unzipfx-carla-control -f Makefile.win32 clean
 rm -f Carla.zip CarlaControl.zip
-rm -f unzipfx-*/*.exe
 
-rm -rf Carla-2.0beta3-win32
-mkdir Carla-2.0beta3-win32
-mkdir Carla-2.0beta3-win32/vcredist
-cp Carla.exe README.txt Carla-2.0beta3-win32
-cp ~/.cache/winetricks/vcrun2010/vcredist_x86.exe Carla-2.0beta3-win32/vcredist
-zip -r -9 Carla-2.0beta3-win32.zip Carla-2.0beta3-win32
+# Create release zip
+rm -rf Carla-2.0beta4-win32
+mkdir Carla-2.0beta4-win32
+mkdir Carla-2.0beta4-win32/vcredist
+cp Carla.exe README.txt Carla-2.0beta4-win32
+cp ~/.cache/winetricks/vcrun2010/vcredist_x86.exe Carla-2.0beta4-win32/vcredist
+zip -r -9 Carla-2.0beta4-win32.zip Carla-2.0beta4-win32
 
 cd ../..
 
 # Testing:
 echo "export WINEPREFIX=~/.winepy3_x86"
-echo "$PYTHON_EXE ./source/carla -platformpluginpath \"C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\plugins\\\\platforms\""
+echo "$PYTHON_EXE ./source/carla"

data/windows/build-win64.sh

@@ -39,25 +39,7 @@ export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe
 
 export DEFAULT_QT=5
 
-# Clean build
-make clean
-
-# Build PyQt5 resources
-make $JOBS UI RES WIDGETS
-
-# Build discovery
-make $JOBS discovery
-rm -f bin/carla-discovery-win64.exe
-cp bin/carla-discovery-native.exe bin/carla-discovery-win64.exe
-
-# Build backend
-make $JOBS backend
-
-# Build Plugin bridges
-# make $JOBS bridges
-
-# Build UI bridges
-make $JOBS -C source/bridges-ui ui_lv2-windows
+make $JOBS
 
 export PYTHONPATH=`pwd`/source
 
@@ -67,9 +49,14 @@ $PYTHON_EXE ./data/windows/app.py build_exe
 rm -f ./source/Carla.pyw
 
 cd data/windows/
+
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
 rm Carla/carla-discovery-native.exe
+rm Carla/carla-lv2-export.exe
+
+# FIXME
+rm Carla/carla-bridge-lv2-windows.exe
 
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd
 
@@ -89,29 +76,28 @@ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll          Carl
 # Build unzipfx
 make -C unzipfx-carla -f Makefile.win32
 
-# Create static build
+# Create zip of Carla
 rm -f Carla.zip CarlaControl.zip
 zip -r -9 Carla.zip Carla
 
+# Create static build
 rm -f Carla.exe CarlaControl.exe
 cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe
 chmod +x Carla.exe
 
 # Cleanup
-make -C unzipfx-carla -f Makefile.win32 clean
-make -C unzipfx-carla-control -f Makefile.win32 clean
 rm -f Carla.zip CarlaControl.zip
-rm -f unzipfx-*/*.exe
 
-rm -rf Carla-2.0beta3-win64
-mkdir Carla-2.0beta3-win64
-mkdir Carla-2.0beta3-win64/vcredist
-cp Carla.exe README.txt Carla-2.0beta3-win64
-cp ~/.cache/winetricks/vcrun2010/vcredist_x64.exe Carla-2.0beta3-win64/vcredist
-zip -r -9 Carla-2.0beta3-win64.zip Carla-2.0beta3-win64
+# Create release zip
+rm -rf Carla-2.0beta4-win64
+mkdir Carla-2.0beta4-win64
+mkdir Carla-2.0beta4-win64/vcredist
+cp Carla.exe README.txt Carla-2.0beta4-win64
+cp ~/.cache/winetricks/vcrun2010/vcredist_x64.exe Carla-2.0beta4-win64/vcredist
+zip -r -9 Carla-2.0beta4-win64.zip Carla-2.0beta4-win64
 
 cd ../..
 
 # Testing:
 echo "export WINEPREFIX=~/.winepy3_x64"
-echo "$PYTHON_EXE ./source/carla -platformpluginpath \"C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\plugins\\\\platforms\""
+echo "$PYTHON_EXE ./source/carla"

source/discovery/Makefile

@@ -170,7 +170,7 @@ $(BINDIR)/$(MODULENAME)-native.exe: $(OBJS_native) $(LIBS_native)
 	@$(CXX) $< $(LIBS_START) $(LIBS_native) $(LIBS_END) $(LINK_FLAGS) $(NATIVE_LINK_FLAGS) -o $@
 	@echo "Symlinking $(MODULENAME)-win$(winv).exe"
 	@rm -f $(BINDIR)/$(MODULENAME)-win$(winv).exe
-	@ln -s $(BINDIR)/$(MODULENAME)-native.exe $(BINDIR)/$(MODULENAME)-win$(winv).exe
+	@ln -s $(MODULENAME)-native.exe $(BINDIR)/$(MODULENAME)-win$(winv).exe
 
 $(BINDIR)/$(MODULENAME)-posix32: $(OBJS_posix32) $(LIBS_posix32)
 	-@mkdir -p $(BINDIR)