X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=configure;h=c92b6706c8cbc1755dd786c653bcc336a5745d71;hb=HEAD;hp=9b3e9804b04280910d6df08fd74ba0fe4cf4079c;hpb=2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d;p=cc0%2Fargeo-build.git

diff --git a/configure b/configure
old mode 100644
new mode 100755
index 9b3e980..c92b670
--- a/configure
+++ b/configure
@@ -3,18 +3,20 @@
 # 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)"
+if [ -z "$SDK_SRC_BASE" ]
+then
+echo Script variable SDK_SRC_BASE must be set in the calling \'configure\' script,
+echo to the root location of the sources, typically with such a pattern:
+echo 'SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"' 
+echo "(see 'configure.template' from the argeo-build directory)"
+echo In order to build Argeo Build itself, explicitly set SDK_SRC_BASE as an environment variable
+exit 1
+fi
 
 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
@@ -23,8 +25,8 @@ else
 
 if [ -z "$JAVA_HOME" ]
 then
-echo "Environment variable JAVA_HOME must be set"
-exit 1
+JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))
+echo "Environment variable JAVA_HOME not set, using $JAVA_HOME of $(which java)"
 fi
 
 # Create build directory, so that it can be used right away
@@ -42,7 +44,8 @@ SDK_SRC_BASE := $SDK_SRC_BASE
 SDK_BUILD_BASE := $SDK_BUILD_BASE
 JAVA_HOME := $JAVA_HOME
 
-include \$(SDK_SRC_BASE)/branch.mk
+-include \$(SDK_SRC_BASE)/branch.mk
+-include \$(SDK_SRC_BASE)/sdk/branches/\$(BRANCH).bnd
 EOF