You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ru...@locus.apache.org on 2000/07/01 00:39:50 UTC
cvs commit: jakarta-ant lcp.bat build.bat build.sh
rubys 00/06/30 15:39:49
Modified: . build.bat build.sh
Added: . lcp.bat
Log:
Add lib/* to CLASSPATH
Revision Changes Path
1.7 +18 -4 jakarta-ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.bat 2000/06/21 14:23:39 1.6
+++ build.bat 2000/06/30 22:39:45 1.7
@@ -1,5 +1,19 @@
@echo off
-REM convience bat file to build with
-set TOOLSJAR=
-if exist %JAVA_HOME%\lib\tools.jar set TOOLSJAR=%JAVA_HOME%\lib\tools.jar
-java -classpath "%CLASSPATH%;%TOOLSJAR%;lib\ant.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5
+
+set _ANTHOME=%ANT_HOME%
+if "%ANT_HOME%" == "" set ANT_HOME=.
+
+set LOCALCLASSPATH=%CLASSPATH%
+for %%i in (%ANT_HOME%\lib\*.jar) do call lcp.bat %%i
+if exist %JAVA_HOME%\lib\tools.jar call lcp.bat %JAVA_HOME%\lib\tools.jar
+
+echo.
+echo Building with classpath: %LOCALCLASSPATH%
+echo.
+
+java -Dant.home="%ANT_HOME%" -classpath "%LOCALCLASSPATH%" %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+rem clean up
+set LOCALCLASSPATH=
+set ANT_HOME=%_ANTHOME%
+set _ANTHOME=
1.8 +12 -7 jakarta-ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/build.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.sh 2000/05/26 13:45:16 1.7
+++ build.sh 2000/06/30 22:39:45 1.8
@@ -5,15 +5,20 @@
fi
export ANT_HOME
-ADDL_CLASSPATH=$ANT_HOME/lib/ant.jar
+LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
if [ "$CLASSPATH" != "" ] ; then
- CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH
-else
- CLASSPATH=$ADDL_CLASSPATH
+ LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
fi
-export CLASSPATH
-echo Building with classpath $CLASSPATH
+if test -f $JAVA_HOME/lib/tools.jar ; then
+ LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
+fi
+
+echo
+echo Building with classpath: $LOCALCLASSPATH
+echo
+
+chmod 0755 $ANT_HOME/bin/antRun
-java org.apache.tools.ant.Main -Dant.home=$ANT_HOME $*
+java -Dant.home=$ANT_HOME -classpath $LOCALCLASSPATH $ANT_OPTS org.apache.tools.ant.Main $*
1.1 jakarta-ant/lcp.bat
Index: lcp.bat
===================================================================
set LOCALCLASSPATH=%LOCALCLASSPATH%;%1