Yeah, I can add attribution when I commit a patch. Also, see the issues...I specifically asked people who have windows to try it out, since I'm unable to. I was reassured by the fact that at least one of these issues had corroborating comments agreeing with the original proposed solution. :-)
-j On Feb 6, 2008 4:55 PM, Brett Porter <[EMAIL PROTECTED]> wrote: > John, > > Can you make sure attribute patches in the commit logs? It helps those > of us watching commits but not all JIRAs to know who is contributing :) > > The only reason I suspected it was a patch was because it was for > Windows :) > > Incidentally - someone really needs to test this beyond just the > original reporter - we've already had 2.0.7 go out where error > handling didn't work at all in the batch files which was bad for CI > systems. > > Cheers, > Brett > > On 07/02/2008, at 6:04 AM, [EMAIL PROTECTED] wrote: > > > Author: jdcasey > > Date: Wed Feb 6 11:04:52 2008 > > New Revision: 619107 > > > > URL: http://svn.apache.org/viewvc?rev=619107&view=rev > > Log: > > [MNG-3354] & [MNG-3296] Patching Windows batch files for maven, to > > improve support for Windows+Novell integration, and to handle the > > end of winnt's local scope with the errorlevel preserved. Ported > > from revId: 619106 on trunk. > > > > Modified: > > maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat > > maven/components/branches/maven-2.0.x/maven-core/src/bin/ > > mvnDebug.bat > > > > Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/ > > mvn.bat > > URL: > http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat?rev=619107&r1=619106&r2=619107&view=diff > > = > > = > > = > > = > > = > > = > > = > > = > > ====================================================================== > > --- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat > > (original) > > +++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat > > Wed Feb 6 11:04:52 2008 > > @@ -47,6 +47,7 @@ > > > > @REM set local scope for the variables with windows NT shell > > if "%OS%"=="Windows_NT" @setlocal > > +if "%OS%"=="WINNT" @setlocal > > > > @REM ==== START VALIDATION ==== > > if not "%JAVA_HOME%" == "" goto OkJHome > > @@ -73,6 +74,7 @@ > > if not "%M2_HOME%"=="" goto valMHome > > > > if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0\.. > > +if "%OS%"=="WINNT" SET M2_HOME=%~dp0\.. > > if not "%M2_HOME%"=="" goto valMHome > > > > echo. > > @@ -104,9 +106,14 @@ > > :init > > @REM Decide how to startup depending on the version of windows > > > > [EMAIL PROTECTED] -- Windows NT with Novell Login > > +if "%OS%"=="WINNT" goto WinNTNovell > > + > > @REM -- Win98ME > > if NOT "%OS%"=="Windows_NT" goto Win9xArg > > > > +:WinNTNovell > > + > > @REM -- 4NT shell > > if "[EMAIL PROTECTED]" == "4" goto 4NTArgs > > > > @@ -153,11 +160,13 @@ > > > > :error > > if "%OS%"=="Windows_NT" @endlocal > > +if "%OS%"=="WINNT" @endlocal > > set ERROR_CODE=1 > > > > :end > > @REM set local scope for the variables with windows NT shell > > if "%OS%"=="Windows_NT" goto endNT > > +if "%OS%"=="WINNT" goto endNT > > > > @REM For old DOS remove the set variables from ENV - we assume they > > were not set > > @REM before we started - at least we don't leave any baggage around > > @@ -166,7 +175,7 @@ > > goto postExec > > > > :endNT > > [EMAIL PROTECTED] > > [EMAIL PROTECTED] & set ERROR_CODE=%ERROR_CODE% > > > > :postExec > > if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" > > > > Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/ > > mvnDebug.bat > > URL: > http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat?rev=619107&r1=619106&r2=619107&view=diff > > = > > = > > = > > = > > = > > = > > = > > = > > ====================================================================== > > --- maven/components/branches/maven-2.0.x/maven-core/src/bin/ > > mvnDebug.bat (original) > > +++ maven/components/branches/maven-2.0.x/maven-core/src/bin/ > > mvnDebug.bat Wed Feb 6 11:04:52 2008 > > @@ -50,6 +50,7 @@ > > > > @REM set local scope for the variables with windows NT shell > > if "%OS%"=="Windows_NT" @setlocal > > +if "%OS%"=="WINNT" @setlocal > > > > @REM ==== START VALIDATION ==== > > if not "%JAVA_HOME%" == "" goto OkJHome > > @@ -76,6 +77,7 @@ > > if not "%M2_HOME%"=="" goto valMHome > > > > if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0\.. > > +if "%OS%"=="WINNT" SET M2_HOME=%~dp0\.. > > if not "%M2_HOME%"=="" goto valMHome > > > > echo. > > @@ -107,9 +109,14 @@ > > :init > > @REM Decide how to startup depending on the version of windows > > > > [EMAIL PROTECTED] -- Windows NT with Novell Login > > +if "%OS%"=="WINNT" goto WinNTNovell > > + > > @REM -- Win98ME > > if NOT "%OS%"=="Windows_NT" goto Win9xArg > > > > +:WinNTNovell > > + > > @REM -- 4NT shell > > if "[EMAIL PROTECTED]" == "4" goto 4NTArgs > > > > @@ -157,11 +164,13 @@ > > > > :error > > if "%OS%"=="Windows_NT" @endlocal > > +if "%OS%"=="WINNT" @endlocal > > set ERROR_CODE=1 > > > > :end > > @REM set local scope for the variables with windows NT shell > > if "%OS%"=="Windows_NT" goto endNT > > +if "%OS%"=="WINNT" goto endNT > > > > @REM For old DOS remove the set variables from ENV - we assume they > > were not set > > @REM before we started - at least we don't leave any baggage around > > @@ -170,7 +179,7 @@ > > goto postExec > > > > :endNT > > [EMAIL PROTECTED] > > [EMAIL PROTECTED] & set ERROR_CODE=%ERROR_CODE% > > > > :postExec > > if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- John Casey --- Maven Developer (http://maven.apache.org) --- Blog: http://www.ejlife.net/blogs/buildchimp
