Author: brett
Date: Mon Jun 6 18:32:11 2005
New Revision: 188655
URL: http://svn.apache.org/viewcvs?rev=188655&view=rev
Log:
more parameter consistency. MAVEN_OPTS goes to java, $@ goes to the args.
This will mean implementing -D -> sys property handling in mboot and verifier
to allow passing of sys props on the command line if that is needed again
Modified:
maven/components/trunk/m2-bootstrap-all.bat
maven/components/trunk/m2-bootstrap-all.sh
maven/components/trunk/maven-core-it/maven-core-it.bat
maven/components/trunk/maven-core-it/maven-core-it.sh
Modified: maven/components/trunk/m2-bootstrap-all.bat
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.bat?rev=188655&r1=188654&r2=188655&view=diff
==============================================================================
--- maven/components/trunk/m2-bootstrap-all.bat (original)
+++ maven/components/trunk/m2-bootstrap-all.bat Mon Jun 6 18:32:11 2005
@@ -101,7 +101,7 @@
@REM Reaching here means variables are defined and arguments have been captured
:endInit
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-SET MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% -Dmaven.home="%M2_HOME%"
+SET MAVEN_OPTS=%MAVEN_OPTS% -Dmaven.home="%M2_HOME%"
@REM Build MBoot2
cd maven-mboot2
@@ -111,7 +111,7 @@
@REM Build Maven2
cd ..
-%MAVEN_JAVA_EXE% %MAVEN_CMD_LINE_ARGS% %MAVEN_OPTS% -jar mboot.jar
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -jar mboot.jar %MAVEN_CMD_LINE_ARGS%
echo Rebuilding maven2 plugins
cd maven-plugins
Modified: maven/components/trunk/m2-bootstrap-all.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.sh?rev=188655&r1=188654&r2=188655&view=diff
==============================================================================
--- maven/components/trunk/m2-bootstrap-all.sh (original)
+++ maven/components/trunk/m2-bootstrap-all.sh Mon Jun 6 18:32:11 2005
@@ -29,7 +29,7 @@
echo
"-----------------------------------------------------------------------"
cd ./maven-mboot2
- ./build $ARGS "$HOME_ARGS"
+ ./build
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
@@ -39,7 +39,7 @@
echo " Building maven2 components ... "
echo
"-----------------------------------------------------------------------"
- "$JAVACMD" $ARGS "$HOME_ARGS" $MAVEN_OPTS -jar mboot.jar
+ "$JAVACMD" "$HOME_ARGS" $MAVEN_OPTS -jar mboot.jar $ARGS
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
Modified: maven/components/trunk/maven-core-it/maven-core-it.bat
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/maven-core-it.bat?rev=188655&r1=188654&r2=188655&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/maven-core-it.bat (original)
+++ maven/components/trunk/maven-core-it/maven-core-it.bat Mon Jun 6 18:32:11
2005
@@ -20,5 +20,5 @@
@REM NOTE: for simplicity, only Windows NT/2000/XP is current supported
@REM This also assumes that M2_HOME and JAVA_HOME are set, which are verified
in the bootstrap script only
-"%JAVA_HOME%\bin\java.exe" %* -Dmaven.home="%M2_HOME%" %MAVEN_OPTS% -cp
"..\maven-core-it-verifier\target\maven-core-it-verifier-1.0.jar"
org.apache.maven.it.Verifier
+"%JAVA_HOME%\bin\java.exe" -Dmaven.home="%M2_HOME%" %MAVEN_OPTS% -cp
"..\maven-core-it-verifier\target\maven-core-it-verifier-1.0.jar"
org.apache.maven.it.Verifier %*
Modified: maven/components/trunk/maven-core-it/maven-core-it.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/maven-core-it.sh?rev=188655&r1=188654&r2=188655&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/maven-core-it.sh (original)
+++ maven/components/trunk/maven-core-it/maven-core-it.sh Mon Jun 6 18:32:11
2005
@@ -23,5 +23,5 @@
jvm_m2_home="-Dmaven.home=$M2_HOME"
fi
-java "$jvm_m2_home" $MAVEN_OPTS "$@" -cp "$cp" $verifier
+java "$jvm_m2_home" $MAVEN_OPTS -cp "$cp" $verifier $@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
