You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by do...@apache.org on 2001/02/24 06:08:40 UTC

cvs commit: jakarta-avalon-phoenix/tools/bin lcp.bat antRun.bat ant.bat

donaldp     01/02/23 21:08:40

  Modified:    tools/bin lcp.bat antRun.bat ant.bat
  Log:
  Commit files minus the ^Ms
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-avalon-phoenix/tools/bin/lcp.bat
  
  Index: lcp.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/tools/bin/lcp.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lcp.bat	2001/02/24 04:24:48	1.1
  +++ lcp.bat	2001/02/24 05:08:40	1.2
  @@ -1,2 +1,2 @@
  -set LOCALCLASSPATH=%1;%LOCALCLASSPATH%
  -
  +set LOCALCLASSPATH=%1;%LOCALCLASSPATH%
  +
  
  
  
  1.2       +18 -18    jakarta-avalon-phoenix/tools/bin/antRun.bat
  
  Index: antRun.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/tools/bin/antRun.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- antRun.bat	2001/02/24 04:24:48	1.1
  +++ antRun.bat	2001/02/24 05:08:40	1.2
  @@ -1,18 +1,18 @@
  -@echo off
  -
  -cd %1
  -set ANT_RUN_CMD=%2
  -shift
  -shift
  -
  -set PARAMS=
  -:loop
  -if ""%1 == "" goto runCommand
  -set PARAMS=%PARAMS% %1
  -shift
  -goto loop
  -
  -:runCommand
  -rem echo %ANT_RUN_CMD% %PARAMS%
  -%ANT_RUN_CMD% %PARAMS%
  -
  +@echo off
  +
  +cd %1
  +set ANT_RUN_CMD=%2
  +shift
  +shift
  +
  +set PARAMS=
  +:loop
  +if ""%1 == "" goto runCommand
  +set PARAMS=%PARAMS% %1
  +shift
  +goto loop
  +
  +:runCommand
  +rem echo %ANT_RUN_CMD% %PARAMS%
  +%ANT_RUN_CMD% %PARAMS%
  +
  
  
  
  1.2       +96 -96    jakarta-avalon-phoenix/tools/bin/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/tools/bin/ant.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.bat	2001/02/24 04:24:48	1.1
  +++ ant.bat	2001/02/24 05:08:40	1.2
  @@ -1,96 +1,96 @@
  -@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"
  -
  -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"
  -
  +@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"
  +
  +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"
  +