svn commit: r450704 - /maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn

[jv...@apache.org]

Author: jvanzyl
Date: Wed Sep 27 22:38:18 2006
New Revision: 450704

URL: http://svn.apache.org/viewvc?view=rev&rev=450704
Log:
merge from 450702 on trunk

Modified:
    maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn

Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn?view=diff&rev=450704&r1=450703&r2=450704
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn Wed Sep 27 22:38:18 2006
@@ -37,8 +37,10 @@
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;
+mingw=false
 case "`uname`" in
   CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
   Darwin*) darwin=true 
            if [ -z "$JAVA_VERSION" ] ; then
              JAVA_VERSION="CurrentJDK"
@@ -100,6 +102,15 @@
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
 fi
 
 if [ -z "$JAVACMD" ] ; then