Build - update build scripts

sonic-pi-net · Oct 4, 2024 · a61763a · a61763a
1 parent 04af410
commit a61763a
Show file tree

Hide file tree

Showing 28 changed files with 188 additions and 87 deletions.
diff --git a/app/linux-build-all.sh b/app/linux-build-all.sh
@@ -4,10 +4,15 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 "${SCRIPT_DIR}"/linux-prebuild.sh "$@"
 "${SCRIPT_DIR}"/linux-config.sh "$@"
 "${SCRIPT_DIR}"/linux-build-gui.sh "$@"
 "${SCRIPT_DIR}"/linux-post-tau-prod-release.sh "$@"
 
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+
diff --git a/app/linux-build-gui.sh b/app/linux-build-gui.sh
@@ -3,8 +3,13 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 cd "${SCRIPT_DIR}"/build
 cmake --build .
 
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+
diff --git a/app/linux-clean.sh b/app/linux-clean.sh
@@ -2,6 +2,13 @@
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
+
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 cd "${SCRIPT_DIR}"
 
 echo "Cleaning out vcpkg...."
@@ -26,5 +33,5 @@ fi
 
 echo "Cleaning completed"
 
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+
+
diff --git a/app/linux-config.sh b/app/linux-config.sh
@@ -3,6 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 args=("$@")
 config="Release"
 no_imgui=false
@@ -53,8 +59,3 @@ option() {
 
 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="$config" -DBUILD_IMGUI_INTERFACE="$(option "!$no_imgui")" -DUSE_SYSTEM_LIBS="$(option "$system_libs")" ..
 
-cd "${SCRIPT_DIR}"
-
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/linux-post-tau-prod-release.sh b/app/linux-post-tau-prod-release.sh
@@ -3,6 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 args=("$@")
 offline_build=false
 
@@ -38,5 +44,5 @@ else
     MIX_ENV=prod mix tau.release
 fi
 
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+
+
diff --git a/app/linux-pre-tau-dev-init.sh b/app/linux-pre-tau-dev-init.sh
@@ -3,9 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 cd "${SCRIPT_DIR}"/server/beam/tau
 
 MIX_ENV=dev mix setup.dev
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/linux-pre-translations.sh b/app/linux-pre-translations.sh
@@ -3,13 +3,15 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 echo "Translating tutorial..."
 ruby "${SCRIPT_DIR}"/server/ruby/bin/i18n-tool.rb -t
 
 echo "Generating docs for the Qt GUI..."
 cp "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.tmpl "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.h
 ruby "${SCRIPT_DIR}"/server/ruby/bin/qt-doc.rb
-
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/linux-pre-vcpkg.sh b/app/linux-pre-vcpkg.sh
@@ -1,6 +1,15 @@
 #!/bin/bash
 set -e # Quit script on error
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+WORKING_DIR="$(pwd)"
+
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 args=("$@")
 no_imgui=false
 
@@ -22,9 +31,6 @@ while [ -n "$1" ]; do
     esac
 done
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-WORKING_DIR="$(pwd)"
-
 cd "${SCRIPT_DIR}"
 
 # Build vcpkg
@@ -51,5 +57,4 @@ else
 fi
 
 
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+
diff --git a/app/linux-prebuild.sh b/app/linux-prebuild.sh
@@ -3,6 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 args=("$@")
 system_libs=false
 
@@ -36,6 +42,3 @@ echo "Compiling native ruby extensions..."
 ruby "${SCRIPT_DIR}"/server/ruby/bin/compile-extensions.rb
 
 "${SCRIPT_DIR}"/linux-pre-translations.sh "${args[@]}"
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/linux-release.sh b/app/linux-release.sh
@@ -2,6 +2,13 @@
 shopt -s dotglob
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+WORKING_DIR="$(pwd)"
+
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
 
 cd "${SCRIPT_DIR}"
 

diff --git a/app/mac-build-all.sh b/app/mac-build-all.sh
@@ -4,10 +4,13 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 "${SCRIPT_DIR}"/mac-prebuild.sh "$@"
 "${SCRIPT_DIR}"/mac-config.sh "$@"
 "${SCRIPT_DIR}"/mac-build-gui.sh "$@"
 "${SCRIPT_DIR}"/mac-post-tau-prod-release.sh "$@"
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/mac-build-gui.sh b/app/mac-build-gui.sh
@@ -3,7 +3,11 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
-"${SCRIPT_DIR}"/linux-build-gui.sh "$@"
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+"${SCRIPT_DIR}"/linux-build-gui.sh "$@"
diff --git a/app/mac-clean.sh b/app/mac-clean.sh
@@ -3,6 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 cd "${SCRIPT_DIR}"
 
 echo "Cleaning out native dir...."
@@ -14,6 +20,3 @@ rm -rf "${SCRIPT_DIR}"/server/native/aubio_onset
 
 # Use generic linux clean script for everything else
 "${SCRIPT_DIR}"/linux-clean.sh "$@"
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/mac-config.sh b/app/mac-config.sh
@@ -3,6 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 args=("$@")
 config="Release"
 no_imgui=false
@@ -54,12 +60,4 @@ then
   cmake -G "Unix Makefiles" -DCMAKE_OSC_ARCHITECTURES="ARM64" -DCMAKE_BUILD_TYPE="$config" -DBUILD_IMGUI_INTERFACE="$(option "!$no_imgui")" ..
 else
   cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="$config" -DBUILD_IMGUI_INTERFACE="$(option "!$no_imgui")" ..
-fi
-
-
-
-
-
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+fi
diff --git a/app/mac-post-tau-prod-release.sh b/app/mac-post-tau-prod-release.sh
@@ -3,8 +3,11 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
-# Use generic linux clean script
-"${SCRIPT_DIR}"/linux-post-tau-prod-release.sh "$@"
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
 
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
+# Use generic linux clean script
+"${SCRIPT_DIR}"/linux-post-tau-prod-release.sh "$@"
diff --git a/app/mac-pre-tau-dev-init.sh b/app/mac-pre-tau-dev-init.sh
@@ -3,8 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
+
 # Use generic linux tau dev init script
 "${SCRIPT_DIR}"/linux-pre-tau-dev-init.sh "$@"
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/mac-pre-translations.sh b/app/mac-pre-translations.sh
@@ -3,6 +3,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 # Check to see if we have a bundled Ruby and if so, use that
 # Otherwise use system ruby
 BUNDLED_RUBY="${SCRIPT_DIR}/server/native/ruby/bin/ruby"
@@ -21,7 +27,3 @@ echo "Translating tutorial..."
 echo "Generating docs for the Qt GUI..."
 cp "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.tmpl "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.h
 "$RUBY" "${SCRIPT_DIR}"/server/ruby/bin/qt-doc.rb
-
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/mac-pre-vcpkg.sh b/app/mac-pre-vcpkg.sh
@@ -1,6 +1,15 @@
 #!/bin/bash
 set -e # Quit script on error
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+WORKING_DIR="$(pwd)"
+
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 args=("$@")
 no_imgui=false
 
@@ -22,8 +31,7 @@ while [ -n "$1" ]; do
     esac
 done
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-WORKING_DIR="$(pwd)"
+
 
 cd "${SCRIPT_DIR}"
 
@@ -59,7 +67,3 @@ if [ "$no_imgui" == true ]; then
 else
     ./vcpkg install libsndfile[core,external-libs] kissfft fmt sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet ${triplet[0]} --recurse
 fi
-
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"
diff --git a/app/mac-prebuild.sh b/app/mac-prebuild.sh
@@ -4,6 +4,12 @@ set -e # Quit script on error
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 WORKING_DIR="$(pwd)"
 
+cleanup_function() {
+    # Restore working directory as it was prior to this script running on exit
+    cd "${WORKING_DIR}"
+}
+trap cleanup_function EXIT
+
 # Check to see if we have a bundled Ruby and if so, use that
 # Otherwise use system ruby
 BUNDLED_RUBY="${SCRIPT_DIR}"/server/native/ruby/bin/ruby
@@ -23,6 +29,3 @@ echo "Compiling native ruby extensions..."
 "$RUBY" "${SCRIPT_DIR}"/server/ruby/bin/compile-extensions.rb
 
 "${SCRIPT_DIR}"/mac-pre-translations.sh
-
-# Restore working directory as it was prior to this script running...
-cd "${WORKING_DIR}"