From 069ff778c49f98e43d438401a611e05f5c2ca65e Mon Sep 17 00:00:00 2001
From: Manuel Luypaert <manuel.luypaert@wormbase.org>
Date: Thu, 25 Jan 2024 17:45:24 +0000
Subject: [PATCH] Support building app jar to custom path

---
 Makefile                | 14 +++++++++-----
 scripts/build-appjar.sh | 12 +++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 0439c98b..a9522c8b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ endif
 
 STORE_SECRETS_FILE = secrets.makedef
 
-DEPLOY_JAR := app.jar
+APP_JAR_PATH ?= build/app.jar
 PORT := 3000
 WB_ACC_NUM := 357210185381
 
@@ -109,12 +109,16 @@ ui-build: ENV.GOOGLE_OAUTH_CLIENT_ID \
 clean: \
        $(call print-help,clean,\
        Remove the locally built JAR file.)
-	@rm -f ./build/${DEPLOY_JAR}
+	@rm -f ${APP_JAR_PATH}
 
-build/${DEPLOY_JAR}: \
-                      $(call print-help,build/${DEPLOY_JAR},\
+${APP_JAR_PATH}: build/ \
+                      $(call print-help,${APP_JAR_PATH},\
                       Build the jar file.)
-	@./scripts/build-appjar.sh
+	@./scripts/build-appjar.sh ${APP_JAR_PATH}
+
+build-app-jar: ${APP_JAR_PATH} \
+               $(call print-help,build-app-jar,\
+               Build the jar file.)
 
 .PHONY: docker-build
 docker-build: clean build \
diff --git a/scripts/build-appjar.sh b/scripts/build-appjar.sh
index d4576157..af79b3c0 100755
--- a/scripts/build-appjar.sh
+++ b/scripts/build-appjar.sh
@@ -1,19 +1,17 @@
 #!/bin/bash
 
-ARTEFACT="build/app.jar"
-LATEST_TAG=$(git describe --abbrev=0)
-RELEASE_NAME="wormbase-names-${LATEST_TAG}"
-DEPLOY_JAR="target/${RELEASE_NAME}.jar"
+ARTEFACT=$1
+TMP_JAR=$(mktemp --dry-run target/wb-names-app-XXXXXXXXXX.jar)
 
 rm -rf target
 mkdir -p target
 clj -Spom
-clj -A:logging:prod:datomic-pro:webassets:depstar -m hf.depstar.uberjar "${DEPLOY_JAR}"
+clj -A:logging:prod:datomic-pro:webassets:depstar -m hf.depstar.uberjar "${TMP_JAR}"
 if [ $? -eq 0 ]; then
-    mv "${DEPLOY_JAR}" "${ARTEFACT}"
-    echo "${ARTEFACT}"
+    mv "${TMP_JAR}" "${ARTEFACT}"
     exit 0
 else
+    echo >&2 "Failed to build jar '${TMP_JAR}'"
     exit 1
 fi