Browse Source

Copy types/defaults.properties during bootstrap.

Submitted by:	Cheng-Wei Cheng <CCheng@gluecode.com>

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.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268098 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
28100edfae
2 changed files with 4 additions and 2 deletions
  1. +2
    -1
      bootstrap.bat
  2. +2
    -1
      bootstrap.sh

+ 2
- 1
bootstrap.bat View File

@@ -50,11 +50,12 @@ echo.
echo ... Copying Required Files echo ... Copying Required Files


copy %TOOLS%\ant\taskdefs\*.properties %CLASSDIR%\org\apache\tools\ant\taskdefs copy %TOOLS%\ant\taskdefs\*.properties %CLASSDIR%\org\apache\tools\ant\taskdefs
copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types


echo. echo.
echo ... Building Ant Distribution 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.
echo ... Cleaning Up Build Directories echo ... Cleaning Up Build Directories


+ 2
- 1
bootstrap.sh View File

@@ -56,10 +56,11 @@ ${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java
echo ... Copying Required Files 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/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 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 echo ... Cleaning Up Build Directories




Loading…
Cancel
Save