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

complete removal of maven.properties, make some changes for maven.home 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163036 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2004-09-07 13:41:11 +00:00
parent 6d0ebd415b
commit 4d0a8dd795
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/src/bin/classworlds.conf
View File

@ -1,6 +1,6 @@
main is org.apache.maven.MavenCli from plexus.core.maven main is org.apache.maven.MavenCli from plexus.core.maven
set maven.home using ${user.home}/maven.properties default ${user.home}/m2 set maven.home default ${user.home}/m2
[plexus.core] [plexus.core]
load ${maven.home}/core/plexus-0.17.jar load ${maven.home}/core/plexus-0.17.jar

12
maven-core/src/bin/m2
View File

@ -53,9 +53,12 @@ if [ -z "$JAVA_HOME" ] ; then
echo " to the installation directory of java." echo " to the installation directory of java."
fi fi
if [ "$cygwin" = "true" ] if $cygwin; then
then [ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --unix "$M2_HOME"`
M2_HOME=`cygpath -pu "$M2_HOME"` fi
if [ -z "$M2_HOME" ]; then
M2_HOME=`dirname $0/..`
fi fi
CLASSWORLDS_CONF="${M2_HOME}/bin/classworlds.conf" CLASSWORLDS_CONF="${M2_HOME}/bin/classworlds.conf"
@ -67,6 +70,7 @@ if $cygwin; then
[ -n "$CP" ] && CP=`cygpath --path --windows "$CP"` [ -n "$CP" ] && CP=`cygpath --path --windows "$CP"`
[ -n "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"` [ -n "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"`
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --windows "$M2_HOME"`
fi fi
MAIN_CLASS=org.codehaus.classworlds.Launcher MAIN_CLASS=org.codehaus.classworlds.Launcher
@ -75,4 +79,6 @@ $JAVACMD \
$MAVEN_OPTS \ $MAVEN_OPTS \
-classpath "$CP" \ -classpath "$CP" \
"-Dclassworlds.conf=$CLASSWORLDS_CONF" \ "-Dclassworlds.conf=$CLASSWORLDS_CONF" \
"-Dmaven.home=$M2_HOME" \
$MAIN_CLASS $@ $MAIN_CLASS $@