Updated build scripts

davidhealey · Jul 18, 2019 · 3ae5559 · 3ae5559
1 parent 8d93388
commit 3ae5559
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 79 deletions.
diff --git a/Packaging/GNU/GNUInstaller.sh b/Packaging/GNU/GNUInstaller.sh
@@ -1,41 +1,41 @@
-#!/bin/bash
-
-PLUGIN_NAME="Sofia Woodwinds.so"
-STANDALONE_NAME="Sofia Woodwinds"
-
-read -r -p "Would you like to install the plugin? " install_plugin
-
-if [[ "$install_plugin" =~ ^([yY][eE][sS]|[yY])+$ ]]
-then
-    echo "Please enter the location to install the plugin file."
-    read plugin_path
-
-    until [ -d "$plugin_path" ]; do
-     echo "The entered path does not exist. Please enter a different path."
-     read plugin_path
-    done
-
-    cp -i "$PLUGIN_NAME" "$plugin_path"
-else
-    echo "The plugin will not be installed"
-fi
-
-read -r -p "Would you like to install standalone application? " install_standalone
-
-if [[ "$install_standalone" =~ ^([yY][eE][sS]|[yY])+$ ]]
-then
-    echo "Please enter the location to install the standalone version."
-    read standalone_path
-
-    until [ -d "$standalone_path" ]; do
-     echo "The entered path does not exist. Please enter a different path."
-     read standalone_path
-    done
-
-    cp -i "$STANDALONE_NAME" "$standalone_path"
-    cp -i "License.txt" "$standalone_path"
-else
-    echo "The standalone application will not be installed"
-fi
-
-echo "The software installation is complete. Please launch the plugin or standalone version and click Install Samples when prompted to install the instrument samples."
+#!/bin/bash
+
+PLUGIN_NAME="Sofia Woodwinds.so"
+STANDALONE_NAME="Sofia Woodwinds"
+
+read -r -p "Would you like to install the plugin? " install_plugin
+
+if [[ "$install_plugin" =~ ^([yY][eE][sS]|[yY])+$ ]]
+then
+    echo "Please enter the location to install the plugin file."
+    read plugin_path
+
+    until [ -d "$plugin_path" ]; do
+     echo "The entered path does not exist. Please enter a different path."
+     read plugin_path
+    done
+
+    cp -i "$PLUGIN_NAME" "$plugin_path"
+else
+    echo "The plugin will not be installed"
+fi
+
+read -r -p "Would you like to install standalone application? " install_standalone
+
+if [[ "$install_standalone" =~ ^([yY][eE][sS]|[yY])+$ ]]
+then
+    echo "Please enter the location to install the standalone version."
+    read standalone_path
+
+    until [ -d "$standalone_path" ]; do
+     echo "The entered path does not exist. Please enter a different path."
+     read standalone_path
+    done
+
+    cp -i "$STANDALONE_NAME" "$standalone_path"
+    cp -i "License.txt" "$standalone_path"
+else
+    echo "The standalone application will not be installed"
+fi
+
+echo "The software installation is complete. Please launch the plugin or standalone version and click Install Samples when prompted to install the instrument samples."
diff --git a/Packaging/GNU/build_gnu.sh b/Packaging/GNU/build_gnu.sh
@@ -5,14 +5,17 @@ version=1.1.1
 xmlFile=sofiaWoodwinds
 workspace=/media/john/SHARED/HISEProjects/sofiawoodwinds
 
-clean_project=1
-build_plugin=1
 build_standalone=0
-build_installer=0
+build_plugin=0
+build_installer=1
 
 hise_path=/media/john/SHARED/HISE/projects/standalone/Builds/LinuxMakefile/build/HISE\ Standalone
 projucer_path=/media/john/SHARED/HISE/tools/projucer/Projucer
-makeself_path=/media/john/SHARED/makeself
+makeself=/media/john/SHARED/makeself
+
+#Create temp directory for packaging
+package="$workspace"/Packaging/GNU/temp
+mkdir -p "$package"
 
 cd "$workspace"/Binaries
 
@@ -24,28 +27,27 @@ then
   "$hise_path" set_project_folder -p:$workspace
   "$hise_path" set_version -v:$version
 
-  if (($clean_project == 1))
-  then
-     "$hise_path" clean -p:$workspace --all
-  fi
-
   echo Making the Projucer accessible for this project
   chmod +x "$projucer_path"
-
-  if (($build_plugin==1))
+ 
+  if (($build_standalone==1))
   then
-    echo Building the plugins
-    "$hise_path" export_ci XmlPresetBackups/$xmlFile.xml -t:instrument -p:VST -a:x64
+    echo Building the standalone app
+    "$hise_path" clean -p:$workspace --all
+    "$hise_path" export_ci XmlPresetBackups/$xmlFile.xml -t:standalone -a:x64
     chmod +x "$workspace"/Binaries/batchCompileLinux.sh
     sh "$workspace"/Binaries/batchCompileLinux.sh
+    cp "$workspace"/Binaries/Builds/LinuxMakefile/build/"$project" "$package"
   fi
 
-  if (($build_standalone==1))
+  if (($build_plugin==1))
   then
-    echo Building the standalone app
-    "$hise_path" export_ci XmlPresetBackups/$xmlFile.xml -t:standalone -a:x64
+    echo Building the plugins
+    "$hise_path" clean -p:$workspace --all
+    "$hise_path" export_ci XmlPresetBackups/$xmlFile.xml -t:instrument -p:VST -a:x64
     chmod +x "$workspace"/Binaries/batchCompileLinux.sh
     sh "$workspace"/Binaries/batchCompileLinux.sh
+    cp "$workspace"/Binaries/Builds/LinuxMakefile/build/"$project".so "$package"
   fi
 fi
 
@@ -55,23 +57,17 @@ fi
 if (($build_installer==1))
 then
   echo "Build Installer"
-
-  #Create installer directory and copy temp files into it
-  mkdir -p "$workspace"/Installer/temp
-  cp "$workspace"/Binaries/Builds/LinuxMakefile/build/"$project" "$workspace"/Installer/temp
-  cp "$workspace"/Binaries/Builds/LinuxMakefile/build/"$project".so "$workspace"/Installer/temp
-  cp "$workspace"/License.txt "$workspace"/Installer/temp
-  cp "$workspace"/Packaging/GNU/GNUInstaller.sh "$workspace"/Installer/temp
-
-  cd "$workspace"/Installer/
+
+  cp "$workspace"/License.txt "$package"
+  cp "$workspace"/Packaging/GNU/GNUInstaller.sh "$package"
 
   #Run makeself
-  sh "$makeself_path"/makeself.sh --license License.txt "$workspace"/Installer/temp "$workspace"/Installer/"$project".$version.installer.sh "$project" ./GNUInstaller.sh
-
-  echo Cleanup
-  cd "$workspace"
-  rm -rf "$workspace"/Installer/temp
+  sh "$makeself"/makeself.sh --license "$workspace"/License.txt "$workspace"/Packaging/GNU/temp "$workspace"/Installer/"$project"\ $version.sh "$project" ./GNUInstaller.sh
 
 else
   echo "Skip Building Installer"
 fi
+
+echo Cleanup
+cd "$workspace"
+rm -rf "$workspace"/Packaging/GNU/temp
diff --git a/Packaging/OSX/._build_mac.sh b/Packaging/OSX/._build_mac.sh
diff --git a/Packaging/OSX/build_mac.sh b/Packaging/OSX/build_mac.sh
@@ -5,8 +5,8 @@ version=1.1.1
 xmlFile=sofiaWoodwinds
 workspace=/Volumes/SHARED/HISEProjects/sofiawoodwinds
 
-build_standalone=1
-build_plugin=1
+build_standalone=0
+build_plugin=0
 build_installer=1
 clean_project=0
 
@@ -53,15 +53,12 @@ fi
 if (($build_installer==1))
 then
   echo "Build Installer"
+  mkdir -p "$workspace"/Installer
   $PACKAGES_BUILD "Packaging/OSX/$project.pkgproj"
-  installer_name=./$project\ "$version".pkg
-  productsign --sign "$APPLE_CERTIFICATE_ID_INSTALLER" "./Installer/$project.pkg" "$installer_name"
+  cp "$workspace"/Packaging/OSX/build/"$project".pkg "$workspace"/Installer/"$project"\ "$version".pkg  
 
   echo "Cleanup"
-  mkdir -p "$workspace"/Installer
-  cp "$workspace"/Packaging/OSX/build/"$project".pkg "$workspace"/Installer
   rm -rf "$workspace"/Packaging/OSX/build
-
-  else
+else
   echo "Skip Building Installer"
 fi