You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by br...@apache.org on 2003/11/20 21:03:04 UTC
cvs commit: xml-forrest/tools/ant/bin forrestant.bat
brondsem 2003/11/20 12:03:04
Modified: src/core/bin forrest.bat
tools/ant/bin forrestant.bat
Log:
fixes FOR-82
%PWD% is preservered throughout the build, so ctrl-c and regular finishi leaves you in the dir you expect
also lets forrest -f filename.xml work for relatives files
Revision Changes Path
1.2 +1 -8 xml-forrest/src/core/bin/forrest.bat
Index: forrest.bat
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/bin/forrest.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forrest.bat 20 Oct 2003 15:37:49 -0000 1.1
+++ forrest.bat 20 Nov 2003 20:03:03 -0000 1.2
@@ -19,11 +19,7 @@
rem ----- Save and set CLASSPATH --------------------------------------------
set OLD_CLASSPATH=%CLASSPATH%
set CLASSPATH=
-rem Change drive and directory to %FORREST_HOME%\lib\endorsed
-if "%OS%"=="Windows_NT" cd /d ""%FORREST_HOME%\lib\endorsed""
-if not "%OS%"=="Windows_NT" cd ""%FORREST_HOME%\lib\endorsed""
-
-for %%i in (*.jar) do call "%FORREST_HOME%\bin\appendcp.bat" "%FORREST_HOME%\lib\endorsed\%%i"
+for %%i in ("%FORREST_HOME%\lib\endorsed\*.jar") do call "%FORREST_HOME%\bin\appendcp.bat" "%%i"
echo.
echo Apache Forrest. Run 'forrest -projecthelp' to list options
@@ -35,6 +31,3 @@
rem ---- Restore old ANT_HOME
set ANT_HOME=%OLD_ANT_HOME%
set CLASSPATH=%OLD_CLASSPATH%
-
-rem Fix FOR-47
-if not "%OS%"=="Windows_NT" cd ""%PWD%""
1.2 +1 -2 xml-forrest/tools/ant/bin/forrestant.bat
Index: forrestant.bat
===================================================================
RCS file: /home/cvs/xml-forrest/tools/ant/bin/forrestant.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forrestant.bat 15 Nov 2002 22:17:13 -0000 1.1
+++ forrestant.bat 20 Nov 2003 20:03:04 -0000 1.2
@@ -55,8 +55,7 @@
:checkJava
set _JAVACMD=%JAVACMD%
set LOCALCLASSPATH=%CLASSPATH%
-cd "%ANT_HOME%\lib\"
-for %%i in (*.jar) do call "%ANT_HOME%\bin\forrestpath.bat" "%ANT_HOME%\lib\%%i"
+for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\forrestpath.bat" "%%i"
if "%JAVA_HOME%" == "" goto noJavaHome