bodewig 00/10/17 04:09:14
Modified: . bootstrap.bat bootstrap.sh
Log:
Copy types/defaults.properties during bootstrap.
Submitted by: Cheng-Wei Cheng <[EMAIL PROTECTED]>
Changed the JIKESON env variable from my last patch to ANT_OPTS to be
consistent with src/bin/ant. Made the same changes to bootstrap.bat.
Revision Changes Path
1.18 +2 -1 jakarta-ant/bootstrap.bat
Index: bootstrap.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bootstrap.bat 2000/09/08 15:40:36 1.17
+++ bootstrap.bat 2000/10/17 11:09:12 1.18
@@ -50,11 +50,12 @@
echo ... Copying Required Files
copy %TOOLS%\ant\taskdefs\*.properties
%CLASSDIR%\org\apache\tools\ant\taskdefs
+copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types
echo.
echo ... Building Ant Distribution
-%JAVA% org.apache.tools.ant.Main clean main bootstrap %1 %2 %3 %4 %5
+%JAVA% %ANT_OPTS% org.apache.tools.ant.Main clean main bootstrap %1 %2 %3 %4
%5
echo.
echo ... Cleaning Up Build Directories
1.24 +2 -1 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bootstrap.sh 2000/10/17 11:00:38 1.23
+++ bootstrap.sh 2000/10/17 11:09:12 1.24
@@ -56,10 +56,11 @@
echo ... Copying Required Files
cp src/main/org/apache/tools/ant/taskdefs/defaults.properties
${CLASSDIR}/org/apache/tools/ant/taskdefs
+cp src/main/org/apache/tools/ant/types/defaults.properties
${CLASSDIR}/org/apache/tools/ant/types
echo ... Building Ant Distribution
-java org.apache.tools.ant.Main clean main bootstrap $JIKESON
+java ${ANT_OPTS} org.apache.tools.ant.Main clean main bootstrap
echo ... Cleaning Up Build Directories
