package-all.sh now works

thumperward · Oct 10, 2023 · 5b07b01 · 5b07b01
1 parent d29c230
commit 5b07b01
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
@@ -3,13 +3,8 @@
 
 set -o errexit -o pipefail || exit $?
 
-if [ $# -ne "2" ]; then
-	echo "Usage: $(basename "$0") version outputdir."
-	exit 1
-fi
-
-export GIT_TAG="$1"
-export BUILD_OUTPUT_DIR="$2"
+export GIT_TAG="${1:-}"
+export BUILD_OUTPUT_DIR="${2:-}"
 
 # Set the working dir to the location of this script
 HERE=$(dirname "$0")

diff --git a/packaging/source/buildpackage.sh b/packaging/source/buildpackage.sh
@@ -3,17 +3,19 @@
 
 set -o errexit -o pipefail || exit $?
 
-if [ $# -ne "2" ]; then
-	echo "Usage: $(basename "$0") tag outputdir"
-	exit 1
-fi
-
 # Set the working dir to the location of this script
 HERE=$(dirname "$0")
 cd "${HERE}"
 
-TAG="$1"
-OUTPUTDIR="$2"
+TAG="${1:-devtest-19700101}"
+
+if [ -z ${2:-} ]; then
+OUTPUTDIR=$(pwd)/../../build/source
+mkdir -p $OUTPUTDIR
+else
+OUTPUTDIR="${2}"
+fi
+
 SRCDIR="$(pwd)/../.."
 
 pushd "${SRCDIR}" > /dev/null
@@ -26,4 +28,6 @@ rm "${OUTPUTDIR}/OpenRA-${TAG}-source.tar" || :
 git ls-tree HEAD --name-only -r -z | xargs -0 tar vrf "${OUTPUTDIR}/OpenRA-${TAG}-source.tar"
 bzip2 "${OUTPUTDIR}/OpenRA-${TAG}-source.tar"
 
+make version VERSION='{DEV_VERSION}'
+
 popd > /dev/null