Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188655 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-06-07 01:32:11 +00:00
parent adf0b523c9
commit e1bcc79d16
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
m2-bootstrap-all.bat
View File

@ -101,7 +101,7 @@ goto Win9xApp
@REM Reaching here means variables are defined and arguments have been captured @REM Reaching here means variables are defined and arguments have been captured
:endInit :endInit
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" 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 @REM Build MBoot2
cd maven-mboot2 cd maven-mboot2
@ -111,7 +111,7 @@ call .\build
@REM Build Maven2 @REM Build Maven2
cd .. 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 echo Rebuilding maven2 plugins
cd maven-plugins cd maven-plugins

4
m2-bootstrap-all.sh
View File

@ -29,7 +29,7 @@ fi
echo "-----------------------------------------------------------------------" echo "-----------------------------------------------------------------------"
cd ./maven-mboot2 cd ./maven-mboot2
./build $ARGS "$HOME_ARGS" ./build
ret=$?; if [ $ret != 0 ]; then exit $ret; fi ret=$?; if [ $ret != 0 ]; then exit $ret; fi
) )
ret=$?; if [ $ret != 0 ]; then exit $ret; fi ret=$?; if [ $ret != 0 ]; then exit $ret; fi
@ -39,7 +39,7 @@ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
echo " Building maven2 components ... " echo " Building maven2 components ... "
echo "-----------------------------------------------------------------------" 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
) )
ret=$?; if [ $ret != 0 ]; then exit $ret; fi ret=$?; if [ $ret != 0 ]; then exit $ret; fi

2
maven-core-it/maven-core-it.bat
View File

@ -20,5 +20,5 @@
@REM NOTE: for simplicity, only Windows NT/2000/XP is current supported @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 @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 %*

2
maven-core-it/maven-core-it.sh
View File

@ -23,5 +23,5 @@ if [ ! -z "$M2_HOME" ]; then
jvm_m2_home="-Dmaven.home=$M2_HOME" jvm_m2_home="-Dmaven.home=$M2_HOME"
fi fi
java "$jvm_m2_home" $MAVEN_OPTS "$@" -cp "$cp" $verifier java "$jvm_m2_home" $MAVEN_OPTS -cp "$cp" $verifier $@