You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/09 00:50:02 UTC
svn commit: r169184 - /maven/components/trunk/m2-bootstrap-all.sh
/maven/components/trunk/maven-core-it/maven-core-it.sh
/maven/components/trunk/maven-core/src/bin/m2
/maven/components/trunk/maven-core/src/bin/m2.bat
/maven/components/trunk/maven-mboot2/build
Author: brett
Date: Sun May 8 15:50:01 2005
New Revision: 169184
URL: http://svn.apache.org/viewcvs?rev=169184&view=rev
Log:
PR: MNG-372
Submitted by: Mark Hobson
Reviewed by: Brett Porter
deal better with spaces in paths on windows
(applied with modifications)
Modified:
maven/components/trunk/m2-bootstrap-all.sh
maven/components/trunk/maven-core-it/maven-core-it.sh
maven/components/trunk/maven-core/src/bin/m2
maven/components/trunk/maven-core/src/bin/m2.bat
maven/components/trunk/maven-mboot2/build
Modified: maven/components/trunk/m2-bootstrap-all.sh
URL: http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.sh?rev=169184&r1=169183&r2=169184&view=diff
==============================================================================
--- maven/components/trunk/m2-bootstrap-all.sh (original)
+++ maven/components/trunk/m2-bootstrap-all.sh Sun May 8 15:50:01 2005
@@ -1,7 +1,7 @@
#!/bin/sh
# Check to make sure JAVA_HOME is set
-[ -z $JAVA_HOME ] && echo && echo 'You must set $JAVA_HOME to use mboot!' && echo && exit 1
+[ -z "$JAVA_HOME" ] && echo && echo 'You must set $JAVA_HOME to use mboot!' && echo && exit 1
JAVACMD=$JAVA_HOME/bin/java
@@ -19,7 +19,11 @@
fi
if [ ! -z "$M2_HOME" ]; then
- ARGS="$ARGS -Dmaven.home=$M2_HOME"
+ if [ -n "$ARGS" ]; then
+ ARGS="$ARGS -Dmaven.home=$M2_HOME"
+ else
+ ARGS="-Dmaven.home=$M2_HOME"
+ fi
fi
# Build and install mboot
@@ -39,7 +43,7 @@
echo " Building maven2 components ... "
echo "-----------------------------------------------------------------------"
- $JAVACMD $ARGS $MAVEN_OPTS -jar mboot.jar
+ "$JAVACMD" "$ARGS" $MAVEN_OPTS -jar mboot.jar
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
Modified: maven/components/trunk/maven-core-it/maven-core-it.sh
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/maven-core-it.sh?rev=169184&r1=169183&r2=169184&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/maven-core-it.sh (original)
+++ maven/components/trunk/maven-core-it/maven-core-it.sh Sun May 8 15:50:01 2005
@@ -26,8 +26,8 @@
fi
if [ ! -z "$M2_HOME" ]; then
- jvm_args="$jvm_args -Dmaven.home=$M2_HOME"
+ jvm_m2_home="-Dmaven.home=$M2_HOME"
fi
-java $jvm_args -cp "$cp" $verifier
+java "$jvm_m2_home" $jvm_args -cp "$cp" $verifier
Modified: maven/components/trunk/maven-core/src/bin/m2
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/bin/m2?rev=169184&r1=169183&r2=169184&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/bin/m2 (original)
+++ maven/components/trunk/maven-core/src/bin/m2 Sun May 8 15:50:01 2005
@@ -126,7 +126,7 @@
HOME=`cygpath --path --windows "$HOME"`
fi
-exec $JAVACMD \
+exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "${M2_HOME}"/core/boot/classworlds-*.jar \
"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
Modified: maven/components/trunk/maven-core/src/bin/m2.bat
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/bin/m2.bat?rev=169184&r1=169183&r2=169184&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/bin/m2.bat (original)
+++ maven/components/trunk/maven-core/src/bin/m2.bat Sun May 8 15:50:01 2005
@@ -127,7 +127,7 @@
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
@REM Start MAVEN2
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %M2_HOME%\core\boot\classworlds-*.jar "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath "%M2_HOME%"\core\boot\classworlds-* "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
goto end
:error
Modified: maven/components/trunk/maven-mboot2/build
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/build?rev=169184&r1=169183&r2=169184&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/build (original)
+++ maven/components/trunk/maven-mboot2/build Sun May 8 15:50:01 2005
@@ -9,8 +9,8 @@
mkdir -p ${classesDir}
#javac -d ${classesDir} ${srcDir}/*.java
-$JAVA_HOME/bin/javac -g -d ${classesDir} `find ${srcDir} -name '*.java'`
+"$JAVA_HOME/bin/javac" -g -d ${classesDir} `find ${srcDir} -name '*.java'`
-( cd ${classesDir} ; $JAVA_HOME/bin/jar -cfm ../mboot.jar ../../manifest.txt * )
+( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../mboot.jar ../../manifest.txt * )
cp ${buildDir}/mboot.jar ..
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org