You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by br...@apache.org on 2004/07/19 15:22:34 UTC
svn commit: rev 23060 - in forrest/trunk: src/core/bin tools/ant/bin
Author: brondsem
Date: Mon Jul 19 06:22:33 2004
New Revision: 23060
Modified:
forrest/trunk/src/core/bin/appendcp.bat
forrest/trunk/src/core/bin/forrest.bat
forrest/trunk/tools/ant/bin/ant.bat
forrest/trunk/tools/ant/bin/antRun.bat
forrest/trunk/tools/ant/bin/forrestant.bat
forrest/trunk/tools/ant/bin/forrestpath.bat
Log:
on some novell logins, WINNT is WINNT not Windows_NT
Modified: forrest/trunk/src/core/bin/appendcp.bat
==============================================================================
--- forrest/trunk/src/core/bin/appendcp.bat (original)
+++ forrest/trunk/src/core/bin/appendcp.bat Mon Jul 19 06:22:33 2004
@@ -14,6 +14,7 @@
rem limitations under the License.
If %OS%'==Windows_NT' Set NTSwitch=/F "Tokens=*"
+If %OS%'==WINNT' Set NTSwitch=/F "Tokens=*"
For %NTSwitch% %%V In (%1) Do set CLASSPATH=%CLASSPATH%;%%V
Modified: forrest/trunk/src/core/bin/forrest.bat
==============================================================================
--- forrest/trunk/src/core/bin/forrest.bat (original)
+++ forrest/trunk/src/core/bin/forrest.bat Mon Jul 19 06:22:33 2004
@@ -14,15 +14,18 @@
rem limitations under the License.
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
rem ----- use the location of this script to infer $FORREST_HOME -------
-if "%OS%"=="Windows_NT" set DEFAULT_FORREST_HOME=%~dp0\..
if NOT "%OS%"=="Windows_NT" set DEFAULT_FORREST_HOME=..
+if "%OS%"=="Windows_NT" set DEFAULT_FORREST_HOME=%~dp0\..
+if "%OS%"=="WINNT" 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 ----
-if "%OS%"=="Windows_NT" call "%FORREST_HOME%\bin\setpwdvar.bat"
if NOT "%OS%"=="Windows_NT" call "%FORREST_HOME%\bin\setpwdvar98.bat"
+if "%OS%"=="Windows_NT" call "%FORREST_HOME%\bin\setpwdvar.bat"
+if "%OS%"=="WINNT" call "%FORREST_HOME%\bin\setpwdvar.bat"
set PROJECT_HOME=%PWD%
rem ----- set the ant file to use --------------------------------------
Modified: forrest/trunk/tools/ant/bin/ant.bat
==============================================================================
--- forrest/trunk/tools/ant/bin/ant.bat (original)
+++ forrest/trunk/tools/ant/bin/ant.bat Mon Jul 19 06:22:33 2004
@@ -17,6 +17,7 @@
if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
set DEFAULT_ANT_HOME=%~dp0..
@@ -100,6 +101,7 @@
set ANT_CMD_LINE_ARGS=
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
:mainEnd
if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
Modified: forrest/trunk/tools/ant/bin/antRun.bat
==============================================================================
--- forrest/trunk/tools/ant/bin/antRun.bat (original)
+++ forrest/trunk/tools/ant/bin/antRun.bat Mon Jul 19 06:22:33 2004
@@ -18,12 +18,14 @@
REM
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @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""
+if "%OS%"=="Windows_NT" cd /d ""%1""
+if "%OS%"=="WINNT" cd /d ""%1""
shift
rem Slurp the command line arguments. This loop allows for an unlimited number
@@ -42,4 +44,5 @@
%ANT_RUN_CMD%
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
Modified: forrest/trunk/tools/ant/bin/forrestant.bat
==============================================================================
--- forrest/trunk/tools/ant/bin/forrestant.bat (original)
+++ forrest/trunk/tools/ant/bin/forrestant.bat Mon Jul 19 06:22:33 2004
@@ -16,10 +16,12 @@
if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
-if "%OS%"=="Windows_NT" set DEFAULT_ANT_HOME=%~dp0..
if NOT "%OS%"=="Windows_NT" set DEFAULT_ANT_HOME=..
+if "%OS%"=="Windows_NT" set DEFAULT_ANT_HOME=%~dp0..
+if "%OS%"=="WINNT" set DEFAULT_ANT_HOME=%~dp0..
if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
set DEFAULT_ANT_HOME=
@@ -105,6 +107,7 @@
set ANT_CMD_LINE_ARGS=
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
:mainEnd
if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
Modified: forrest/trunk/tools/ant/bin/forrestpath.bat
==============================================================================
--- forrest/trunk/tools/ant/bin/forrestpath.bat (original)
+++ forrest/trunk/tools/ant/bin/forrestpath.bat Mon Jul 19 06:22:33 2004
@@ -14,4 +14,5 @@
rem limitations under the License.
If %OS%'==Windows_NT' Set NTSwitch=/F "Tokens=*"
+If %OS%'==WINNT' Set NTSwitch=/F "Tokens=*"
For %NTSwitch% %%V In (%1) Do set LOCALCLASSPATH=%LOCALCLASSPATH%;%%V