svn commit: rev 21159 - in avalon/trunk/runtime/merlin/cli: . etc/bin

Author: mcconnell
Date: Sun Jun 13 00:00:21 2004
New Revision: 21159

Modified:
   avalon/trunk/runtime/merlin/cli/build.xml
   avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat
Log:
add filters for platform specific path generation into bat scripts

Modified: avalon/trunk/runtime/merlin/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.xml	(original)
+++ avalon/trunk/runtime/merlin/cli/build.xml	Sun Jun 13 00:00:21 2004
@@ -13,8 +13,13 @@
        token="MERLIN_IMPLEMENTATION"/>
     <x:filter key="avalon-activation-impl" feature="uri" 
        token="STANDARD_RUNTIME"/>
-    <filter token="CACHE-DIRECTORY"
-       value="${project.home.cache.dir}"/>
+    <x:filter feature="system-classpath-for-windows" 
+       token="WINDOWS-CLI-CLASSPATH"/>
+    <x:filter feature="system-classpath-for-unix" 
+       token="UNIX-CLI-CLASSPATH"/>
+  </target>
+
+  <target name="package" depends="standard.package">
   </target>
 
 </project>

Modified: avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat	(original)
+++ avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat	Sun Jun 13 00:00:21 2004
@@ -12,11 +12,12 @@
 
 :SET_MERLIN
 if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
-set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\system\merlin\jars\@MERLIN_CLI_JAR@
+set MERLIN_CMD_LINE_ARGS=%*
+set SYSTEM_CACHE_DIRECTORY = %MERLIN_HOME%\system
 set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
+set MERLIN_BOOTSTRAP_CLASSPATH = @WINDOWS-CLI-CLASSPATH@
 
 :RUN_MERLIN
-%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
+%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -classpath %MERLIN_BOOTSTRAP_CLASSPATH% org.apache.avalon.merlin.cli.Main %MERLIN_CMD_LINE_ARGS%
 goto EndOfScript
 :EndOfScript