mbenson     2005/01/26 11:04:07

  Modified:    src/script Tag: ANT_16_BRANCH ant.bat antRun.bat
               .        Tag: ANT_16_BRANCH WHATSNEW
  Log:
  Merge "Wrapper scripts did not detect WINNT value of dynamic OS environment
  variable when logged into workstations using Novell authentication."
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.32.2.6  +2 -0      ant/src/script/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant.bat,v
  retrieving revision 1.32.2.5
  retrieving revision 1.32.2.6
  diff -u -r1.32.2.5 -r1.32.2.6
  --- ant.bat   6 Sep 2004 09:18:50 -0000       1.32.2.5
  +++ ant.bat   26 Jan 2005 19:04:07 -0000      1.32.2.6
  @@ -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.6.2.3   +2 -0      ant/src/script/antRun.bat
  
  Index: antRun.bat
  ===================================================================
  RCS file: /home/cvs/ant/src/script/antRun.bat,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- antRun.bat        9 Feb 2004 22:12:46 -0000       1.6.2.2
  +++ antRun.bat        26 Jan 2005 19:04:07 -0000      1.6.2.3
  @@ -18,6 +18,7 @@
   REM
   
   if "%OS%"=="Windows_NT" @setlocal
  +if "%OS%"=="WINNT" @setlocal
   
   if ""%1""=="""" goto runCommand
   
  @@ -42,4 +43,5 @@
   %ANT_RUN_CMD%
   
   if "%OS%"=="Windows_NT" @endlocal
  +if "%OS%"=="WINNT" @endlocal
   
  
  
  
  No                   revision
  No                   revision
  1.503.2.162 +4 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.161
  retrieving revision 1.503.2.162
  diff -u -r1.503.2.161 -r1.503.2.162
  --- WHATSNEW  26 Jan 2005 17:34:10 -0000      1.503.2.161
  +++ WHATSNEW  26 Jan 2005 19:04:07 -0000      1.503.2.162
  @@ -135,6 +135,10 @@
   * oata.types.Description.getDescription(Project) would throw a
     NullPointerException when the "ant.targets" reference was unset.
   
  +* Wrapper scripts did not detect WINNT value of dynamic OS environment
  +  variable when logged into workstations using Novell authentication.
  +  Bugzilla Report 30366.
  +
   Changes from Ant 1.6.1 to Ant 1.6.2
   ===================================
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to