Mixbus32 and 32C packaging

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 9c451d9ffc5c4fb61d8304e67712b50b274ee3f9..2f6817325a0a1ecc72a69f2c1405a11d15b9381c 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -67,6 +67,18 @@ while [ $# -gt 0 ] ; do
                VENDOR=Harrison ;
                EXENAME=mixbus ;
                shift ;;
+       --mixbus32c)
+               MIXBUS=1;
+               WITH_HARRISON_LV2=1 ;
+               WITH_X42_LV2=1 ;
+               WITH_NLS=1 ;
+               WITH_LADSPA=;
+               STRIP=all
+               APPNAME=Mixbus32C ;
+               VENDOR=Harrison ;
+               EXENAME=mixbus32c ;
+               major_version=""
+               shift ;;
        --public)
                WITH_NLS=1 ;
                WITH_LADSPA=;

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 3614df1fe0c741f48bda5f6961241a4be3648b4c..a4bab829b84a80f3c5d414a24d6740b737c69afe 100755 (executable)
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -36,6 +36,9 @@ while [ $# -gt 0 ] ; do
        --mixbus)
                APPNAME=Mixbus ;
                shift ;;
+       --mixbus32c)
+               APPNAME=Mixbus32C ;
+               shift ;;
        --public)
                APPNAME=Ardour ;
                shift ;;

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index ab05d6910dddb2fa93db546419023521a2e2a839..920a7b3283cd9cc542649898a067527beabb5596 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -16,6 +16,7 @@ mkdir -p "$CACHEDIR"
 
 SAE=
 MIXBUS=
+MIXBUS32C=
 WITH_HARVID=1
 WITH_HARRISON_LV2=
 WITH_X42_LV2=
@@ -25,6 +26,8 @@ PRINT_SYSDEPS=
 WITH_NLS=
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 
+. ../define_versions.sh
+
 while [ $# -gt 0 ] ; do
     echo "arg = $1"
     case $1 in
@@ -50,6 +53,18 @@ while [ $# -gt 0 ] ; do
                PRODUCT_PKG_DIR=Mixbus;
                APPNAME=Mixbus ;
                shift ;;
+       --mixbus32c) MIXBUS=1;
+               MIXBUS32C=1;
+               WITH_HARRISON_LV2=1 ;
+               WITH_X42_LV2=1 ;
+               WITH_NLS=1 ;
+               SAE= ;
+               WITH_LADSPA=;
+               STRIP= ;
+               PRODUCT_PKG_DIR=Mixbus32C;
+               APPNAME=Mixbus32C-${major_version} ;
+               major_version=""
+               shift ;;
        --public)
                SAE= ;
                WITH_LADSPA=1;
@@ -81,7 +96,6 @@ if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then
        exit 1
 fi
 
-. ../define_versions.sh
 echo "Version is $release_version"
 if [ "x$commit" != "x" ] ; then
     info_string="$release_version ($commit) built on `hostname` by `whoami` on `date`"
@@ -178,7 +192,7 @@ if test x$SAE != x ; then
     env="$env<key>ARDOUR_KEYBOARD_LAYOUT</key><string>de-nokeypad</string>"
     env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui_sae.conf</string>"
 elif test x$MIXBUS != x ; then
-    appname="Mixbus"
+    appname=$APPNAME
     EXECUTABLE=${appname}${major_version}
     env="$env<key>ARDOUR_MIXBUS</key><string>true</string>"
     #
@@ -240,6 +254,8 @@ cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_EXECUTAB
 if test x$SAE != x ; then
     # cp $BUILD_ROOT/gtk2_ardour/evtest $APPROOT/MacOS/gtkevents
     cp  Ardour3-SAE.icns $Resources/appIcon.icns
+elif test x$MIXBUS32C != x ; then
+    cp  Mixbus32C.icns $Resources/appIcon.icns
 elif test x$MIXBUS != x ; then
     cp  Mixbus.icns $Resources/appIcon.icns
 else

diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 62cb5a78e839c28f34ef0341012cc43afcad9c71..9422bb0f89034241396d6a3af0decf1dd1f3b0ea 100755 (executable)
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -18,6 +18,15 @@ test -f gtk2_ardour/wscript || exit 1
 : ${SRCCACHE=/var/tmp/winsrc}  # source-code tgz cache
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 
+# see also wscript, video_tool_paths.cc, bundle_env_mingw.cc
+# registry keys based on this are used there
+PROGRAM_NAME=Ardour
+PROGRAM_KEY=Ardour
+PROGRAM_VERSION=${major_version}
+
+PRODUCT_NAME=ardour
+PRODUCT_VERSION=${major_version}
+
 # TODO: grep from build/config.log instead
 while [ $# -gt 0 ] ; do
        echo "arg = $1"
@@ -26,24 +35,27 @@ while [ $# -gt 0 ] ; do
                        MIXBUS=1
                        WITH_HARRISON_LV2=1 ;
                        WITH_X42_LV2=1 ;
+                       PROGRAM_NAME=Mixbus
+                       PROGRAM_KEY=Mixbus
+                       PRODUCT_NAME=mixbus
+                       shift ;;
+               --mixbus32c)
+                       MIXBUS=1
+                       WITH_HARRISON_LV2=1 ;
+                       WITH_X42_LV2=1 ;
+                       PRODUCT_NAME=mixbus32c
+                       PROGRAM_KEY=Mixbus32C
+                       PROGRAM_NAME=Mixbus32C-${PROGRAM_VERSION}
+                       PROGRAM_VERSION=""
                        shift ;;
                --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
        esac
 done
 
-# see also wscript, video_tool_paths.cc, bundle_env_mingw.cc
-# registry keys based on this are used there
-PROGRAM_NAME=Ardour
-PRODUCT_NAME=ardour
-PROGRAM_VERSION=${major_version}
 
 LOWERCASE_DIRNAME=ardour${major_version}
 STATEFILE_SUFFIX=ardour # see filename_extensions.cc
 
-if test -n "$MIXBUS"; then
-       PROGRAM_NAME=Mixbus
-       PRODUCT_NAME=mixbus
-fi
 
 # derived variables
 PRODUCT_ID=${PROGRAM_NAME}${PROGRAM_VERSION}
@@ -321,7 +333,7 @@ Name "${PROGRAM_NAME}${PROGRAM_VERSION}"
 OutFile "${OUTFILE}"
 RequestExecutionLevel admin
 InstallDir "\$${PGF}\\${PRODUCT_ID}"
-InstallDirRegKey HKLM "Software\\${PROGRAM_NAME}\\${PRODUCT_ID}\\$WARCH" "Install_Dir"
+InstallDirRegKey HKLM "Software\\${PRODUCT_NAME}\\${PRODUCT_ID}\\$WARCH" "Install_Dir"
 !define MUI_ICON "share\\${PRODUCT_ICON}"
 
 EOF
@@ -370,7 +382,7 @@ Section "${PROGRAM_NAME}${PROGRAM_VERSION} (required)" SecMainProg
   File /r share
   File /nonfatal debug.bat
   File /nonfatal /r gdb
-  WriteRegStr HKLM "Software\\${PROGRAM_NAME}\\v${PROGRAM_VERSION}\\$WARCH" "Install_Dir" "\$INSTDIR"
+  WriteRegStr HKLM "Software\\${PROGRAM_KEY}\\v${major_version}\\$WARCH" "Install_Dir" "\$INSTDIR"
   WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" "DisplayName" "${PROGRAM_NAME}${PROGRAM_VERSION}"
   WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" "UninstallString" '"\$INSTDIR\\uninstall.exe"'
   WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" "NoModify" 1
@@ -388,7 +400,7 @@ if test -z "$NOVIDEOTOOLS"; then
 
        cat >> $NSISFILE << EOF
 Section "Videotimeline Tools" SecVideo
-  WriteRegStr HKLM "Software\\${PROGRAM_NAME}\\v${PROGRAM_VERSION}\\video" "Install_Dir" "\$INSTDIR\\video"
+  WriteRegStr HKLM "Software\\${PROGRAM_KEY}\\v${major_version}\\video" "Install_Dir" "\$INSTDIR\\video"
   SetOutPath \$INSTDIR
   File /r video
 SectionEnd
@@ -449,7 +461,7 @@ Section "Uninstall"
   SetShellVarContext all
   DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}"
   DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}"
-  DeleteRegKey HKLM "Software\\${PROGRAM_NAME}\\v${PROGRAM_VERSION}"
+  DeleteRegKey HKLM "Software\\${PROGRAM_KEY}\\v${major_version}"
   RMDir /r "\$INSTDIR\\bin"
   RMDir /r "\$INSTDIR\\lib"
   RMDir /r "\$INSTDIR\\share"