mcconnell 2003/08/20 01:45:22 Modified: merlin/merlin-platform/src/bin merlinx.bat merlin.bat Log: Tweeking cli handlers. Revision Changes Path 1.2 +3 -0 avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.bat Index: merlinx.bat =================================================================== RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- merlinx.bat 20 Aug 2003 08:30:08 -0000 1.1 +++ merlinx.bat 20 Aug 2003 08:45:22 -0000 1.2 @@ -1,7 +1,9 @@ @echo off + if "%MERLIN_HOME%" == "" goto MissingHomeDefinition java -Dmerlin.home=%MERLIN_HOME% -Dmerlin.repository.local=%MAVEN_HOME% -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Djava.ext.dirs=%MERLIN_HOME%\ext -jar %MERLIN_HOME%\bin\merlin-bootstrap-1.0.jar %1 %2 %3 %4 %5 %6 goto :end + :MissingHomeDefinition echo. echo ERROR: MERLIN_HOME is not defined. @@ -10,6 +12,7 @@ echo location of the Merlin installation echo. goto end + :end 1.6 +1 -1 avalon-sandbox/merlin/merlin-platform/src/bin/merlin.bat Index: merlin.bat =================================================================== RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlin.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- merlin.bat 17 Aug 2003 15:06:41 -0000 1.5 +++ merlin.bat 20 Aug 2003 08:45:22 -0000 1.6 @@ -1,6 +1,6 @@ @echo off if "%MERLIN_HOME%" == "" goto MissingHomeDefinition -java -Dmerlin.home=%MERLIN_HOME% -jar %MERLIN_HOME%\bin\merlin-bootstrap-1.0.jar %1 %2 %3 %4 %5 %6 +java -Dmerlin.home=%MERLIN_HOME% -Djava.ext.dirs=%MERLIN_HOME%\ext -jar %MERLIN_HOME%\bin\merlin-bootstrap-1.0.jar %1 %2 %3 %4 %5 %6 goto :end :MissingHomeDefinition echo.
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
