brett 2004/06/14 05:36:49
Modified: src/bin Tag: MAVEN-1_0-BRANCH maven maven.bat
Log:
add way to get $HOME
Revision Changes Path
No revision
No revision
1.31.4.6 +3 -0 maven/src/bin/maven
Index: maven
===================================================================
RCS file: /home/cvs/maven/src/bin/maven,v
retrieving revision 1.31.4.5
retrieving revision 1.31.4.6
diff -u -r1.31.4.5 -r1.31.4.6
--- maven 12 Jun 2004 22:24:17 -0000 1.31.4.5
+++ maven 14 Jun 2004 12:36:48 -0000 1.31.4.6
@@ -129,6 +129,8 @@
MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] &&
+ HOME=`cygpath --path --windows "$HOME"`
[ -n "$MAVEN_ENDORSED" ] &&
MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
fi
@@ -153,5 +155,6 @@
"-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf" \
"-Dtools.jar=$TOOLS_JAR" \
"-Dmaven.home=${MAVEN_HOME}" \
+ "-Duser.home.env=${HOME}" \
$MAIN_CLASS "$@"
1.38.4.5 +4 -4 maven/src/bin/maven.bat
Index: maven.bat
===================================================================
RCS file: /home/cvs/maven/src/bin/maven.bat,v
retrieving revision 1.38.4.4
retrieving revision 1.38.4.5
diff -u -r1.38.4.4 -r1.38.4.5
--- maven.bat 12 May 2004 04:50:38 -0000 1.38.4.4
+++ maven.bat 14 Jun 2004 12:36:48 -0000 1.38.4.5
@@ -123,14 +123,14 @@
if not "%MAVEN_HOME_LOCAL%" == "" goto StartMHL
@REM Start MAVEN without MAVEN_HOME_LOCAL override
-%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Duser.home.env=%HOME%" "-Dmaven.home=%MAVEN_HOME%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Duser.home.env=%HOME%" "-Dmaven.home=%MAVEN_HOME%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
goto :end
@REM Start MAVEN with MAVEN_HOME_LOCAL override
:StartMHL
-%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dmaven.home.local=%MAVEN_HOME_LOCAL%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Dmaven.home=%MAVEN_HOME%" "-Dmaven.home.local=%MAVEN_HOME_LOCAL%"
"-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE%
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
"-Duser.home.env=%HOME%" "-Dmaven.home=%MAVEN_HOME%"
"-Dmaven.home.local=%MAVEN_HOME_LOCAL%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
[EMAIL PROTECTED] %MAVEN_JAVA_EXE%
-Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
"-Duser.home.env=%HOME%" "-Dmaven.home=%MAVEN_HOME%"
"-Dmaven.home.local=%MAVEN_HOME_LOCAL%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar"
"-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf"
-Djava.endorsed.dirs=%MAVEN_ENDORSED% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH%
%MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
:end
@REM set local scope for the variables with windows NT shell
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
