cvs commit: maven-components/maven-core/src/bin m2

[evenisse]

evenisse    2004/04/16 06:08:57

  Modified:    maven-core/src/bin m2
  Log:
  Fix for cygwin
  
  Revision  Changes    Path
  1.4       +17 -9     maven-components/maven-core/src/bin/m2
  
  Index: m2
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- m2        12 Apr 2004 19:14:02 -0000      1.3
  +++ m2        16 Apr 2004 13:08:56 -0000      1.4
  @@ -96,9 +96,21 @@
   fi
   
   MAVEN_ENDORSED==${JAVA_HOME}/lib/endorsed:${M2_HOME}/lib/endorsed
  +CLASSWORLDS_CONF="${M2_HOME}/bin/classworlds.conf"
  +CP=${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar
  +
  +# For Darwin, use classes.jar for TOOLS_JAR
  +TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
  +if $darwin; then
  +  
TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar"
  +fi
   
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
  +  [ -n "$CP" ] &&
  +    CP=`cygpath --path --windows "$CP"`
  +  [ -n "$CLASSWORLDS_CONF" ] &&
  +    CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"`
     [ -n "$M2_HOME" ] &&
       M2_HOME=`cygpath --path --windows "$M2_HOME"`
     [ -n "$M2_HOME_LOCAL" ] &&
  @@ -107,20 +119,16 @@
       JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     [ -n "$MAVEN_ENDORSED" ] &&
       MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
  -fi
  -
  -# For Darwin, use classes.jar for TOOLS_JAR
  -TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
  -if $darwin; then
  -  
TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar"
  +  [ -n "$TOOLS_JAR" ] &&
  +    TOOLS_JAR=`cygpath --path --windows "$TOOLS_JAR"`
   fi
   
   MAIN_CLASS=org.codehaus.classworlds.Launcher
   
   $JAVACMD \
     $MAVEN_OPTS \
  -  -classpath "${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar" \
  -  "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf"  \
  +  -classpath "$CP" \
  +  "-Dclassworlds.conf=$CLASSWORLDS_CONF"  \
     "-Dtools.jar=$TOOLS_JAR" \
  -  "-Dmaven.home=${M2_HOME}"
  +  "-Dmaven.home=${M2_HOME}" \
     $MAIN_CLASS $@
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]