ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant build.bat bootstrap.bat
Date Sun, 21 Jan 2001 01:48:24 GMT
donaldp     01/01/20 17:48:24

  Modified:    .        build.bat bootstrap.bat
  Log:
  Added ^M's so it is easier for peeps working on windows who check out using unix style linefeeds.
  
  Revision  Changes    Path
  1.14      +19 -19    jakarta-ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.bat,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.bat	2000/10/18 13:36:06	1.13
  +++ build.bat	2001/01/21 01:48:23	1.14
  @@ -1,19 +1,19 @@
  -@echo off
  -
  -set REALANTHOME=%ANT_HOME%
  -set ANT_HOME=.
  -if exist lib\ant.jar if exist bin\ant.bat if exist bin\lcp.bat if exist bin\antRun.bat
goto runAnt
  -call bootstrap.bat
  -
  -:runAnt
  -if not "%REALANTHOME%" == "" goto install_ant
  -call .\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
  -goto cleanup
  -
  -:install_ant
  -call .\bin\ant.bat -Dant.install="%REALANTHOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9
  -
  -rem clean up
  -:cleanup
  -set ANT_HOME=%REALANTHOME%
  -set REALANTHOME=
  +@echo off
  +
  +set REALANTHOME=%ANT_HOME%
  +set ANT_HOME=.
  +if exist lib\ant.jar if exist bin\ant.bat if exist bin\lcp.bat if exist bin\antRun.bat
goto runAnt
  +call bootstrap.bat
  +
  +:runAnt
  +if not "%REALANTHOME%" == "" goto install_ant
  +call .\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
  +goto cleanup
  +
  +:install_ant
  +call .\bin\ant.bat -Dant.install="%REALANTHOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9
  +
  +rem clean up
  +:cleanup
  +set ANT_HOME=%REALANTHOME%
  +set REALANTHOME=
  
  
  
  1.23      +79 -79    jakarta-ant/bootstrap.bat
  
  Index: bootstrap.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- bootstrap.bat	2000/12/20 11:18:07	1.22
  +++ bootstrap.bat	2001/01/21 01:48:23	1.23
  @@ -1,79 +1,79 @@
  -@echo off
  -
  -REM You will need to specify JAVA_HOME if compiling with 1.2 or later.
  -
  -set OLDJAVA=%JAVA%
  -set OLDJAVAC=%JAVAC%
  -set OLDCLASSPATH=%CLASSPATH%
  -set OLDANTHOME=%ANT_HOME%
  -
  -set ANT_HOME=.
  -
  -if "" == "%JAVA%"  if "" == "%JAVA_HOME%" set JAVA=java
  -if "" == "%JAVA%"                         set JAVA=%JAVA_HOME%\bin\java
  -
  -if "" == "%JAVAC%" if "" == "%JAVA_HOME%" set JAVAC=javac
  -if "" == "%JAVAC%"                        set JAVAC=%JAVA_HOME%\bin\javac
  -
  -echo.
  -echo ... Bootstrapping Ant Distribution
  -
  -if exist lib\ant.jar erase lib\ant.jar
  -
  -SET LOCALCLASSPATH=
  -for %%i in (lib\core\*.jar) do call src\bin\lcp.bat %%i
  -
  -if exist %JAVA_HOME%\lib\tools.jar call src\bin\lcp.bat %JAVA_HOME%\lib\tools.jar
  -if exist %JAVA_HOME%\lib\classes.zip call src\bin\lcp.bat %JAVA_HOME%\lib\classes.zip
  -
  -set TOOLS=src\main\org\apache\tools
  -set CLASSDIR=classes
  -
  -SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
  -
  -echo JAVA_HOME=%JAVA_HOME%
  -echo JAVA=%JAVA%
  -echo JAVAC=%JAVAC%
  -echo CLASSPATH=%CLASSPATH%
  -
  -if     "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR%
  -if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR%
  -
  -mkdir %CLASSDIR%
  -
  -echo.
  -echo ... Compiling Ant Classes
  -
  -%JAVAC% -d %CLASSDIR% %TOOLS%\tar\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java
%TOOLS%\ant\util\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java
  -
  -echo.
  -echo ... Copying Required Files
  -
  -copy %TOOLS%\ant\taskdefs\*.properties %CLASSDIR%\org\apache\tools\ant\taskdefs
  -copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types
  -
  -echo.
  -echo ... Building Ant Distribution
  -
  -%JAVA% %ANT_OPTS% org.apache.tools.ant.Main clean main bootstrap %1 %2 %3 %4 %5
  -
  -echo.
  -echo ... Cleaning Up Build Directories
  -
  -if     "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR%
  -if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR%
  -
  -echo.
  -echo ... Done Bootstrapping Ant Distribution
  -
  -set JAVA=%OLDJAVA%
  -set JAVAC=%OLDJAVAC%
  -set CLASSPATH=%OLDCLASSPATH%
  -set ANT_HOME=%OLDANTHOME%
  -set OLDJAVA=
  -set OLDJAVAC=
  -set OLDCLASSPATH=
  -set LOCALCLASSPATH=
  -set OLDANTHOME=
  -set TOOLS=
  -
  +@echo off
  +
  +REM You will need to specify JAVA_HOME if compiling with 1.2 or later.
  +
  +set OLDJAVA=%JAVA%
  +set OLDJAVAC=%JAVAC%
  +set OLDCLASSPATH=%CLASSPATH%
  +set OLDANTHOME=%ANT_HOME%
  +
  +set ANT_HOME=.
  +
  +if "" == "%JAVA%"  if "" == "%JAVA_HOME%" set JAVA=java
  +if "" == "%JAVA%"                         set JAVA=%JAVA_HOME%\bin\java
  +
  +if "" == "%JAVAC%" if "" == "%JAVA_HOME%" set JAVAC=javac
  +if "" == "%JAVAC%"                        set JAVAC=%JAVA_HOME%\bin\javac
  +
  +echo.
  +echo ... Bootstrapping Ant Distribution
  +
  +if exist lib\ant.jar erase lib\ant.jar
  +
  +SET LOCALCLASSPATH=
  +for %%i in (lib\core\*.jar) do call src\bin\lcp.bat %%i
  +
  +if exist %JAVA_HOME%\lib\tools.jar call src\bin\lcp.bat %JAVA_HOME%\lib\tools.jar
  +if exist %JAVA_HOME%\lib\classes.zip call src\bin\lcp.bat %JAVA_HOME%\lib\classes.zip
  +
  +set TOOLS=src\main\org\apache\tools
  +set CLASSDIR=classes
  +
  +SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
  +
  +echo JAVA_HOME=%JAVA_HOME%
  +echo JAVA=%JAVA%
  +echo JAVAC=%JAVAC%
  +echo CLASSPATH=%CLASSPATH%
  +
  +if     "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR%
  +if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR%
  +
  +mkdir %CLASSDIR%
  +
  +echo.
  +echo ... Compiling Ant Classes
  +
  +%JAVAC% -d %CLASSDIR% %TOOLS%\tar\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java
%TOOLS%\ant\util\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java
  +
  +echo.
  +echo ... Copying Required Files
  +
  +copy %TOOLS%\ant\taskdefs\*.properties %CLASSDIR%\org\apache\tools\ant\taskdefs
  +copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types
  +
  +echo.
  +echo ... Building Ant Distribution
  +
  +%JAVA% %ANT_OPTS% org.apache.tools.ant.Main clean main bootstrap %1 %2 %3 %4 %5
  +
  +echo.
  +echo ... Cleaning Up Build Directories
  +
  +if     "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR%
  +if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR%
  +
  +echo.
  +echo ... Done Bootstrapping Ant Distribution
  +
  +set JAVA=%OLDJAVA%
  +set JAVAC=%OLDJAVAC%
  +set CLASSPATH=%OLDCLASSPATH%
  +set ANT_HOME=%OLDANTHOME%
  +set OLDJAVA=
  +set OLDJAVAC=
  +set OLDCLASSPATH=
  +set LOCALCLASSPATH=
  +set OLDANTHOME=
  +set TOOLS=
  +
  
  
  

Mime
View raw message