Merging dev into master

joms/build.xml

@@ -1,6 +1,6 @@
 
 <project name="joms" default="build" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
+<property environment="env"/>
 <scriptdef language="javascript" name="upper">
     <attribute name="string" /> 
     <attribute name="to" />
@@ -17,7 +17,6 @@
                          attributes.get( "string" ).toLowerCase() );
 </scriptdef>
 
-    <property environment="env" />
 
   <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
   <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
@@ -45,10 +44,12 @@
     <echo message="ossim.dependencies   = ${ossim.dependencies}" />
     <echo message="ossim.build = ${ossim.build}"/>
     <echo message="ossim.version = ${ossim.version}"/>
+    <echo message="ossim.versionTag = ${ossim.versionTag}"/>
     <echo message="os.name = ${os.name}"/>
     <echo message="osg.home = ${osg.home}"/>
     <echo message="user.home = ${user.home}"/>
-    <artifact:remoteRepository id="remote.repository" url="${env.REPOSITORY_MANAGER_URL}/all-repos" />
+   <echo message="repository_manager.url = ${repository_manager.url}"/>
+    <artifact:remoteRepository id="remote.repository" url="${repository_manager.url}/all-repos" />
 
     <artifact:dependencies filesetId="dependency.fileset">
         <remoteRepository refid="remote.repository" />

joms/build_scripts/linux/build.sh

@@ -10,13 +10,21 @@ if [ ! -a local.properties ]
    cp local.properties.template local.properties
 fi
 
-# if [ -z "$GROOVY_HOME" ]; then
-#    echo "HOME Location: ${HOME}"
-#    source "$HOME/.sdkman/bin/sdkman-init.sh"
-#    if [ ! -z "$GROOVY_VERSION" ]; then
-#       sdk use groovy $GROOVY_VERSION
-#    fi
-# fi
+if [ "$GROOVY_HOME" == "" ] ; then
+    echo "ERROR: GROOVY_HOME must be defined!"
+    exit 1
+fi
+
+if [ "$OSSIM_VERSION" == "" ] ; then
+    echo "ERROR: OSSIM_VERSION must be defined!"
+    exit 1
+fi
+
+if [ "$OSSIM_VERSION_TAG" == "" ] ; then
+    echo "ERROR: OSSIM_VERSION_TAG must be defined!"
+    exit 1
+fi
+
 ant clean
 ant build
 antReturnCode=$?

joms/build_scripts/linux/env.sh

@@ -1,21 +1,26 @@
 #!/bin/bash
 pushd `dirname ${BASH_SOURCE[0]}` >/dev/null
-export SCRIPT_DIR=`pwd -P`
+export ENV_SCRIPT_DIR=`pwd -P`
 popd >/dev/null
 
-pushd $SCRIPT_DIR/../.. >/dev/null
+pushd $ENV_SCRIPT_DIR/../.. >/dev/null
 export JOMS_HOME=$PWD
-echo "@@@@@ SCRIPT_DIR=$SCRIPT_DIR"
+echo "@@@@@ SCRIPT_DIR=$ENV_SCRIPT_DIR"
 echo "@@@@@ JOMS_HOME=$JOMS_HOME"
 popd >/dev/null
 
 pushd $JOMS_HOME/../.. >/dev/null
+if [ "${OSSIM_DEV_HOME}" == "" ] ; then
 export OSSIM_DEV_HOME=$PWD
+fi
+if [ "${OSSIM_HOME}" == "" ] ; then
 export OSSIM_HOME=$OSSIM_DEV_HOME/ossim
-if [ -z "$OSSIM_BUILD_DIR" ]; then
+fi
+
+if [ "$OSSIM_BUILD_DIR" == "" ]; then
    export OSSIM_BUILD_DIR=$OSSIM_DEV_HOME/build
 fi
-if [ -z "$OSSIM_INSTALL_PREFIX" ]; then
+if [ "$OSSIM_INSTALL_PREFIX" == "" ]; then
    export OSSIM_INSTALL_PREFIX=$OSSIM_DEV_HOME/install
 fi
 popd >/dev/null

joms/build_scripts/linux/install.sh

@@ -12,13 +12,22 @@ if [ ! -a local.properties ]
    cp local.properties.template local.properties
 fi
 
-# if [ -z "$GROOVY_HOME" ]; then
-#    echo "HOME Location: ${HOME}"
-#    source "$HOME/.sdkman/bin/sdkman-init.sh"
-#    if [ ! -z "$GROOVY_VERSION" ]; then
-#       sdk use groovy $GROOVY_VERSION
-#    fi
-# fi
+if [ "$GROOVY_HOME" == "" ] ; then
+    echo "ERROR: GROOVY_HOME must be defined!"
+    exit 1
+fi
+
+if [ "$OSSIM_VERSION" == "" ] ; then
+    echo "ERROR: OSSIM_VERSION must be defined!"
+    exit 1
+fi
+
+if [ "$OSSIM_VERSION_TAG" == "" ] ; then
+    echo "ERROR: OSSIM_VERSION_TAG must be defined!"
+    exit 1
+fi
+
+
 
 ant install mvn-install
 antReturnCode=$?