forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject cvs commit: xml-forrest/src/resources/forrest-shbat/bin forrest.bat appendcp.bat
Date Fri, 15 Nov 2002 22:17:49 GMT
bert        2002/11/15 14:17:49

  Modified:    src/resources/forrest-shbat/bin forrest.bat appendcp.bat
  Log:
  Adjusted batch files to support spaces in paths
  
  Revision  Changes    Path
  1.13      +17 -15    xml-forrest/src/resources/forrest-shbat/bin/forrest.bat
  
  Index: forrest.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/bin/forrest.bat,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- forrest.bat	14 Nov 2002 11:15:45 -0000	1.12
  +++ forrest.bat	15 Nov 2002 22:17:49 -0000	1.13
  @@ -1,32 +1,34 @@
   @echo off
  -setlocal 
  +if "%OS%"=="Windows_NT" @setlocal
   
  -Rem ----- use the location of this script to infer $FORREST_HOME -------
  +rem ----- use the location of this script to infer $FORREST_HOME -------
   set DEFAULT_FORREST_HOME=%~dp0\..
   if "%FORREST_HOME%"=="" set FORREST_HOME=%DEFAULT_FORREST_HOME%
   
  -Rem ----- set the current working dir as the PROJECT_HOME variable  ----
  +rem ----- set the current working dir as the PROJECT_HOME variable  ----
   call "%FORREST_HOME%\bin\setpwdvar.bat"
  -set PROJECT_HOME="%PWD%"
  +set PROJECT_HOME=%PWD%
   
  -Rem ----- set the ant file to use --------------------------------------
  -set ANTFILE="%FORREST_HOME%\forrest.build.xml"
  +rem ----- set the ant file to use --------------------------------------
  +set ANTFILE=%%FORREST_HOME%%\forrest.build.xml
   
  -Rem ----- Save old ANT_HOME --------------------------------------------
  +rem ----- Save old ANT_HOME --------------------------------------------
   set OLD_ANT_HOME=%ANT_HOME%
   set ANT_HOME=%FORREST_HOME%\ant
   
  +rem ----- Save and set CLASSPATH --------------------------------------------
   set OLD_CLASSPATH=%CLASSPATH%
   set CLASSPATH=
  -for %%i in ("%FORREST_HOME%\lib\endorsed\*.jar") do call appendcp.bat %%i
  +cd "%FORREST_HOME%\lib\endorsed"
  +for %%i in (*.jar) do call "%FORREST_HOME%\bin\appendcp.bat" "%FORREST_HOME%\lib\endorsed\%%i"
   
  -echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
  +echo.
  +echo Apache Forrest.  Run 'forrest -projecthelp' to list options
  +echo.
  +rem ----- call ant.. ---------------------------------------------------
  +echo.
  +call "%ANT_HOME%\bin\forrestant" -buildfile "%ANTFILE%" -Dbasedir="%PROJECT_HOME%" -Dproject.home="%PROJECT_HOME%"
-Dforrest.home="%FORREST_HOME%" -emacs -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3
%4 %5 %6 %7 %8 %9
   
  -Rem ----- call ant.. ---------------------------------------------------
  -"%ANT_HOME%\bin\ant" -buildfile %ANTFILE% -Dbasedir="%PROJECT_HOME%" -Dproject.home="%PROJECT_HOME%"
-Dforrest.home="%FORREST_HOME%" -emacs -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3
%4 %5 %6 %7 %8 %9
  -
  -Rem ---- Restore old ANT_HOME
  +rem ---- Restore old ANT_HOME
   set ANT_HOME=%OLD_ANT_HOME%
   set CLASSPATH=%OLD_CLASSPATH%
  -
  -endlocal
  
  
  
  1.2       +3 -1      xml-forrest/src/resources/forrest-shbat/bin/appendcp.bat
  
  Index: appendcp.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/bin/appendcp.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- appendcp.bat	3 Nov 2002 10:03:43 -0000	1.1
  +++ appendcp.bat	15 Nov 2002 22:17:49 -0000	1.2
  @@ -1,2 +1,4 @@
  -set CLASSPATH=%CLASSPATH%;%1
  +If %OS%'==Windows_NT' Set NTSwitch=/F "Tokens=*"
  +For %NTSwitch% %%V In (%1) Do set CLASSPATH=%CLASSPATH%;%%V
  +
   
  
  
  

Mime
View raw message