Author: jdcasey
Date: Fri Jun 1 14:39:10 2007
New Revision: 543625
URL: http://svn.apache.org/viewvc?view=rev&rev=543625
Log:
Merging revId 543621 from trunk for MNG-2503
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.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?view=diff&rev=543625&r1=543624&r2=543625
==============================================================================
--- 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 Fri Jun 1
14:39:10 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%"\boot\classworlds-*.jar) do set CLASSWORLDS_JAR="%%i"
+: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
