conor 01/02/03 06:23:47
Modified: . build.bat build.sh build.xml
Log:
Add in any jars in lib/optional when doing a build.
Revision Changes Path
1.25 +4 -1 jakarta-ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/build.bat,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.bat 2001/02/03 05:32:25 1.24
+++ build.bat 2001/02/03 14:23:47 1.25
@@ -7,7 +7,10 @@
call bootstrap.bat
:runAnt
-set CLASSPATH=bootstrap\lib\ant.jar;lib\parser.jar;lib\jaxp.jar;%CLASSPATH%
+set LOCALCLASSPATH=lib\parser.jar;lib\jaxp.jar
+for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat "%%i"
+set CLASSPATH=%LOCALCLASSPATH%;%CLASSPATH%
+
if not "%REAL_ANT_HOME%" == "" goto install_ant
call bootstrap\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
1.20 +12 -1 jakarta-ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/build.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.sh 2001/02/02 04:58:54 1.19
+++ build.sh 2001/02/03 14:23:47 1.20
@@ -8,8 +8,19 @@
/bin/sh ./bootstrap.sh
fi
-CLASSPATH=$CLASSPATH:lib/parser.jar:lib/jaxp.jar
+LOCALCLASSPATH=lib/parser.jar:lib/jaxp.jar
+# add in the dependency .jar files
+DIRLIBS=lib/optional/*.jar
+for i in ${DIRLIBS}
+do
+ if [ "$i" != "${DIRLIBS}" ] ; then
+ LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
+ fi
+done
+
+CLASSPATH=$LOCALCLASSPATH:$CLASSPATH
export CLASSPATH
+
if [ "$REALANTHOME" != "" ] ; then
ANT_INSTALL="-Dant.install=$REALANTHOME"
1.128 +1 -2 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- build.xml 2001/02/02 17:03:50 1.127
+++ build.xml 2001/02/03 14:23:47 1.128
@@ -429,9 +429,8 @@
Cleans up build and distribution directories
===================================================================
-->
- <target name="clean" depends="setup-distproperties">
+ <target name="clean">
<delete dir="${build.dir}" />
- <delete dir="${dist.dir}" />
<delete dir="${dist.base}" />
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
|