diff contrib/make_flys_release/make_release.sh @ 9779:3847836c60b5 3.2.x

Improve backend build for different database backends Use profiles instead of multiple almost identical POMs. Introduce build-time argument for Docker build.
author Tom Gottfried <tom@intevation.de>
date Tue, 07 Feb 2023 16:11:43 +0100
parents b57b236c4f4e
children
line wrap: on
line diff
--- a/contrib/make_flys_release/make_release.sh	Mon Feb 06 16:57:03 2023 +0100
+++ b/contrib/make_flys_release/make_release.sh	Tue Feb 07 16:11:43 2023 +0100
@@ -73,7 +73,7 @@
       WORK_DIR=$2
       shift 2;;
     "-o"|"--oracle")
-      BUILD_ORACLE="TRUE"
+      ORACLE="true"
       shift;;
     "-t")
       DO_TAG=$2
@@ -186,7 +186,10 @@
 
 echo "INFO: compile sources"
 mvn -f $FLYS_SOURCE_DIR/framework/pom.xml clean compile install
+
+# If ORACLE=true, the oracle profile in the POM is activated
 mvn -f $FLYS_SOURCE_DIR/river/backend/pom.xml clean compile install
+
 mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom.xml clean compile
 mvn -f $FLYS_SOURCE_DIR/http-client/pom.xml clean compile install
 # gwt-client has to be compiled later to allow custom CLIENT_CONF
@@ -274,13 +277,7 @@
 cp $WORK_DIR/wsplgen-linux-64bit-static \
     $FLYS_SOURCE_DIR/river/artifacts/bin/wsplgen
 
-if [ "$BUILD_ORACLE" = "TRUE" ]; then
-    mvn -f $FLYS_SOURCE_DIR/river/backend/pom-oracle.xml clean compile install
-    mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom-oracle.xml \
-        package assembly:single
-else
-    mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom.xml package assembly:single
-fi
+mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom.xml package assembly:single
 mvn -f $FLYS_SOURCE_DIR/river/gwt-client/pom.xml clean compile package
 
 

http://dive4elements.wald.intevation.org