Tweaks for Windows and Linux build

data/linux/build-all.sh

@@ -25,7 +25,7 @@ source common.env
 
 CHROOT_CARLA_DIR="/tmp/carla-src"
 PKG_FOLDER="Carla_2.1-RC1-linux"
-PKGS_NUM="20190227"
+PKGS_NUM="20200116"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # function to remove old stuff
@@ -251,7 +251,7 @@ download_carla_extras()
 {
 
 CHROOT_DIR=${TARGETDIR}/chroot${ARCH}
-CARLA_GIT_VER="2.1~alpha2+git20191016"
+CARLA_GIT_VER="2.1~rc1+git20200116"
 
 cat <<EOF | sudo chroot ${CHROOT_DIR}
 set -e
@@ -455,17 +455,17 @@ ln -s carla-plugin build-vst/carla.vst/resources/carla-plugin-patchbay
 rm build-{lv2,vst}/carla.*/carla-bridge-lv2-modgui
 rm build-{lv2,vst}/carla.*/libcarla_native-plugin.so
 
-mv build-carla carla
-zip --symlinks -r -9 carla.zip carla
+mv build-carla carla-2.1
+zip --symlinks -r -9 carla.zip carla-2.1
 cat data/windows/unzipfx-carla/unzipfx2cat carla.zip > Carla
 chmod +x Carla
-rm -rf carla carla.zip
+rm -rf carla carla-2.1 carla.zip
 
-mv build-carla-control carla-control
-zip --symlinks -r -9 carla-control.zip carla-control
+mv build-carla-control carla-control-2.1
+zip --symlinks -r -9 carla-control.zip carla-control-2.1
 cat data/windows/unzipfx-carla-control/unzipfx2cat carla-control.zip > CarlaControl
 chmod +x CarlaControl
-rm -rf carla-control carla-control.zip
+rm -rf carla-control carla-control-2.1 carla-control.zip
 
 rm -rf ${PKG_FOLDER}${ARCH}
 mkdir ${PKG_FOLDER}${ARCH}

data/windows/pack-win.sh

@@ -33,7 +33,7 @@ fi
 
 source data/windows/common.env
 
-PKG_FOLDER="Carla_2.0-beta1-win${ARCH}"
+PKG_FOLDER="Carla_2.0-RC1-win${ARCH}"
 
 export WIN32=true
 
@@ -239,6 +239,8 @@ make -C unzipfx-carla-control -f Makefile.win32 ${MAKE_ARGS}
 
 # Create zip of Carla and CarlaControl
 rm -f Carla.zip CarlaControl.zip
+mv Carla Carla-2.1
+mv CarlaControl CarlaControl-2.1
 zip -r -9 Carla.zip Carla
 zip -r -9 CarlaControl.zip CarlaControl
 
@@ -253,6 +255,7 @@ chmod +x CarlaControl.exe
 
 # Cleanup
 rm -f Carla.zip CarlaControl.zip
+rm -rf Carla-2.1 CarlaControl-2.1
 
 # Create release zip
 rm -rf ${PKG_FOLDER}

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

@@ -67,10 +67,7 @@ char* sfx_get_tmp_path(int withAppName)
         GetTempPathA(512 - strlen(SFX_APP_MININAME_TITLE), sfx_tmp_path);
 
         if (withAppName == 1)
-        {
-            strcat(sfx_tmp_path, SFX_APP_MININAME_TITLE);
-            strcat(sfx_tmp_path, CARLA_VERSION_STRING);
-        }
+            strcat(sfx_tmp_path, SFX_APP_MININAME_TITLE "-2.1");
     }
 #else
     {
@@ -82,10 +79,7 @@ char* sfx_get_tmp_path(int withAppName)
             strcpy(sfx_tmp_path, "/tmp");
 
         if (withAppName == 1)
-        {
-            strcat(sfx_tmp_path, "/" SFX_APP_MININAME_LCASE);
-            strcat(sfx_tmp_path, CARLA_VERSION_STRING);
-        }
+            strcat(sfx_tmp_path, "/" SFX_APP_MININAME_LCASE "-2.1");
     }
 #endif
 

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

@@ -72,10 +72,7 @@ char* sfx_get_tmp_path(int withAppName)
         GetTempPathA(512 - strlen(SFX_APP_MININAME_TITLE), sfx_tmp_path);
 
         if (withAppName == 1)
-        {
-            strcat(sfx_tmp_path, SFX_APP_MININAME_TITLE);
-            strcat(sfx_tmp_path, CARLA_VERSION_STRING);
-        }
+            strcat(sfx_tmp_path, SFX_APP_MININAME_TITLE "-2.1");
     }
 #else
     {
@@ -87,10 +84,7 @@ char* sfx_get_tmp_path(int withAppName)
             strcpy(sfx_tmp_path, "/tmp");
 
         if (withAppName == 1)
-        {
-            strcat(sfx_tmp_path, "/" SFX_APP_MININAME_LCASE);
-            strcat(sfx_tmp_path, CARLA_VERSION_STRING);
-        }
+            strcat(sfx_tmp_path, "/" SFX_APP_MININAME_LCASE "-2.1");
     }
 #endif