diff options
| author | Stefan Bodewig <bodewig@apache.org> | 2000-10-17 11:09:12 +0000 |
|---|---|---|
| committer | Stefan Bodewig <bodewig@apache.org> | 2000-10-17 11:09:12 +0000 |
| commit | 28100edfaecc6b1d3981adba6e2cc245b89c6458 (patch) | |
| tree | b95a224bf529ed97497f531e5c7f1f55303c9286 | |
| parent | 7548efa18e77ac9cf24a13a2b5b9569ad4517f49 (diff) | |
| download | ant-28100edfaecc6b1d3981adba6e2cc245b89c6458.tar.gz | |
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
| -rwxr-xr-x | bootstrap.bat | 3 | ||||
| -rwxr-xr-x | bootstrap.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index 4118a8617..31e29af5b 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -50,11 +50,12 @@ echo. 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 diff --git a/bootstrap.sh b/bootstrap.sh index da53e2d6d..3c5a8c7e0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -56,10 +56,11 @@ ${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java 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 |