Author: jdcasey
Date: Wed Feb 6 11:03:43 2008
New Revision: 619106
URL: http://svn.apache.org/viewvc?rev=619106&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.
Modified:
maven/components/trunk/maven-embedder/src/bin/mvn.bat
maven/components/trunk/maven-embedder/src/bin/mvnDebug.bat
Modified: maven/components/trunk/maven-embedder/src/bin/mvn.bat
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/bin/mvn.bat?rev=619106&r1=619105&r2=619106&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/bin/mvn.bat (original)
+++ maven/components/trunk/maven-embedder/src/bin/mvn.bat Wed Feb 6 11:03:43
2008
@@ -37,6 +37,9 @@
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
[EMAIL PROTECTED] set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
+
@REM Execute a user defined script before this one
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
@@ -44,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
@@ -70,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.
@@ -101,11 +106,16 @@
: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 "%eval[2+2]" == "4" goto 4NTArgs
+if "[EMAIL PROTECTED]" == "4" goto 4NTArgs
@REM -- Regular WinNT shell
set MAVEN_CMD_LINE_ARGS=%*
@@ -130,19 +140,33 @@
:endInit
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
[EMAIL PROTECTED] -- 4NT shell
+if "[EMAIL PROTECTED]" == "4" goto 4NTCWJars
+
[EMAIL PROTECTED] -- Regular WinNT shell
+for %%i in ("%M2_HOME%"\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
[EMAIL PROTECTED] The 4NT Shell from jp software
+:4NTCWJars
+for %%i in ("%M2_HOME%\boot\classworlds-*") do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
@REM Start MAVEN2
-for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
org.codehaus.plexus.classworlds.launcher.Launcher %MAVEN_CMD_LINE_ARGS%
+:runm2
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
: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
@@ -151,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/trunk/maven-embedder/src/bin/mvnDebug.bat
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/bin/mvnDebug.bat?rev=619106&r1=619105&r2=619106&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/bin/mvnDebug.bat (original)
+++ maven/components/trunk/maven-embedder/src/bin/mvnDebug.bat Wed Feb 6
11:03:43 2008
@@ -40,6 +40,9 @@
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
[EMAIL PROTECTED] set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
+
@REM Execute a user defined script before this one
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
@@ -47,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
@@ -73,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.
@@ -104,11 +109,16 @@
: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 "%eval[2+2]" == "4" goto 4NTArgs
+if "[EMAIL PROTECTED]" == "4" goto 4NTArgs
@REM -- Regular WinNT shell
set MAVEN_CMD_LINE_ARGS=%*
@@ -133,19 +143,34 @@
:endInit
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
[EMAIL PROTECTED] -- 4NT shell
+if "[EMAIL PROTECTED]" == "4" goto 4NTCWJars
+
[EMAIL PROTECTED] -- Regular WinNT shell
+for %%i in ("%M2_HOME%"\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
[EMAIL PROTECTED] The 4NT Shell from jp software
+:4NTCWJars
+for %%i in ("%M2_HOME%\boot\classworlds-*") do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
@REM Start MAVEN2
-for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
-%MAVEN_JAVA_EXE% %INT_MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
org.codehaus.plexus.classworlds.launcher.Launcher %MAVEN_CMD_LINE_ARGS%
+:runm2
+
+%MAVEN_JAVA_EXE% %INT_MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
: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
@@ -154,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"
