From 82f2968e82822d892327b34d1fe54ee674368653 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Fri, 10 Apr 2026 00:21:05 +1000 Subject: [PATCH] Add Velopack support to build script with --velopack --- scripts/configure_firestorm.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 30713eaa11..00f23493d5 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -21,6 +21,7 @@ FALSE=1 # -DUSE_AVX2_OPTIMIZATION:BOOL=OFF # -DLL_TESTS:BOOL=OFF # -DPACKAGE:BOOL=OFF> +# -DUSE_VELOPACK:BOOL=OFF> ### @@ -30,6 +31,7 @@ FALSE=1 WANTS_CLEAN=$FALSE WANTS_CONFIG=$FALSE WANTS_PACKAGE=$FALSE +WANTS_VELOPACK=$FALSE WANTS_VERSION=$FALSE WANTS_KDU=$FALSE WANTS_FMODSTUDIO=$FALSE @@ -72,6 +74,7 @@ showUsage() echo " --btype [Release|RelWithDebInfo] : Release is default, whether to use symbols" echo " --kdu : Build with KDU" echo " --package : Build installer" + echo " --velopack : Build with velopack (Overrides --package)" echo " --no-package : Build without installer (Overrides --package)" echo " --fmodstudio : Build with FMOD Studio" echo " --openal : Build with OpenAL" @@ -98,7 +101,7 @@ getArgs() # $* = the options passed in from main { if [ $# -gt 0 ]; then - while getoptex "clean build config version package no-package fmodstudio openal ninja vscode compiler-cache jobs: platform: kdu opensim no-opensim singlegrid: havok avx avx2 tracy crashreporting testbuild: help chan: btype:" "$@" ; do + while getoptex "clean build config version package velopack no-package fmodstudio openal ninja vscode compiler-cache jobs: platform: kdu opensim no-opensim singlegrid: havok avx avx2 tracy crashreporting testbuild: help chan: btype:" "$@" ; do #ensure options are valid if [ -z "$OPTOPT" ] ; then @@ -134,6 +137,8 @@ getArgs() TESTBUILD_PERIOD="$OPTARG" ;; package) WANTS_PACKAGE=$TRUE;; + velopack) WANTS_PACKAGE=$TRUE + WANTS_VELOPACK=$TRUE;; no-package) WANTS_PACKAGE=$FALSE;; build) WANTS_BUILD=$TRUE;; platform) TARGET_PLATFORM="$OPTARG";; @@ -328,6 +333,7 @@ else echo -e " TESTBUILD: `b2a $WANTS_TESTBUILD`" | tee -a "$LOG" fi echo -e " PACKAGE: `b2a $WANTS_PACKAGE`" | tee -a "$LOG" +echo -e " VELOPACK: `b2a $WANTS_VELOPACK`" | tee -a "$LOG" echo -e " CLEAN: `b2a $WANTS_CLEAN`" | tee -a "$LOG" echo -e " BUILD: `b2a $WANTS_BUILD`" | tee -a "$LOG" echo -e " CONFIG: `b2a $WANTS_CONFIG`" | tee -a "$LOG" @@ -508,8 +514,14 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then done done fi + if [ $WANTS_VELOPACK -eq $TRUE ] ; then + VELOPACK="-DUSE_VELOPACK:BOOL=ON" + else + VELOPACK="-DUSE_VELOPACK:BOOL=OFF" + fi else PACKAGE="-DPACKAGE:BOOL=OFF" + VELOPACK="-DUSE_VELOPACK:BOOL=OFF" fi if [ $WANTS_CRASHREPORTING -eq $TRUE ] ; then if [ $TARGET_PLATFORM == "windows" ] ; then @@ -585,7 +597,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then fi fi - cmake -G "$TARGET" $CMAKE_ARCH ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $HAVOK $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TRACY_PROFILER $TESTBUILD $PACKAGE \ + cmake -G "$TARGET" $CMAKE_ARCH ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $HAVOK $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TRACY_PROFILER $TESTBUILD $PACKAGE $VELOPACK \ $UNATTENDED -DLL_TESTS:BOOL=OFF -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE $CACHE_OPT \ $CRASH_REPORTING -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" $LL_ARGS_PASSTHRU ${VSCODE_FLAGS:-} | tee "$LOG" configure_status=${PIPESTATUS[0]}