diff --git a/utils_dev/RUN_build.sh b/utils_dev/RUN_build.sh index d33744bf78..fd44fc3948 100755 --- a/utils_dev/RUN_build.sh +++ b/utils_dev/RUN_build.sh @@ -4,26 +4,30 @@ # # $Header: /cvsroot/adempiere/utils_dev/myDevEnvTemplate.sh,v 1.6 2003/04/27 12:34:16 marekmosiewicz Exp $ -SAVED_DIR=`pwd` #save current dir -cd `dirname $0` #change dir to place where script resides - does not work with sym links -UTILS_DEV=`pwd` #this is adempiere source -cd $SAVED_DIR #back to the saved directory - -. $UTILS_DEV/myDevEnv.sh #call environment - - -if [ ! $ADEMPIERE_ENV==Y ] ; then - echo "Can't set development environemnt - check myDevEnv.sh" - exit 1 +#check java home +if [ $JAVA_HOME ]; then + export PATH=$JAVA_HOME/bin:$PATH +else + echo JAVA_HOME is not set. + echo You may not be able to build Adempiere + echo Set JAVA_HOME to the directory of your local JDK. + exit fi +# check jdk +if [ ! -f $JAVA_HOME/lib/tools.jar ] ; then + echo "** Need full Java SDK **" + exit +fi + +#classpath +export ANT_CLASSPATH=$CLASSPATH:../tools/lib/ant.jar:../tools/lib/ant-launcher.jar:../tools/lib/ant-swing.jar:../tools/lib/ant-commons-net.jar:../tools/lib/commons-net.jar:$JAVA_HOME/lib/tools.jar + echo Cleanup ... -$JAVA_HOME/bin/java -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main clean +$JAVA_HOME/bin/java -classpath $ANT_CLASSPATH -Dant.home="." org.apache.tools.ant.Main clean echo Building ... -$JAVA_HOME/bin/java -Xmx500m -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main -logger org.apache.tools.ant.listener.MailLogger complete - -ls $ADEMPIERE_INSTALL +$JAVA_HOME/bin/java -Xmx500m -classpath $ANT_CLASSPATH -Dant.home="." org.apache.tools.ant.Main -logger org.apache.tools.ant.listener.MailLogger complete echo Done ... diff --git a/utils_dev/RUN_buildIncremental.sh b/utils_dev/RUN_buildIncremental.sh index 31d06bc1ff..83baca02a9 100755 --- a/utils_dev/RUN_buildIncremental.sh +++ b/utils_dev/RUN_buildIncremental.sh @@ -1,32 +1,49 @@ # This script compile Adempiere # Ported from Windows script Marek Mosiewicz - -SAVED_DIR=`pwd` #save current dir -cd `dirname $0`/../utils_dev #change dir to place where script resides - doesn not work with sym links -UTILS_DEV=`pwd` #this is adempiere source -cd $SAVED_DIR #back to the saved directory - -. $UTILS_DEV/myDevEnv.sh #call environment - -if [ ! $ADEMPIERE_ENV==Y ] ; then - echo "Can't set developemeent environemnt - check myDevEnv.sh" - exit 1 +# check java home +if [ $JAVA_HOME ]; then + export PATH=$JAVA_HOME/bin:$PATH +else + echo JAVA_HOME is not set. + echo You may not be able to build Adempiere + echo Set JAVA_HOME to the directory of your local JDK. + exit fi -echo "Stop Apps Server (waiting)" -$ADEMPIERE_HOME/utils/RUN_Server2Stop.sh -sleep 5 +# check jdk +if [ ! -f $JAVA_HOME/lib/tools.jar ] ; then + echo "** Need full Java SDK **" + exit +fi + +# check adempiere home +if [ ! $ADEMPIERE_HOME ] ; then + echo Warning: ADEMPIERE_HOME is not set. + echo You will not be able to update your local Adempiere Deployment. + echo Set ADEMPIERE_HOME to the directory of your local Adempiere Deployment. +fi + +# stop running adempiere server +if [ $ADEMPIERE_HOME ] ; then + echo "Stop Apps Server (waiting)" + $ADEMPIERE_HOME/utils/RUN_Server2Stop.sh + sleep 5 +fi + +#classpath +export ANT_CLASSPATH=$CLASSPATH:../tools/lib/ant.jar:../tools/lib/ant-launcher.jar:../tools/lib/ant-swing.jar:../tools/lib/ant-commons-net.jar:../tools/lib/commons-net.jar:$JAVA_HOME/lib/tools.jar echo Building ... -$JAVA_HOME/bin/java -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main update +$JAVA_HOME/bin/java -classpath $ANT_CLASSPATH -Dant.home="." org.apache.tools.ant.Main update -ls $ADEMPIERE_INSTALL +# start adempiere server +if [ $ADEMPIERE_HOME ] ; then + echo Cleaning up ... + rm -r -f $ADEMPIERE_HOME/jboss/server/adempiere/tmp -echo Cleaning up ... -rm -r -f $ADEMPIERE_HOME/jboss/server/adempiere/tmp - -echo Starting Apps Server ... -$ADEMPIERE_HOME/utils/RUN_Server2.sh + echo Starting Apps Server ... + $ADEMPIERE_HOME/utils/RUN_Server2.sh +fi exit 0 diff --git a/utils_dev/build.xml b/utils_dev/build.xml index ff6d69500e..9ff312ce62 100644 --- a/utils_dev/build.xml +++ b/utils_dev/build.xml @@ -60,7 +60,7 @@ - +