You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by ev...@apache.org on 2004/10/28 23:08:13 UTC
cvs commit: maven-components/maven-core/src/bin m2.bat
evenisse 2004/10/28 14:08:13
Modified: maven-core/src/bin m2.bat
Log:
Make the script resilient to changes in the classworlds JAR. It works ONLY if M2_HOME doesn't contains spaces.
If we use double quote around %M2_HOME%\\core\\boot\\classworlds-*.jar for classpath, '*' isn't interpreted by dos.
Revision Changes Path
1.5 +1 -9 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- m2.bat 23 Oct 2004 13:37:18 -0000 1.4
+++ m2.bat 28 Oct 2004 21:08:13 -0000 1.5
@@ -35,8 +35,6 @@
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-set CLASSWORLDS_VERSION=1.1-SNAPSHOT
-
@REM Execute a user defined script before this one
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
@@ -121,12 +119,9 @@
:endInit
if "%MAVEN_OPTS%"=="" SET MAVEN_OPTS="-Xmx256m"
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-SET MAVEN_CLASSPATH="%M2_HOME%\core\boot\classworlds-%CLASSWORLDS_VERSION%.jar"
-SET MAVEN_MAIN_CLASS=org.codehaus.classworlds.Launcher
-SET CLASSWORLDS_CONF="%M2_HOME%\bin\classworlds.conf"
@REM Start MAVEN2
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH% "-Dclassworlds.conf=%CLASSWORLDS_CONF%" "-Dmaven.home=%M2_HOME%" %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %M2_HOME%\core\boot\classworlds-*.jar "-Dclassworlds.conf=%M2_HOME%\bin\classworlds.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
goto :end
:end
@@ -136,10 +131,7 @@
@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
set MAVEN_JAVA_EXE=
-set MAVEN_CLASSPATH=
-set MAVEN_MAIN_CLASS=
set MAVEN_CMD_LINE_ARGS=
-set CLASSWORLDS_VERSION=
goto postExec
:endNT
Re: cvs commit: maven-components/maven-core/src/bin m2.bat
Posted by Brett Porter <br...@apache.org>.
would:
"%M2_HOME%"\core\boot\classworlds-*.jar
work?
Quoting "evenisse@apache.org" <ev...@apache.org>:
> evenisse 2004/10/28 14:08:13
>
> Modified: maven-core/src/bin m2.bat
> Log:
> Make the script resilient to changes in the classworlds JAR. It works ONLY
> if M2_HOME doesn't contains spaces.
>
> If we use double quote around %M2_HOME%\\core\\boot\\classworlds-*.jar for
> classpath, '*' isn't interpreted by dos.
>
> Revision Changes Path
> 1.5 +1 -9 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.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- m2.bat 23 Oct 2004 13:37:18 -0000 1.4
> +++ m2.bat 28 Oct 2004 21:08:13 -0000 1.5
> @@ -35,8 +35,6 @@
> @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
> @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
>
> -set CLASSWORLDS_VERSION=1.1-SNAPSHOT
> -
> @REM Execute a user defined script before this one
> if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
>
> @@ -121,12 +119,9 @@
> :endInit
> if "%MAVEN_OPTS%"=="" SET MAVEN_OPTS="-Xmx256m"
> SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
> -SET
> MAVEN_CLASSPATH="%M2_HOME%\core\boot\classworlds-%CLASSWORLDS_VERSION%.jar"
> -SET MAVEN_MAIN_CLASS=org.codehaus.classworlds.Launcher
> -SET CLASSWORLDS_CONF="%M2_HOME%\bin\classworlds.conf"
>
> @REM Start MAVEN2
> -%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
> "-Dclassworlds.conf=%CLASSWORLDS_CONF%" "-Dmaven.home=%M2_HOME%"
> %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
> +%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath
> %M2_HOME%\core\boot\classworlds-*.jar
> "-Dclassworlds.conf=%M2_HOME%\bin\classworlds.conf" "-Dmaven.home=%M2_HOME%"
> org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
> goto :end
>
> :end
> @@ -136,10 +131,7 @@
> @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
> set MAVEN_JAVA_EXE=
> -set MAVEN_CLASSPATH=
> -set MAVEN_MAIN_CLASS=
> set MAVEN_CMD_LINE_ARGS=
> -set CLASSWORLDS_VERSION=
> goto postExec
>
> :endNT
>
>
>
>