niclas 2003/12/23 15:15:28
Modified: merlin/platform/src/bin internal-cygwin.sh merlin merlinx
Log:
Sanity checks made on CygWin, and some adjustments made to make it work.
Revision Changes Path
1.3 +2 -1 avalon/merlin/platform/src/bin/internal-cygwin.sh
Index: internal-cygwin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/internal-cygwin.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- internal-cygwin.sh 23 Dec 2003 22:48:59 -0000 1.2
+++ internal-cygwin.sh 23 Dec 2003 23:15:27 -0000 1.3
@@ -11,6 +11,7 @@
# switch necessary paths to Windows format before running java
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
+MERLIN_BOOTSTRAP_JAR=`cygpath --windows "$MERLIN_BOOTSTRAP_JAR"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
@@ -28,4 +29,4 @@
echo -n "$JAVA" >$MERLIN_HOME/command-line.log
echo "$ARGS" >>$MERLIN_HOME/command-line.log
-echo ARGS | xargs "$JAVA"
+echo $ARGS | xargs "$JAVA"
1.3 +1 -1 avalon/merlin/platform/src/bin/merlin
Index: merlin
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin 23 Dec 2003 22:48:59 -0000 1.2
+++ merlin 23 Dec 2003 23:15:27 -0000 1.3
@@ -24,7 +24,7 @@
cd "$BIN_DIR"
ABSOLUTE_PATH=`pwd`
cd "$CWD"
- export MERLIN_HOME=`dirname "$ABSOLUTE_PATH"`
+ export MERLIN_HOME="`dirname "$ABSOLUTE_PATH"`"
fi
export MERLIN_BOOTSTRAP_JAR="$MERLIN_HOME/bin/lib/merlin-cli-$MERLIN_VERSION.jar"
1.3 +1 -1 avalon/merlin/platform/src/bin/merlinx
Index: merlinx
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlinx 23 Dec 2003 22:48:59 -0000 1.2
+++ merlinx 23 Dec 2003 23:15:27 -0000 1.3
@@ -16,7 +16,7 @@
cd "$BIN_DIR"
ABSOLUTE_PATH=`pwd`
cd "$CWD"
- export MERLIN_HOME=`dirname "$ABSOLUTE_PATH"`
+ export MERLIN_HOME="`dirname "$ABSOLUTE_PATH"`"
fi
# Checking for REPOSITORY
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]