You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/12/23 16:07:01 UTC
cvs commit: avalon/merlin/platform/src/bin merlin.sh merlinx.sh
mcconnell 2003/12/23 07:07:01
Modified: merlin/platform/src/bin merlin.sh merlinx.sh
Log:
Applying Cygwin support patch from J�rg Schaible
Revision Changes Path
1.11 +4 -4 avalon/merlin/platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- merlin.sh 22 Dec 2003 13:57:53 -0000 1.10
+++ merlin.sh 23 Dec 2003 15:07:01 -0000 1.11
@@ -34,21 +34,21 @@
fi
JAVA=$JAVA_HOME/bin/java
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
# switch necessary paths to Windows format before running java
if $cygwin; then
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
- MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME'\'bin'\'lib'\'merlin-cli-3.2.jar
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
+
echo "Starting Merlin."
echo "================"
echo " Security policy: $MERLIN_HOME/bin/security.policy"
-echo " Extension directory: $MERLIN_HOME/ext"
+echo " JVM Options: $MERLIN_JVM_OPTS"
echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
echo ""
-"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" $@
+"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" "$@"
1.10 +3 -4 avalon/merlin/platform/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merlinx.sh 22 Dec 2003 13:57:53 -0000 1.9
+++ merlinx.sh 23 Dec 2003 15:07:01 -0000 1.10
@@ -35,7 +35,6 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
-
# Checking for REPOSITORY
if [ "$MAVEN_HOME_LOCAL" = "" ]
then
@@ -45,7 +44,6 @@
fi
JAVA=$JAVA_HOME/bin/java
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
# switch necessary paths to Windows format before running java
if $cygwin; then
@@ -55,13 +53,14 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
+
echo "Starting Merlin."
echo "================"
echo " Security policy: $MERLIN_HOME/bin/security.policy"
-echo " Extension directory: $MERLIN_HOME/ext"
echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
echo " System: $REPOSITORY"
echo " Repository: $REPOSITORY"
echo ""
-"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" -system "$REPOSITORY" -repository "$REPOSITORY" $@
+"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" -system "$REPOSITORY" -repository "$REPOSITORY" "$@"
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org