Fix Windows builds showing console window, misc changes

data/macos/bundle.py

@@ -17,7 +17,7 @@ options  = {
   "packages": ["re", "sip", "subprocess", "inspect"]
 }
 
-boptions  = {
+boptions = {
   "iconfile": "./resources/ico/carla.icns"
 }
 

data/windows/build-win32.sh

@@ -25,10 +25,10 @@ export WINDRES=$MINGW-windres
 
 export WINEARCH=win32
 export WINEPREFIX=~/.winepy3_x86
-export PYTHON_EXE="C:\\\\Python34\\\\python.exe"
+export PYTHON_EXE="wine C:\\\\Python34\\\\python.exe"
 
-export CXFREEZE="wine $PYTHON_EXE C:\\\\Python34\\\\Scripts\\\\cxfreeze"
-export PYUIC="wine $PYTHON_EXE -m PyQt5.uic.pyuic"
+export CXFREEZE="$PYTHON_EXE C:\\\\Python34\\\\Scripts\\\\cxfreeze"
+export PYUIC="$PYTHON_EXE -m PyQt5.uic.pyuic"
 export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe"
 
 export DEFAULT_QT=5
@@ -52,14 +52,19 @@ make $JOBS backend
 # Build UI bridges
 # make $JOBS -C source/bridges ui_lv2-win32 ui_vst-hwnd
 
+export PYTHONPATH=`pwd`/source
+
 rm -rf ./data/windows/Carla
 cp ./source/carla ./source/carla.pyw
-$CXFREEZE --include-modules=subprocess,inspect --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.pyw"
+$PYTHON_EXE ./data/windows/app.py build_exe
 rm -f ./source/carla.pyw
+mv build data/windows/Carla
 
 cd data/windows/
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
+mv Carla/exe.*/* Carla/
+rmdir Carla/exe.*
 
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd
 
@@ -97,4 +102,4 @@ cd ../..
 
 # Testing:
 echo "export WINEPREFIX=~/.winepy3_x86"
-echo "wine $PYTHON_EXE ./source/carla -platformpluginpath \"C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\plugins\\\\platforms\""
+echo "$PYTHON_EXE ./source/carla -platformpluginpath \"C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\plugins\\\\platforms\""

data/windows/build-win64.sh

@@ -26,10 +26,10 @@ export WINDRES=$MINGW-windres
 
 export WINEARCH=win64
 export WINEPREFIX=~/.winepy3_x64
-export PYTHON_EXE="C:\\\\Python34\\\\python.exe"
+export PYTHON_EXE="wine C:\\\\Python34\\\\python.exe"
 
-export CXFREEZE="wine $PYTHON_EXE C:\\\\Python34\\\\Scripts\\\\cxfreeze"
-export PYUIC="wine $PYTHON_EXE -m PyQt5.uic.pyuic"
+export CXFREEZE="$PYTHON_EXE C:\\\\Python34\\\\Scripts\\\\cxfreeze"
+export PYUIC="$PYTHON_EXE -m PyQt5.uic.pyuic"
 export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe"
 
 export DEFAULT_QT=5
@@ -53,14 +53,19 @@ make $JOBS backend
 # Build UI bridges
 # make $JOBS -C source/bridges ui_lv2-win32 ui_vst-hwnd
 
+export PYTHONPATH=`pwd`/source
+
 rm -rf ./data/windows/Carla
 cp ./source/carla ./source/carla.pyw
-$CXFREEZE --include-modules=subprocess,inspect --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.pyw"
+$PYTHON_EXE ./data/windows/app.py build_exe
 rm -f ./source/carla.pyw
+mv build data/windows/Carla
 
 cd data/windows/
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
+mv Carla/exe.*/* Carla/
+rmdir Carla/exe.*
 
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd
 
@@ -98,4 +103,4 @@ cd ../..
 
 # Testing:
 echo "export WINEPREFIX=~/.winepy3_x64"
-echo "wine $PYTHON_EXE ./source/carla -platformpluginpath \"C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\plugins\\\\platforms\""
+echo "$PYTHON_EXE ./source/carla -platformpluginpath \"C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\plugins\\\\platforms\""

data/windows/unzipfx-carla/Makefile.win32

@@ -7,7 +7,7 @@ BUILD_FLAGS  = -DSFX -DWIN32 -DWINDOWS -DFORCE_UNIX_OVER_WIN32 -I. -I.. $(CFLAGS
 BUILD_FLAGS += -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
 BUILD_FLAGS += -DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS
 
-LINK_FLAGS   = -static -mwindows -lkernel32 $(LDFLAGS)
+LINK_FLAGS   = -static -mwindows -lkernel32 -lshell32 $(LDFLAGS)
 
 OBJ  = crc32.o crypt.o extract.o fileio.o globals.o inflate.o match.o process.o ttyio.o ubz2err.o unzip.o zipinfo.o
 OBJ += win32/nt.o win32/win32.o win32/win32i64.o

data/windows/unzipfx-carla/unzipfx/appDetails.c

@@ -50,7 +50,12 @@ int sfx_app_autorun_now()
         strcat(cmdBuf, sfx_app_argv[i]);
     }
 
+#ifdef WIN32
+    ShellExecute(NULL, "open", cmdBuf, NULL, NULL, SW_SHOWNORMAL);
+    return 0;
+#else
     return system(cmdBuf);
+#endif
 }
 
 char* sfx_get_tmp_path(int withAppName)