ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/script ant.bat
Date Mon, 29 Jan 2001 01:13:56 GMT
conor       01/01/28 17:13:56

  Modified:    src/script ant.bat
  Log:
  Allow ant to handle parameters with spaces under Win systems
  
  I added a few other things to Bill's patch, such as setlocal and
  endlocal calls.
  
  Submitted by:	Bill Burton [billb@progress.com]
  
  Revision  Changes    Path
  1.3       +97 -86    jakarta-ant/src/script/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/script/ant.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.bat	2001/01/23 14:27:10	1.2
  +++ ant.bat	2001/01/29 01:13:56	1.3
  @@ -1,86 +1,97 @@
  -@echo off
  -
  -if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
  -
  -if not "%OS%"=="Windows_NT" goto start
  -
  -rem %~dp0 is name of current script under NT
  -set DEFAULT_ANT_HOME=%~dp0
  -
  -rem : operator works similar to make : operator
  -set DEFAULT_ANT_HOME=%DEFAULT_ANT_HOME:\bin\=%
  -
  -if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
  -set DEFAULT_ANT_HOME=
  -
  -:start
  -
  -rem Slurp the command line arguments.  This loop allows for an unlimited number of 
  -rem agruments (up to the command line limit, anyway).
  -
  -set ANT_CMD_LINE_ARGS=
  -
  -:setupArgs
  -if "%1"=="" goto doneArgs
  -set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
  -shift
  -goto setupArgs
  -
  -:doneArgs
  -rem The doneArgs label is here just to provide a place for the argument list loop
  -rem to break out to.
  -
  -rem find ANT_HOME
  -if not "%ANT_HOME%"=="" goto checkJava
  -
  -rem check for ant in Program Files on system drive
  -if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
  -set ANT_HOME=%SystemDrive%\Program Files\ant
  -goto checkJava
  -
  -:checkSystemDrive
  -rem check for ant in root directory of system drive
  -if not exist "%SystemDrive%\ant" goto noAntHome
  -set ANT_HOME=%SystemDrive%\ant
  -goto checkJava
  -
  -:noAntHome
  -echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME.
  -goto end
  -
  -:checkJava
  -set _JAVACMD=%JAVACMD%
  -set LOCALCLASSPATH="%CLASSPATH%"
  -for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
  -for %%i in ("%ANT_HOME%\lib\core\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
  -
  -if "%JAVA_HOME%" == "" goto noJavaHome
  -if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
  -if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\tools.jar"
  -if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\classes.zip"
  -goto checkJikes
  -
  -:noJavaHome
  -if "%_JAVACMD%" == "" set _JAVACMD=java
  -echo.
  -echo Warning: JAVA_HOME environment variable is not set.
  -echo   If build fails because sun.* classes could not be found
  -echo   you will need to set the JAVA_HOME environment variable
  -echo   to the installation directory of java.
  -echo.
  -
  -:checkJikes
  -if not "%JIKESPATH%" == "" goto runAntWithJikes
  -
  -:runAnt
  -%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main
%ANT_CMD_LINE_ARGS%
  -goto end
  -
  -:runAntWithJikes
  -%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH%
%ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
  -
  -:end
  -if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
  -set LOCALCLASSPATH=
  -set ANT_CMD_LINE_ARGS=
  -
  +@echo off
  +
  +if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
  +
  +if not "%OS%"=="Windows_NT" goto win9xStart
  +:winNTStart
  +@setlocal
  +
  +rem %~dp0 is name of current script under NT
  +set DEFAULT_ANT_HOME=%~dp0
  +
  +rem : operator works similar to make : operator
  +set DEFAULT_ANT_HOME=%DEFAULT_ANT_HOME:\bin\=%
  +
  +if %ANT_HOME%a==a set ANT_HOME=%DEFAULT_ANT_HOME%
  +set DEFAULT_ANT_HOME=
  +
  +rem On NT/2K grab all arguments at once
  +set ANT_CMD_LINE_ARGS=%*
  +goto doneStart
  +
  +:win9xStart
  +rem Slurp the command line arguments.  This loop allows for an unlimited number of 
  +rem agruments (up to the command line limit, anyway).
  +
  +set ANT_CMD_LINE_ARGS=
  +
  +:setupArgs
  +if %1a==a goto doneStart
  +set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
  +shift
  +goto setupArgs
  +
  +:doneStart
  +rem This label provides a place for the argument list loop to break out 
  +rem and for NT handling to skip to.
  +
  +rem find ANT_HOME
  +if not "%ANT_HOME%"=="" goto checkJava
  +
  +rem check for ant in Program Files on system drive
  +if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
  +set ANT_HOME=%SystemDrive%\Program Files\ant
  +goto checkJava
  +
  +:checkSystemDrive
  +rem check for ant in root directory of system drive
  +if not exist "%SystemDrive%\ant" goto noAntHome
  +set ANT_HOME=%SystemDrive%\ant
  +goto checkJava
  +
  +:noAntHome
  +echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME.
  +goto end
  +
  +:checkJava
  +set _JAVACMD=%JAVACMD%
  +set LOCALCLASSPATH="%CLASSPATH%"
  +for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
  +for %%i in ("%ANT_HOME%\lib\core\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
  +
  +if "%JAVA_HOME%" == "" goto noJavaHome
  +if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
  +if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\tools.jar"
  +if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\classes.zip"
  +goto checkJikes
  +
  +:noJavaHome
  +if "%_JAVACMD%" == "" set _JAVACMD=java
  +echo.
  +echo Warning: JAVA_HOME environment variable is not set.
  +echo   If build fails because sun.* classes could not be found
  +echo   you will need to set the JAVA_HOME environment variable
  +echo   to the installation directory of java.
  +echo.
  +
  +:checkJikes
  +if not "%JIKESPATH%" == "" goto runAntWithJikes
  +
  +:runAnt
  +%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main
%ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:runAntWithJikes
  +%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH%
%ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
  +
  +:end
  +set LOCALCLASSPATH=
  +set ANT_CMD_LINE_ARGS=
  +
  +if not "%OS%"=="Windows_NT" goto mainEnd
  +:winNTend
  +@endlocal
  +
  +:mainEnd
  +if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
  +
  
  
  

Mime
View raw message