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 br...@apache.org on 2004/09/07 15:41:11 UTC
cvs commit: maven-components/maven-core/src/bin classworlds.conf m2
brett 2004/09/07 06:41:11
Modified: maven-core/src/bin classworlds.conf m2
Log:
complete removal of maven.properties, make some changes for maven.home
Revision Changes Path
1.4 +1 -1 maven-components/maven-core/src/bin/classworlds.conf
Index: classworlds.conf
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/classworlds.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- classworlds.conf 26 Aug 2004 11:47:30 -0000 1.3
+++ classworlds.conf 7 Sep 2004 13:41:11 -0000 1.4
@@ -1,6 +1,6 @@
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]
load ${maven.home}/core/plexus-0.17.jar
1.2 +9 -3 maven-components/maven-core/src/bin/m2
Index: m2
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- m2 9 Aug 2004 19:02:34 -0000 1.1
+++ m2 7 Sep 2004 13:41:11 -0000 1.2
@@ -53,9 +53,12 @@
echo " to the installation directory of java."
fi
-if [ "$cygwin" = "true" ]
-then
- M2_HOME=`cygpath -pu "$M2_HOME"`
+if $cygwin; then
+ [ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --unix "$M2_HOME"`
+fi
+
+if [ -z "$M2_HOME" ]; then
+ M2_HOME=`dirname $0/..`
fi
CLASSWORLDS_CONF="${M2_HOME}/bin/classworlds.conf"
@@ -67,6 +70,7 @@
[ -n "$CP" ] && CP=`cygpath --path --windows "$CP"`
[ -n "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"`
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --windows "$M2_HOME"`
fi
MAIN_CLASS=org.codehaus.classworlds.Launcher
@@ -75,4 +79,6 @@
$MAVEN_OPTS \
-classpath "$CP" \
"-Dclassworlds.conf=$CLASSWORLDS_CONF" \
+ "-Dmaven.home=$M2_HOME" \
$MAIN_CLASS $@
+