[1673357] Remove use of myDevEnvTemple script

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
+#check java home
-cd `dirname $0`			#change dir to place where script resides - does not work with sym links
+if [ $JAVA_HOME ]; then
-UTILS_DEV=`pwd`			#this is adempiere source
+  export PATH=$JAVA_HOME/bin:$PATH	
-cd $SAVED_DIR			#back to the saved directory
+else
-
+  echo JAVA_HOME is not set.
-.  $UTILS_DEV/myDevEnv.sh	#call environment
+  echo You may not be able to build Adempiere
-
+  echo Set JAVA_HOME to the directory of your local JDK.
-
+  exit
-if [ ! $ADEMPIERE_ENV==Y ] ; then
-    echo "Can't set development environemnt - check myDevEnv.sh"
-    exit 1
 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
+$JAVA_HOME/bin/java   -Xmx500m -classpath $ANT_CLASSPATH -Dant.home="." org.apache.tools.ant.Main -logger org.apache.tools.ant.listener.MailLogger complete
-
-ls $ADEMPIERE_INSTALL
 
 echo Done ...
 

utils_dev/RUN_buildIncremental.sh

@@ -1,32 +1,49 @@
 #	This script compile Adempiere 
 #	Ported from Windows script Marek Mosiewicz<marek.mosiewicz@jotel.com.pl>
 
-
+# check java home
-SAVED_DIR=`pwd`			#save current dir
+if [ $JAVA_HOME ]; then
-cd `dirname $0`/../utils_dev	#change dir to place where script resides - doesn not work with sym links
+  export PATH=$JAVA_HOME/bin:$PATH	
-UTILS_DEV=`pwd`			#this is adempiere source
+else
-cd $SAVED_DIR			#back to the saved directory
+  echo JAVA_HOME is not set.
-
+  echo You may not be able to build Adempiere
-.  $UTILS_DEV/myDevEnv.sh	#call environment
+  echo Set JAVA_HOME to the directory of your local JDK.
-
+  exit
-if [ ! $ADEMPIERE_ENV==Y ] ; then
-    echo "Can't set developemeent environemnt - check myDevEnv.sh"
-    exit 1
 fi
 
+# 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	Starting Apps Server ...
    $ADEMPIERE_HOME/utils/RUN_Server2.sh
+fi
 
 exit 0

utils_dev/build.xml

@@ -60,7 +60,7 @@
 	<!-- ================================================ -->
 	<target name="install" depends="" description="Environment dependent">
 		<echo message="=========== Install Adempiere"/>
-		<copy todir="${env.ADEMPIERE_INSTALL}">
+		<copy todir="${env.ADEMPIERE_INSTALL}" verbose="true">
 			<fileset dir="install/build" includes="Adempiere_*"/>
 		</copy>
 		<!-- Delete Existing stuff, but not utils + data 	-->