avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon/tools/bin ant.bat antRun.bat cocoon.bat lcp.bat
Date Sat, 23 Mar 2002 12:34:47 GMT
jefft       02/03/23 04:34:47

  Modified:    tools/bin ant.bat antRun.bat cocoon.bat lcp.bat
  Log:
  Unix -> DOS linefeeds
  
  Revision  Changes    Path
  1.4       +97 -97    jakarta-avalon/tools/bin/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/tools/bin/ant.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.bat	19 Jul 2001 09:54:39 -0000	1.3
  +++ ant.bat	23 Mar 2002 12:34:46 -0000	1.4
  @@ -1,97 +1,97 @@
  -@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 _JAVACMD=
  -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 _JAVACMD=
  +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"
  +
  
  
  
  1.4       +20 -20    jakarta-avalon/tools/bin/antRun.bat
  
  Index: antRun.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/tools/bin/antRun.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- antRun.bat	19 Jul 2001 09:54:39 -0000	1.3
  +++ antRun.bat	23 Mar 2002 12:34:46 -0000	1.4
  @@ -1,20 +1,20 @@
  -@echo off
  - 
  -# Change drive and directory to %1 (Win9X only for NT/2K use "cd /d")
  -cd %1
  -%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
  + 
  +# Change drive and directory to %1 (Win9X only for NT/2K use "cd /d")
  +cd %1
  +%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.3       +45 -45    jakarta-avalon/tools/bin/cocoon.bat
  
  Index: cocoon.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/tools/bin/cocoon.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- cocoon.bat	19 Jul 2001 09:54:39 -0000	1.2
  +++ cocoon.bat	23 Mar 2002 12:34:46 -0000	1.3
  @@ -1,45 +1,45 @@
  -@echo off
  -:: -----------------------------------------------------------------------------
  -:: run.bat - Win32 Run Script for Apache Cocoon
  -::
  -:: $Id: cocoon.bat,v 1.2 2001/07/19 09:54:39 donaldp Exp $
  -:: -----------------------------------------------------------------------------
  - 
  -:: ----- Verify and Set Required Environment Variables -------------------------
  -
  -if not "%JAVA_HOME%" == "" goto gotJavaHome
  -echo You must set JAVA_HOME to point at your Java Development Kit installation
  -goto cleanup
  -:gotJavaHome
  -
  -:: ----- Verify and Set Required Environment Variables -------------------------
  -
  -if not "%COCOON_LIB%" == "" goto gotCocoonLib
  -set COCOON_LIB=..\lib
  -:gotCocoonLib
  -
  -if not "%COCOON_WORK%" == "" goto gotCocoonWork
  -set COCOON_WORK=..\work
  -:gotCocoonWork
  -
  -:: ----- Set Up The Runtime Classpath ------------------------------------------
  -
  -set CP=%JAVA_HOME%\lib\tools.jar;%COCOON_WORK%
  -for %%i in (%COCOON_LIB%\*.jar) do call lcp.bat %%i
  -for %%i in (..\..\lib\*.jar) do call lcp.bat %%i
  -for %%i in (..\..\build\lib\*.jar) do call lcp.bat %%i
  -
  -:: ----- Run Cocoon ------------------------------------------------------------
  -
  -if "%OS%" == "Windows_NT" goto nt
  -%JAVA_HOME%\bin\java.exe %COCOON_OPTS% -classpath %CP% org.apache.cocoon.Main %1 %2 %3
%4 %5 %6 %7 %8 %9
  -goto cleanup
  -:nt
  -%JAVA_HOME%\bin\java.exe %COCOON_OPTS% -classpath %CP% org.apache.cocoon.Main %*
  -
  -:: ----- Cleanup the environment -----------------------------------------------
  -
  -:cleanup
  -set CP=
  -
  -
  +@echo off
  +:: -----------------------------------------------------------------------------
  +:: run.bat - Win32 Run Script for Apache Cocoon
  +::
  +:: $Id: cocoon.bat,v 1.3 2002/03/23 12:34:46 jefft Exp $
  +:: -----------------------------------------------------------------------------
  + 
  +:: ----- Verify and Set Required Environment Variables -------------------------
  +
  +if not "%JAVA_HOME%" == "" goto gotJavaHome
  +echo You must set JAVA_HOME to point at your Java Development Kit installation
  +goto cleanup
  +:gotJavaHome
  +
  +:: ----- Verify and Set Required Environment Variables -------------------------
  +
  +if not "%COCOON_LIB%" == "" goto gotCocoonLib
  +set COCOON_LIB=..\lib
  +:gotCocoonLib
  +
  +if not "%COCOON_WORK%" == "" goto gotCocoonWork
  +set COCOON_WORK=..\work
  +:gotCocoonWork
  +
  +:: ----- Set Up The Runtime Classpath ------------------------------------------
  +
  +set CP=%JAVA_HOME%\lib\tools.jar;%COCOON_WORK%
  +for %%i in (%COCOON_LIB%\*.jar) do call lcp.bat %%i
  +for %%i in (..\..\lib\*.jar) do call lcp.bat %%i
  +for %%i in (..\..\build\lib\*.jar) do call lcp.bat %%i
  +
  +:: ----- Run Cocoon ------------------------------------------------------------
  +
  +if "%OS%" == "Windows_NT" goto nt
  +%JAVA_HOME%\bin\java.exe %COCOON_OPTS% -classpath %CP% org.apache.cocoon.Main %1 %2 %3
%4 %5 %6 %7 %8 %9
  +goto cleanup
  +:nt
  +%JAVA_HOME%\bin\java.exe %COCOON_OPTS% -classpath %CP% org.apache.cocoon.Main %*
  +
  +:: ----- Cleanup the environment -----------------------------------------------
  +
  +:cleanup
  +set CP=
  +
  +
  
  
  
  1.3       +2 -2      jakarta-avalon/tools/bin/lcp.bat
  
  Index: lcp.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/tools/bin/lcp.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- lcp.bat	19 Jul 2001 09:54:39 -0000	1.2
  +++ lcp.bat	23 Mar 2002 12:34:46 -0000	1.3
  @@ -1,2 +1,2 @@
  -set LOCALCLASSPATH=%1;%LOCALCLASSPATH%
  - 
  +set LOCALCLASSPATH=%1;%LOCALCLASSPATH%
  + 
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message