conor 2003/08/11 06:18:19
Modified: . build.bat build.sh build.xml
Log:
Copy parser jars into the bootstrap and dist areas. Makes it
easier to run Ant from the result of dist-lite
Revision Changes Path
1.38 +1 -1 ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/ant/build.bat,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -u -r1.37 -r1.38
--- build.bat 27 Jul 2003 14:38:17 -0000 1.37
+++ build.bat 11 Aug 2003 13:18:19 -0000 1.38
@@ -13,7 +13,7 @@
goto cleanup
:runAnt
-set LOCALCLASSPATH=lib/xercesImpl.jar;lib/xml-apis.jar
+set LOCALCLASSPATH=
for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i
set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH%
set LOCALCLASSPATH=
1.35 +6 -6 ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/ant/build.sh,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -w -u -r1.34 -r1.35
--- build.sh 27 Jul 2003 14:38:17 -0000 1.34
+++ build.sh 11 Aug 2003 13:18:19 -0000 1.35
@@ -28,7 +28,7 @@
exit
fi
-LOCALCLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar
+LOCALCLASSPATH=
# add in the dependency .jar files
DIRLIBS=lib/optional/*.jar
for i in ${DIRLIBS}
@@ -62,5 +62,5 @@
ANT_INSTALL="-emacs"
fi
-bootstrap/bin/ant -emacs "$ANT_INSTALL" $*
+bootstrap/bin/ant "$ANT_INSTALL" $*
1.391 +7 -7 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -w -u -r1.390 -r1.391
--- build.xml 4 Aug 2003 22:19:41 -0000 1.390
+++ build.xml 11 Aug 2003 13:18:19 -0000 1.391
@@ -1009,6 +1009,13 @@
</fileset>
</copy>
+ <copy todir="${dist.lib}">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ <include name="*.zip"/>
+ </fileset>
+ </copy>
+
<copy todir="${dist.bin}">
<fileset dir="${script.dir}/"/>
</copy>
@@ -1057,13 +1064,6 @@
<target name="internal_dist" depends="dist-lite,dist_javadocs">
<mkdir dir="${dist.docs}"/>
<mkdir dir="${dist.etc}"/>
-
- <copy todir="${dist.lib}">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- <include name="*.zip"/>
- </fileset>
- </copy>
<copy todir="${dist.lib}" file="${lib.dir}/README"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
