summaryrefslogtreecommitdiff
path: root/build.bat
diff options
context:
space:
mode:
authorPeter Donald <donaldp@apache.org>2001-01-23 14:07:13 +0000
committerPeter Donald <donaldp@apache.org>2001-01-23 14:07:13 +0000
commit99f86d5034e44191bb19ec5ca23d8d8a97a4b008 (patch)
tree1c5b6338c0a425f138ba82ba05a964eb0e90decf /build.bat
parentb4dcbaf0aeeb6c048039cd0d747416783f2c883d (diff)
downloadant-99f86d5034e44191bb19ec5ca23d8d8a97a4b008.tar.gz
Fixed errors wrt
* junit not being on primordial classloader. * ANT_HOME being overidden * no install target * no version data git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268509 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.bat')
-rwxr-xr-xbuild.bat10
1 files changed, 5 insertions, 5 deletions
diff --git a/build.bat b/build.bat
index fc74e3627..78b8e9d8b 100755
--- a/build.bat
+++ b/build.bat
@@ -12,11 +12,9 @@ echo ----------------
rem exit
-set LOCALCLASSPATH=build\classes
+set LOCALCLASSPATH=lib\optional\junit.jar;build\classes
for %%i in (lib\*.jar) do call src\script\lcp.bat %%i
-set ANT_HOME=.
-
if "%JAVA_HOME%" == "" goto noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat "%JAVA_HOME%\lib\tools.jar"
@@ -33,9 +31,11 @@ echo to the installation directory of java.
echo.
:runAnt
+set NEW_ANT_HOME=%ANT_HOME%
+if "x%ANT_HOME%" == "x" set NEW_ANT_HOME=dist
set CLASSPATH=%LOCALCLASSPATH%
set LOCALCLASSPATH=
-%_JAVACMD% -classpath %CLASSPATH% %ANT_OPTS% org.apache.tools.ant.Main -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8
+%_JAVACMD% -classpath %CLASSPATH% %ANT_OPTS% org.apache.tools.ant.Main "-Dant.home=%NEW_ANT_HOME%" -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8
-set ANT_HOME=
set CLASSPATH=
+set NEW_ANT_HOME=