From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 15 Oct 2022 08:31:50 +0000 (+0200)
Subject: Centralise configure script
X-Git-Tag: v2.3.10~13
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=8a7c7d4e9a28383df9eb9ed9a6783294db8cdacd

Centralise configure script
---

diff --git a/configure b/configure
index 9b3e9804b..47f7d9625 100755
--- a/configure
+++ b/configure
@@ -1,55 +1,7 @@
 #!/bin/sh
 
-# We build where we are
-SDK_BUILD_BASE=$(pwd -P)/output
-
 # Source are located where this script is
 SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"
 
-SDK_MK=$SDK_SRC_BASE/sdk.mk
-
-#echo SDK_BUILD_BASE=$SDK_BUILD_BASE
-#echo SDK_SRC_BASE=$SDK_SRC_BASE
-#echo SDK_MK=$SDK_MK
-
-if [ -f "$SDK_MK" ]; 
-then
-
-echo "File $SDK_MK already exists. Remove it in order to configure a new build location:"
-echo "rm $SDK_MK"
-exit 1
-
-else
-
-if [ -z "$JAVA_HOME" ]
-then
-echo "Environment variable JAVA_HOME must be set"
-exit 1
-fi
-
-# Create build directory, so that it can be used right away
-# and we check whether we have the rights
-mkdir -p $SDK_BUILD_BASE
-if [ -f "$SDK_MK" ];
-then
-echo "Cannot create $SDK_BUILD_BASE, SDK configuration has failed."
-exit 2
-fi
-
-# Generate sdk.mk
-cat > "$SDK_MK" <<EOF
-SDK_SRC_BASE := $SDK_SRC_BASE
-SDK_BUILD_BASE := $SDK_BUILD_BASE
-JAVA_HOME := $JAVA_HOME
-
-include \$(SDK_SRC_BASE)/branch.mk
-EOF
-
-
-echo SDK was configured.
-echo "JAVA_HOME        : $JAVA_HOME"
-echo "Base for sources : $SDK_SRC_BASE"
-echo "Base for builds  : $SDK_BUILD_BASE"
-exit 0
-fi
-
+# Source the configure script
+. $SDK_SRC_BASE/sdk/argeo-build/configure
diff --git a/sdk/argeo-build b/sdk/argeo-build
index a1d28a641..872f63170 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit a1d28a6412f93b69af6c1ec5af476d4fbda378fd
+Subproject commit 872f63170bb639abab6e64d6e3d6a13318d38e32