brett 2005/04/04 23:48:51
Modified: maven-core/src/bin m2.bat Log: work with spaces in path on Windows NT Revision Changes Path 1.7 +2 -7 maven-components/maven-core/src/bin/m2.bat Index: m2.bat =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/bin/m2.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- m2.bat 6 Dec 2004 10:47:07 -0000 1.6 +++ m2.bat 5 Apr 2005 06:48:51 -0000 1.7 @@ -35,11 +35,6 @@ @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% [EMAIL PROTECTED] Setting default values -set CLASSWORLDS_JAR=%M2_HOME%\core\boot\classworlds-*.jar -set CLASSWORLDS_CONF=%M2_HOME%\bin\m2.conf -set CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher - @REM Execute a user defined script before this one if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" @@ -70,7 +65,7 @@ :chkMHome if not "%M2_HOME%"=="" goto valMHome -if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0\.. +if "%OS%"=="Windows_NT" SET M2_HOME=%~dps0\.. if not "%M2_HOME%"=="" goto valMHome echo. @@ -126,7 +121,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" @REM Start MAVEN2 -%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%CLASSWORLDS_CONF%" "-Dmaven.home=%M2_HOME%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %M2_HOME%\core\boot\classworlds-*.jar "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS% goto :end :end