Author: jdcasey
Date: Fri Jun 1 14:21:43 2007
New Revision: 543621
URL: http://svn.apache.org/viewvc?view=rev&rev=543621
Log:
OPEN - issue MNG-2503: mvn.bat file is not correct for 4NT 5.0 and does
"endlocal" twice if error
http://jira.codehaus.org/browse/MNG-2503
Applying the patch, even though it's not a patch...I was able to generate one
using the supplied file and the current mvn.bat file from the trunk.
Modified:
maven/components/trunk/maven-embedder/src/bin/mvn.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?view=diff&rev=543621&r1=543620&r2=543621
==============================================================================
--- maven/components/trunk/maven-embedder/src/bin/mvn.bat (original)
+++ maven/components/trunk/maven-embedder/src/bin/mvn.bat Fri Jun 1 14:21:43
2007
@@ -98,7 +98,7 @@
if NOT "%OS%"=="Windows_NT" goto Win9xArg
@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=%*
@@ -123,14 +123,25 @@
: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%"\core\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
[EMAIL PROTECTED] The 4NT Shell from jp software
+:4NTCWJars
+for %%i in ("%M2_HOME%\core\boot\classworlds-*") do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
@REM Start MAVEN2
-for %%i in ("%M2_HOME%"\lib\maven-embedder-*) 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
set ERROR_CODE=1
:end
