diff options
| author | Conor MacNeill <conor@apache.org> | 2000-07-12 15:54:17 +0000 |
|---|---|---|
| committer | Conor MacNeill <conor@apache.org> | 2000-07-12 15:54:17 +0000 |
| commit | 0a5e88a59027a729d49c20481f8e0a3074820b70 (patch) | |
| tree | ce4cc996681d43941550279c0383bdce869edd90 /bootstrap.bat | |
| parent | e7985a74cdbe0fd987de392da06777d4c9d50fb1 (diff) | |
| download | ant-0a5e88a59027a729d49c20481f8e0a3074820b70.tar.gz | |
Rework the ant build process for NT/Windows
Change so that
build.bat is used just to build ant itself.
ant.bat should be used to run ant for other projects.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267770 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bootstrap.bat')
| -rwxr-xr-x | bootstrap.bat | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index 9e89e817f..05c21f762 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -5,8 +5,9 @@ REM You will need to specify JAVA_HOME if compiling with 1.2 or later. set OLDJAVA=%JAVA% set OLDJAVAC=%JAVAC% set OLDCLASSPATH=%CLASSPATH% +set OLDANTHOME=%ANT_HOME% -if exist ..\antrc.bat call ..\antrc.bat +set ANT_HOME=. if "" == "%JAVA%" if "" == "%JAVA_HOME%" set JAVA=java if "" == "%JAVA%" set JAVA=%JAVA_HOME%\bin\java @@ -48,13 +49,11 @@ copy %TOOLS%\ant\taskdefs\*.properties classes\org\apache\tools\ant\taskdefs echo. echo ... Building Ant Distribution -%JAVA% org.apache.tools.ant.Main clean main install %1 %2 %3 %4 %5 +%JAVA% org.apache.tools.ant.Main clean main bootstrap %1 %2 %3 %4 %5 echo. echo ... Cleaning Up Build Directories -%JAVA% org.apache.tools.ant.Main clean %1 %2 %3 %4 %5 - if "%OS%" == "Windows_NT" if exist classes\nul rmdir/s/q classes if not "%OS%" == "Windows_NT" if exist classes\nul deltree/y classes @@ -64,9 +63,11 @@ echo ... Done Bootstrapping Ant Distribution set JAVA=%OLDJAVA% set JAVAC=%OLDJAVAC% set CLASSPATH=%OLDCLASSPATH% +set ANT_HOME=%OLDANTHOME% set OLDJAVA= set OLDJAVAC= set OLDCLASSPATH= set LOCALCLASSPATH= +set OLDANTHOME= set TOOLS= |