mcconnell 2003/08/27 03:19:21 Modified: merlin/merlin-platform/src/bin merlinx.bat Log: Update to correctly handle maven home locations. Revision Changes Path 1.5 +12 -8 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- merlinx.bat 25 Aug 2003 16:41:04 -0000 1.4 +++ merlinx.bat 27 Aug 2003 10:19:21 -0000 1.5 @@ -1,8 +1,20 @@ @echo off if "%MERLIN_HOME%" == "" goto MissingHomeDefinition + goto :MerlinRuntime +:MerlinRuntime +set MERLIN_BOOTSTRAP_REPO=%USERPROFILE%\.maven +if "%MAVEN_HOME_LOCAL%" == "" goto StartMerlinRuntime +set MERLIN_BOOTSTRAP_REPO=%MAVEN_HOME_LOCAL% +:StartMerlinRuntime +set MERLIN_CMD_LINE_ARGS=%* +set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.0.jar +set MERLIN_EXT_DIR=%MERLIN_HOME%\ext +java -Dmerlin.home=%MERLIN_HOME% -Dmerlin.repository.local=%MERLIN_BOOTSTRAP_REPO% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS% +goto :EndOfScript + :MissingHomeDefinition echo. echo ERROR: MERLIN_HOME is not defined. @@ -11,14 +23,6 @@ echo location of the Merlin installation echo. goto EndOfScript - -:MerlinRuntime - -set MERLIN_CMD_LINE_ARGS=%* -set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.0.jar -set MERLIN_EXT_DIR=%MERLIN_HOME%\ext -java -Dmerlin.home=%MERLIN_HOME% -Dmerlin.repository.local=%MAVEN_HOME% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS% -goto :EndOfScript :EndOfScript
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
