mbenson 2004/07/28 12:55:38
Modified: src/script antRun.bat ant.bat
. CONTRIBUTORS WHATSNEW
Log:
Wrapper scripts did not detect WINNT value of dynamic OS environment
variable when logged into workstations using Novell authentication.
PR: 30366
Obtained from: Dave Brondsema
Revision Changes Path
1.9 +10 -3 ant/src/script/antRun.bat
Index: antRun.bat
===================================================================
RCS file: /home/cvs/ant/src/script/antRun.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- antRun.bat 9 Feb 2004 21:05:40 -0000 1.8
+++ antRun.bat 28 Jul 2004 19:55:37 -0000 1.9
@@ -18,16 +18,22 @@
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" goto nt_cd
+if "%OS%"=="WINNT" goto nt_cd
+cd ""%1""
+goto end_cd
+:nt_cd
+cd /d ""%1""
+:end_cd
shift
rem Slurp the command line arguments. This loop allows for an unlimited
number
-rem of agruments (up to the command line limit, anyway).
+rem of arguments (up to the command line limit, anyway).
set ANT_RUN_CMD=%1
if ""%1""=="""" goto runCommand
shift
@@ -42,4 +48,5 @@
%ANT_RUN_CMD%
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
1.37 +2 -0 ant/src/script/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/ant/src/script/ant.bat,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ant.bat 9 Feb 2004 21:05:40 -0000 1.36
+++ ant.bat 28 Jul 2004 19:55:37 -0000 1.37
@@ -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"
1.28 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CONTRIBUTORS 17 Jul 2004 15:10:11 -0000 1.27
+++ CONTRIBUTORS 28 Jul 2004 19:55:37 -0000 1.28
@@ -37,6 +37,7 @@
Daniel Spilker
Danno Ferrin
Davanum Srinivas
+Dave Brondsema
David A. Herman
David Kavanagh
David Maclean
1.642 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -r1.641 -r1.642
--- WHATSNEW 27 Jul 2004 07:02:07 -0000 1.641
+++ WHATSNEW 28 Jul 2004 19:55:37 -0000 1.642
@@ -10,6 +10,10 @@
* Translate task does not remove tokens when a key is not found.
It logs a verbose message. Bugzilla Report 13936.
+* Wrapper scripts did not detect WINNT value of dynamic OS environment
+ variable when logged into workstations using Novell authentication.
+ Bugzilla Report 30366.
+
Other changes:
--------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
