svn commit: rev 23048 - in forrest/trunk: . src/core/bin tools/ant/bin

[br...@apache.org]

Author: brondsem
Date: Sun Jul 18 19:55:41 2004
New Revision: 23048

Added:
   forrest/trunk/src/core/bin/setpwdvar98.bat   (contents, props changed)
Modified:
   forrest/trunk/src/core/bin/forrest.bat
   forrest/trunk/status.xml
   forrest/trunk/tools/ant/bin/forrestant.bat
Log:
support win9x; fixes FOR-113

Modified: forrest/trunk/src/core/bin/forrest.bat
==============================================================================
--- forrest/trunk/src/core/bin/forrest.bat	(original)
+++ forrest/trunk/src/core/bin/forrest.bat	Sun Jul 18 19:55:41 2004
@@ -16,15 +16,17 @@
 if "%OS%"=="Windows_NT" @setlocal
 
 rem ----- use the location of this script to infer $FORREST_HOME -------
-set DEFAULT_FORREST_HOME=%~dp0\..
+if "%OS%"=="Windows_NT" set DEFAULT_FORREST_HOME=%~dp0\..
+if NOT "%OS%"=="Windows_NT" set DEFAULT_FORREST_HOME=..
 if "%FORREST_HOME%"=="" set FORREST_HOME=%DEFAULT_FORREST_HOME%
 
 rem ----- set the current working dir as the PROJECT_HOME variable  ----
-call "%FORREST_HOME%\bin\setpwdvar.bat"
+if "%OS%"=="Windows_NT" call "%FORREST_HOME%\bin\setpwdvar.bat"
+if NOT "%OS%"=="Windows_NT" call "%FORREST_HOME%\bin\setpwdvar98.bat"
 set PROJECT_HOME=%PWD%
 
 rem ----- set the ant file to use --------------------------------------
-set ANTFILE=%%FORREST_HOME%%\forrest.build.xml
+set ANTFILE=%FORREST_HOME%\forrest.build.xml
 
 rem ----- Save old ANT_HOME --------------------------------------------
 set OLD_ANT_HOME=%ANT_HOME%
@@ -33,7 +35,9 @@
 rem ----- Save and set CLASSPATH --------------------------------------------
 set OLD_CLASSPATH=%CLASSPATH%
 set CLASSPATH=
-for %%i in ("%FORREST_HOME%\..\..\lib\endorsed\*.jar") do call "%FORREST_HOME%\bin\appendcp.bat" "%%i"
+cd /d "%FORREST_HOME%\..\..\lib\endorsed\"
+for %%i in ("*.jar") do call %FORREST_HOME%\bin\appendcp.bat "%FORREST_HOME%\..\..\lib\endorsed\%%i"
+cd /d %PWD%
 
 echo.
 echo Apache Forrest.  Run 'forrest -projecthelp' to list options

Added: forrest/trunk/src/core/bin/setpwdvar98.bat
==============================================================================
--- (empty file)
+++ forrest/trunk/src/core/bin/setpwdvar98.bat	Sun Jul 18 19:55:41 2004
@@ -0,0 +1,19 @@
+@echo off
+rem Copyright 2002-2004 The Apache Software Foundation
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+echo @prompt set PWD=$p$_ > _temp_A.bat
+%comspec% /e:2048 /c _temp_A.bat > _temp_B.bat
+call _temp_B.bat
+del _temp_?.bat

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Sun Jul 18 19:55:41 2004
@@ -50,6 +50,9 @@
         Added new document to facilitate
         <link href="site:upgrading_06">upgrading to v0.6</link>
       </action>
+      <action dev="DB" type="update" context="build" fixes-bug="FOR-113" due-to="Pierrick Brihaye">
+        Support running Forrest on Win9x.
+      </action>
       <action dev="DB" type="update" context="build" fixes-bug="FOR-207">
         Don't copy unneeded project files in 'war' and 'webapp' targets.
       </action>

Modified: forrest/trunk/tools/ant/bin/forrestant.bat
==============================================================================
--- forrest/trunk/tools/ant/bin/forrestant.bat	(original)
+++ forrest/trunk/tools/ant/bin/forrestant.bat	Sun Jul 18 19:55:41 2004
@@ -19,7 +19,8 @@
 if "%OS%"=="Windows_NT" @setlocal
 
 rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_ANT_HOME=%~dp0..
+if "%OS%"=="Windows_NT" set DEFAULT_ANT_HOME=%~dp0..
+if NOT "%OS%"=="Windows_NT" set DEFAULT_ANT_HOME=..
 
 if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
 set DEFAULT_ANT_HOME=
@@ -66,14 +67,17 @@
 :checkJava
 set _JAVACMD=%JAVACMD%
 set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\forrestpath.bat" "%%i"
+
+cd /d "%ANT_HOME%\lib\"
+for %%i in ("*.jar") do call "%ANT_HOME%\bin\forrestpath.bat" "%ANT_HOME%\lib\%%i"
+cd /d %PWD%
 
 
 if "%JAVA_HOME%" == "" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
 if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-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
+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