You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by cr...@apache.org on 2003/12/13 07:35:22 UTC

cvs commit: xml-forrest/tools/ant/bin ant.bat antRun.bat lcp.bat

crossley    2003/12/12 22:35:22

  Modified:    tools/ant/bin ant.bat antRun.bat lcp.bat
  Log:
  Fix dos2unix line-endings. All files in CVS are stored with UNIX lf.
  
  Revision  Changes    Path
  1.6       +95 -95    xml-forrest/tools/ant/bin/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/ant/bin/ant.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ant.bat	4 Oct 2003 04:55:21 -0000	1.5
  +++ ant.bat	13 Dec 2003 06:35:22 -0000	1.6
  @@ -1,95 +1,95 @@
  -@echo off
  -
  -REM   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  -REM   reserved.
  -
  -if exist "%HOME%\forrestrc_pre.bat" call "%HOME%\forrestrc_pre.bat"
  -
  -if "%OS%"=="Windows_NT" @setlocal
  -
  -rem %~dp0 is expanded pathname of the current script under NT
  -set DEFAULT_ANT_HOME=%~dp0..
  -
  -if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
  -set DEFAULT_ANT_HOME=
  -
  -rem Slurp the command line arguments. This loop allows for an unlimited number
  -rem of arguments (up to the command line limit, anyway).
  -set ANT_CMD_LINE_ARGS=%1
  -if ""%1""=="""" goto doneStart
  -shift
  -:setupArgs
  -if ""%1""=="""" goto doneStart
  -set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
  -shift
  -goto setupArgs
  -rem This label provides a place for the argument list loop to break out
  -rem and for NT handling to skip to.
  -
  -:doneStart
  -rem find ANT_HOME if it does not exist due to either an invalid value passed
  -rem by the user or the %0 problem on Windows 9x
  -if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
  -
  -rem check for ant in Program Files
  -if not exist "%ProgramFiles%\ant" goto checkSystemDrive
  -set ANT_HOME=%ProgramFiles%\ant
  -goto checkJava
  -
  -:checkSystemDrive
  -rem check for ant in root directory of system drive
  -if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
  -set ANT_HOME=%SystemDrive%\ant
  -goto checkJava
  -
  -:checkCDrive
  -rem check for ant in C:\ant for Win9X users
  -if not exist C:\ant\lib\ant.jar goto noAntHome
  -set ANT_HOME=C:\ant
  -goto checkJava
  -
  -:noAntHome
  -echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
  -goto end
  -
  -:checkJava
  -set _JAVACMD=%JAVACMD%
  -
  -if "%JAVA_HOME%" == "" goto noJavaHome
  -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
  -if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
  -goto checkJikes
  -
  -:noJavaHome
  -if "%_JAVACMD%" == "" set _JAVACMD=java.exe
  -
  -:checkJikes
  -if not "%JIKESPATH%"=="" goto runAntWithJikes
  -
  -:runAnt
  -if not "%CLASSPATH%"=="" goto runAntWithClasspath
  -"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
  -goto end
  -
  -:runAntWithClasspath
  -"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
  -goto end
  -
  -:runAntWithJikes
  -if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
  -"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
  -goto end
  -
  -:runAntWithJikesAndClasspath
  -"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%  -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
  -goto end
  -
  -:end
  -set _JAVACMD=
  -set ANT_CMD_LINE_ARGS=
  -
  -if "%OS%"=="Windows_NT" @endlocal
  -
  -:mainEnd
  -if exist "%HOME%\forrestrc_post.bat" call "%HOME%\forrestrc_post.bat"
  -
  +@echo off
  +
  +REM   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  +REM   reserved.
  +
  +if exist "%HOME%\forrestrc_pre.bat" call "%HOME%\forrestrc_pre.bat"
  +
  +if "%OS%"=="Windows_NT" @setlocal
  +
  +rem %~dp0 is expanded pathname of the current script under NT
  +set DEFAULT_ANT_HOME=%~dp0..
  +
  +if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
  +set DEFAULT_ANT_HOME=
  +
  +rem Slurp the command line arguments. This loop allows for an unlimited number
  +rem of arguments (up to the command line limit, anyway).
  +set ANT_CMD_LINE_ARGS=%1
  +if ""%1""=="""" goto doneStart
  +shift
  +:setupArgs
  +if ""%1""=="""" goto doneStart
  +set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
  +shift
  +goto setupArgs
  +rem This label provides a place for the argument list loop to break out
  +rem and for NT handling to skip to.
  +
  +:doneStart
  +rem find ANT_HOME if it does not exist due to either an invalid value passed
  +rem by the user or the %0 problem on Windows 9x
  +if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
  +
  +rem check for ant in Program Files
  +if not exist "%ProgramFiles%\ant" goto checkSystemDrive
  +set ANT_HOME=%ProgramFiles%\ant
  +goto checkJava
  +
  +:checkSystemDrive
  +rem check for ant in root directory of system drive
  +if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
  +set ANT_HOME=%SystemDrive%\ant
  +goto checkJava
  +
  +:checkCDrive
  +rem check for ant in C:\ant for Win9X users
  +if not exist C:\ant\lib\ant.jar goto noAntHome
  +set ANT_HOME=C:\ant
  +goto checkJava
  +
  +:noAntHome
  +echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
  +goto end
  +
  +:checkJava
  +set _JAVACMD=%JAVACMD%
  +
  +if "%JAVA_HOME%" == "" goto noJavaHome
  +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
  +if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
  +goto checkJikes
  +
  +:noJavaHome
  +if "%_JAVACMD%" == "" set _JAVACMD=java.exe
  +
  +:checkJikes
  +if not "%JIKESPATH%"=="" goto runAntWithJikes
  +
  +:runAnt
  +if not "%CLASSPATH%"=="" goto runAntWithClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:runAntWithClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:runAntWithJikes
  +if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:runAntWithJikesAndClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%  -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:end
  +set _JAVACMD=
  +set ANT_CMD_LINE_ARGS=
  +
  +if "%OS%"=="Windows_NT" @endlocal
  +
  +:mainEnd
  +if exist "%HOME%\forrestrc_post.bat" call "%HOME%\forrestrc_post.bat"
  +
  
  
  
  1.4       +31 -31    xml-forrest/tools/ant/bin/antRun.bat
  
  Index: antRun.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/ant/bin/antRun.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- antRun.bat	30 Oct 2002 09:08:27 -0000	1.3
  +++ antRun.bat	13 Dec 2003 06:35:22 -0000	1.4
  @@ -1,31 +1,31 @@
  -@echo off
  -
  -REM   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  -REM   reserved.
  -
  -if "%OS%"=="Windows_NT" @setlocal
  -
  -if ""%1""=="""" goto runCommand
  -
  -rem Change drive and directory to %1
  -if "%OS%"=="Windows_NT" cd /d ""%1""
  -if not "%OS%"=="Windows_NT" cd ""%1""
  -shift
  -
  -rem Slurp the command line arguments. This loop allows for an unlimited number
  -rem of agruments (up to the command line limit, anyway).
  -set ANT_RUN_CMD=%1
  -if ""%1""=="""" goto runCommand
  -shift
  -:loop
  -if ""%1""=="""" goto runCommand
  -set ANT_RUN_CMD=%ANT_RUN_CMD% %1
  -shift
  -goto loop
  -
  -:runCommand
  -rem echo %ANT_RUN_CMD%
  -%ANT_RUN_CMD%
  -
  -if "%OS%"=="Windows_NT" @endlocal
  -
  +@echo off
  +
  +REM   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  +REM   reserved.
  +
  +if "%OS%"=="Windows_NT" @setlocal
  +
  +if ""%1""=="""" goto runCommand
  +
  +rem Change drive and directory to %1
  +if "%OS%"=="Windows_NT" cd /d ""%1""
  +if not "%OS%"=="Windows_NT" cd ""%1""
  +shift
  +
  +rem Slurp the command line arguments. This loop allows for an unlimited number
  +rem of agruments (up to the command line limit, anyway).
  +set ANT_RUN_CMD=%1
  +if ""%1""=="""" goto runCommand
  +shift
  +:loop
  +if ""%1""=="""" goto runCommand
  +set ANT_RUN_CMD=%ANT_RUN_CMD% %1
  +shift
  +goto loop
  +
  +:runCommand
  +rem echo %ANT_RUN_CMD%
  +%ANT_RUN_CMD%
  +
  +if "%OS%"=="Windows_NT" @endlocal
  +
  
  
  
  1.5       +16 -16    xml-forrest/tools/ant/bin/lcp.bat
  
  Index: lcp.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/ant/bin/lcp.bat,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- lcp.bat	4 Oct 2003 04:55:21 -0000	1.4
  +++ lcp.bat	13 Dec 2003 06:35:22 -0000	1.5
  @@ -1,16 +1,16 @@
  -REM   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  -REM   reserved.
  -
  -set _CLASSPATHCOMPONENT=%1
  -if ""%1""=="""" goto gotAllArgs
  -shift
  -
  -:argCheck
  -if ""%1""=="""" goto gotAllArgs
  -set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
  -shift
  -goto argCheck
  -
  -:gotAllArgs
  -set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
  -
  +REM   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  +REM   reserved.
  +
  +set _CLASSPATHCOMPONENT=%1
  +if ""%1""=="""" goto gotAllArgs
  +shift
  +
  +:argCheck
  +if ""%1""=="""" goto gotAllArgs
  +set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
  +shift
  +goto argCheck
  +
  +:gotAllArgs
  +set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
  +