linux/{pack,layout}.sh: allow specification of output dir

Allow a caller of pack.sh and layout.sh to specify the location of the
payload and symbols.

Signed-off-by: Matthew John Cheetham <[email protected]>

Author: mjcheetham

src/linux/Packaging.Linux/build.sh

@@ -64,7 +64,7 @@ PAYLOAD="$OUTDIR/payload"
 SYMBOLS="$OUTDIR/payload.sym"
 
 # Lay out payload
-"$INSTALLER_SRC/layout.sh" --configuration="$CONFIGURATION" --runtime="$RUNTIME" || exit 1
+"$INSTALLER_SRC/layout.sh" --configuration="$CONFIGURATION" --runtime="$RUNTIME" --output="$PAYLOAD" --symbol-output="$SYMBOLS" || exit 1
 
 if [ $INSTALL_FROM_SOURCE = true ]; then
     echo "Installing to $INSTALL_PREFIX"

src/linux/Packaging.Linux/layout.sh

@@ -23,10 +23,17 @@ case "$i" in
     CONFIGURATION="${i#*=}"
     shift # past argument=value
     ;;
+    --output=*)
+    PAYLOAD="${i#*=}"
+    shift # past argument=value
+    ;;
     --runtime=*)
     RUNTIME="${i#*=}"
     shift # past argument=value
     ;;
+    --symbol-output=*)
+    SYMBOLOUT="${i#*=}"
+    ;;
     *)
           # unknown option
     ;;
@@ -46,10 +53,12 @@ FRAMEWORK=net8.0
 
 # Perform pre-execution checks
 CONFIGURATION="${CONFIGURATION:=Debug}"
-
-# Outputs
-PAYLOAD="$PROJ_OUT/$CONFIGURATION/payload"
-SYMBOLOUT="$PROJ_OUT/$CONFIGURATION/payload.sym"
+if [ -z "$PAYLOAD" ]; then
+    die "--output was not set"
+fi
+if [ -z "$SYMBOLOUT" ]; then
+    SYMBOLOUT="$PAYLOAD.sym"
+fi
 
 # Cleanup payload directory
 if [ -d "$PAYLOAD" ]; then

src/linux/Packaging.Linux/pack.sh

@@ -36,6 +36,10 @@ case "$i" in
     CONFIGURATION="${i#*=}"
     shift # past argument=value
     ;;
+    --output=*)
+    OUTPUT_ROOT="${i#*=}"
+    shift # past argument=value
+    ;;
     *)
           # unknown option
     ;;
@@ -59,11 +63,15 @@ if [ -z "$RUNTIME" ]; then
     die "--runtime was not set"
 fi
 
-TAROUT="$PROJ_OUT/$CONFIGURATION/tar/"
+if [ -z "$OUTPUT_ROOT" ]; then
+    OUTPUT_ROOT="$PROJ_OUT/$CONFIGURATION"
+fi
+
+TAROUT="$OUTPUT_ROOT/tar"
 TARBALL="$TAROUT/gcm-$RUNTIME.$VERSION.tar.gz"
 SYMTARBALL="$TAROUT/gcm-$RUNTIME.$VERSION-symbols.tar.gz"
 
-DEBOUT="$PROJ_OUT/$CONFIGURATION/deb"
+DEBOUT="$OUTPUT_ROOT/deb"
 DEBROOT="$DEBOUT/root"
 DEBPKG="$DEBOUT/gcm-$RUNTIME.$VERSION.deb"
 mkdir -p "$DEBROOT"