dion 2002/06/14 07:45:46
Modified: src/bin maven2
. build-bootstrap.xml
Added: src/bin maven-j
Log:
- Updated maven2 script as per Christian Asmussen
- Added maven-j as a start for running the new java front end
- Changed bootstrap to mark maven-j as executable
Revision Changes Path
1.3 +47 -5 jakarta-turbine-maven/src/bin/maven2
Index: maven2
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven2 12 Jun 2002 02:55:06 -0000 1.2
+++ maven2 14 Jun 2002 14:45:46 -0000 1.3
@@ -1,8 +1,50 @@
#!/bin/sh
-MAVEN_HOME=`cat $HOME/build.properties|grep maven.home|awk -F "=" {'print $2'}`
-MAVEN_TARGET="maven:$1"
-shift
+MAVEN_HOME=`cat ~/build.properties|grep maven.home|awk -F "=" {'print $2'}`
BASEDIR=`pwd`
BUILDFILE="$MAVEN_HOME/examples/build.xml"
-MAVEN_ARGS="-f $BUILDFILE -Dbasedir=$BASEDIR $@"
-ant $MAVEN_ARGS $MAVEN_TARGET
\ No newline at end of file
+DEFAULT_ARGS="-f $BUILDFILE -Dbasedir=$BASEDIR"
+
+usage()
+{
+ echo -ne `basename $0`;
+ echo " [options] [target [ target2 [target3] ] ]"
+ echo "Targets:"
+ echo -ne "\t*\t->\tmaven:*\n"
+ echo "Options:"
+ echo -ne "\t-help\t\tthis message\n"
+ echo -ne "\t-mavenhelp\tdisplay available targets\n"
+ echo -ne "\t-*\t\toption delegated to ant\n"
+
+}
+
+maven_usage()
+{
+AVAILABLE_TARGETS=`ant $DEFAULT_ARGS -projecthelp|grep "maven:"|awk -F ":" {'print
$2'}`
+echo "Available targets:"
+for target in $AVAILABLE_TARGETS; do
+ echo -ne "\t$target\n";
+done
+
+}
+
+MAVEN_TARGETS=""
+MAVEN_ARGS=$DEFAULT_ARGS
+for arg in "$@"; do
+ case $arg in
+ -help)
+ usage
+ exit
+ ;;
+ -mavenhelp)
+ maven_usage
+ exit
+ ;;
+ -*)
+ MAVEN_ARGS="$MAVEN_ARGS $arg"
+ ;;
+ *)
+ MAVEN_TARGETS="$MAVEN_TARGETS maven:$arg"
+ ;;
+ esac
+done
+ant $MAVEN_ARGS $MAVEN_TARGETS
1.1 jakarta-turbine-maven/src/bin/maven-j
Index: maven-j
===================================================================
#!/bin/sh
MAVEN_HOME=`cat $HOME/build.properties|grep maven.home|awk -F "=" {'print $2'}`
MAVEN_OPTS="-Xmx128m"
if [ -f "$HOME/.mavenrc" ] ; then
. $HOME/.mavenrc
fi
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true ;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$MAVEN_HOME" ] &&
MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
# setup JAVACMD
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
else
JAVACMD=java
fi
fi
if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly."
echo " We cannot execute $JAVACMD"
exit
fi
if [ -n "$CLASSPATH" ] ; then
LOCALCLASSPATH=$CLASSPATH
fi
# add in the dependency .jar files
DIRLIBS=${MAVEN_HOME}/lib/*.jar
for i in ${DIRLIBS}
do
# if the directory is empty, then it will return the input string
# this is stupid, so case for it
if [ "$i" != "${DIRLIBS}" ] ; then
if [ -z "$LOCALCLASSPATH" ] ; then
LOCALCLASSPATH=$i
else
LOCALCLASSPATH="$i":$LOCALCLASSPATH
fi
fi
done
# add tools.jar or classes.zip
if [ -n "$JAVA_HOME" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
fi
if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
fi
# OSX hack to make Ant work with jikes
if $darwin ; then
OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
if [ -d ${OSXHACK} ] ; then
for i in ${OSXHACK}/*.jar
do
JIKESPATH=$JIKESPATH:$i
done
fi
fi
else
echo "Warning: JAVA_HOME environment variable is not set."
echo " If build fails because sun.* classes could not be found"
echo " you will need to set the JAVA_HOME environment variable"
echo " to the installation directory of java."
fi
# supply JIKESPATH to Ant as jikes.class.path
if [ -n "$JIKESPATH" ] ; then
if [ -n "$MAVEN_OPTS" ] ; then
MAVEN_OPTS="$MAVEN_OPTS -Djikes.class.path=$JIKESPATH"
else
MAVEN_OPTS=-Djikes.class.path=$JIKESPATH
fi
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
fi
MAIN_CLASS=org.apache.maven.Build
BASEDIR=`pwd`
if [ -n "$MAVEN_OPTS" ]; then
MAVEN_OPTS="$MAVEN_OPTS -Dmaven.home=${MAVEN_HOME} -Dbasedir=${BASEDIR}"
else
MAVEN_OPTS="-Dmaven.home=${MAVEN_HOME} -Dbasedir=${BASEDIR}"
fi
$JAVACMD -classpath "$LOCALCLASSPATH" $MAVEN_OPTS $MAIN_CLASS $MAVEN_ARGS "$@"
#BUILDFILE="$MAVEN_HOME/examples/build.xml"
#MAVEN_ARGS="-f $BUILDFILE -Dbasedir=$BASEDIR $@"
#ant $MAVEN_ARGS $MAVEN_TARGET
1.100 +1 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- build-bootstrap.xml 14 Jun 2002 01:42:41 -0000 1.99
+++ build-bootstrap.xml 14 Jun 2002 14:45:46 -0000 1.100
@@ -408,6 +408,7 @@
<chmod file="${maven.home}/bin/maven" perm="+x"/>
<chmod file="${maven.home}/bin/maven2" perm="+x"/>
+ <chmod file="${maven.home}/bin/maven-j" perm="+x"/>
<taskdef
name="create-patternset"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
