mcconnell 2004/05/08 16:04:46
Modified: merlin/cli/src/bin merlin merlin-server.sh merlin.bat
merlin.sh merlinx.bat merlinx.sh
merlin/cli/src/bin/nt wrapper.conf
merlin/install merlin.nsi
Log:
Update scripts to reference the
merlin\\system\\merlin\\jars\\merlin-cli-VERSION.
Revision Changes Path
1.2 +1 -1 avalon/merlin/cli/src/bin/merlin
Index: merlin
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/src/bin/merlin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin 18 Apr 2004 12:59:47 -0000 1.1
+++ merlin 8 May 2004 23:04:46 -0000 1.2
@@ -27,7 +27,7 @@
cd "$CWD"
export MERLIN_HOME="`dirname "$ABSOLUTE_PATH"`"
fi
-export
MERLIN_BOOTSTRAP_JAR="$MERLIN_HOME/bin/lib/merlin-cli-$MERLIN_VERSION.jar"
+export
MERLIN_BOOTSTRAP_JAR="$MERLIN_HOME/system/merlin/jars/merlin-cli-$MERLIN_VERSION.jar"
if [ `echo $PLATFORM | grep "CYGWIN"` ] ; then
exec "$MERLIN_HOME/bin/internal-cygwin.sh" "$@"
1.2 +1 -1 avalon/merlin/cli/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/src/bin/merlin-server.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin-server.sh 18 Apr 2004 12:59:47 -0000 1.1
+++ merlin-server.sh 8 May 2004 23:04:46 -0000 1.2
@@ -108,7 +108,7 @@
JVM_EXT_DIRS="$MERLIN_HOME/ext"
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy "
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/system/merlin/jars/@MERLIN_CLI_JAR@
# Get the run cmd
RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar
$MERLIN_BOOTSTRAP_JAR $ARGS"
1.2 +1 -1 avalon/merlin/cli/src/bin/merlin.bat
Index: merlin.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/src/bin/merlin.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin.bat 18 Apr 2004 12:59:47 -0000 1.1
+++ merlin.bat 8 May 2004 23:04:46 -0000 1.2
@@ -13,7 +13,7 @@
:SET_MERLIN
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set MERLIN_CMD_LINE_ARGS=%*
-set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
set
MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
:RUN_MERLIN
1.3 +1 -1 avalon/merlin/cli/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/src/bin/merlin.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.sh 6 May 2004 18:56:03 -0000 1.2
+++ merlin.sh 8 May 2004 23:04:46 -0000 1.3
@@ -47,7 +47,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/system/merlin/jars/@MERLIN_CLI_JAR@
echo "Starting Merlin."
echo "================"
1.2 +1 -1 avalon/merlin/cli/src/bin/merlinx.bat
Index: merlinx.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/src/bin/merlinx.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlinx.bat 18 Apr 2004 12:59:47 -0000 1.1
+++ merlinx.bat 8 May 2004 23:04:46 -0000 1.2
@@ -17,7 +17,7 @@
set WORKING_REPOSITORY="%MAVEN_HOME_LOCAL%\repository"
:DoneMerlinSystem
set MERLIN_CMD_LINE_ARGS=%*
-set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
set
MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
:RUN_MERLIN
1.3 +1 -1 avalon/merlin/cli/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/src/bin/merlinx.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlinx.sh 6 May 2004 18:56:03 -0000 1.2
+++ merlinx.sh 8 May 2004 23:04:46 -0000 1.3
@@ -58,7 +58,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/system/merlin/jars/@MERLIN_CLI_JAR@
echo "Starting Merlin."
echo "================"
1.2 +1 -1 avalon/merlin/cli/src/bin/nt/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/src/bin/nt/wrapper.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wrapper.conf 18 Apr 2004 12:59:47 -0000 1.1
+++ wrapper.conf 8 May 2004 23:04:46 -0000 1.2
@@ -10,7 +10,7 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=wrapper.jar
-wrapper.java.classpath.2=../lib/@MERLIN_CLI_JAR@
+wrapper.java.classpath.2=../../system/merlin/jars/@MERLIN_CLI_JAR@
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
1.3 +1 -1 avalon/merlin/install/merlin.nsi
Index: merlin.nsi
===================================================================
RCS file: /home/cvs/avalon/merlin/install/merlin.nsi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.nsi 8 May 2004 22:04:43 -0000 1.2
+++ merlin.nsi 8 May 2004 23:04:46 -0000 1.3
@@ -26,7 +26,7 @@
;General
Name "Merlin Platform 3.3"
- OutFile "merlin-install.exe"
+ OutFile "merlin-install-3.3.0-RC5.exe"
;Folder selection page
InstallDir "C:\merlin"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
