avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-platform/src/bin merlin.bat merlinx.bat merlinx.sh
Date Sun, 14 Sep 2003 13:04:22 GMT
mcconnell    2003/09/14 06:04:22

  Modified:    merlin/merlin-platform/src/bin merlin.bat merlinx.bat
                        merlinx.sh
  Log:
  Add support for the seperation of system and user repositories.
  
  Revision  Changes    Path
  1.9       +1 -13     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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- merlin.bat	12 Sep 2003 15:25:15 -0000	1.8
  +++ merlin.bat	14 Sep 2003 13:04:22 -0000	1.9
  @@ -1,15 +1,5 @@
   @echo off
  -if "%MERLIN_HOME%" == "" goto MissingHomeDefinition
  -goto MerlinRuntime
  -
  -:MissingHomeDefinition
  -echo.
  -echo ERROR: MERLIN_HOME is not defined.
  -echo MERLIN_HOME = %MERLIN_HOME%
  -echo Please set the MERLIN_HOME variable in your environment to match the
  -echo location of the Merlin installation
  -echo.
  -goto EndOfScript
  +if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
   
   :MerlinRuntime
   set MERLIN_CMD_LINE_ARGS=%*
  @@ -19,5 +9,3 @@
   goto EndOfScript
   
   :EndOfScript
  -
  -
  
  
  
  1.7       +11 -17    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- merlinx.bat	12 Sep 2003 15:25:15 -0000	1.6
  +++ merlinx.bat	14 Sep 2003 13:04:22 -0000	1.7
  @@ -1,28 +1,22 @@
   @echo off
   
  -if "%MERLIN_HOME%" == "" goto MissingHomeDefinition
  +if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
   
  -goto :MerlinRuntime
  +set MERLIN_SYSTEM_REPOSITORY=%USERPROFILE%\.maven\repository
  +if "%MAVEN_HOME_LOCAL%" == "" goto DoneMerlinSystem
  +set MERLIN_SYSTEM_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
  +:DoneMerlinSystem
  +
  +set MERLIN_USER_REPOSITORY=%USERPROFILE%\.maven\repository
  +if "%MAVEN_HOME_LOCAL%" == "" goto DoneMerlinUser
  +set MERLIN_USER_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
  +:DoneMerlinUser
   
  -: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 -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Dmerlin.home=%MERLIN_HOME%
-Dmerlin.repository.local=%MERLIN_BOOTSTRAP_REPO% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR%
%MERLIN_CMD_LINE_ARGS%
  +java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Dmerlin.home=%MERLIN_HOME%
-Dmerlin.system.repository=%MERLIN_SYSTEM_REPOSITORY% -Dmerlin.local.repository=%MERLIN_USER_REPOSITORY%
-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.
  -echo MERLIN_HOME = %MERLIN_HOME%
  -echo Please set the MERLIN_HOME variable in your environment to match the
  -echo location of the Merlin installation
  -echo.
  -goto EndOfScript
   
   :EndOfScript
   
  
  
  
  1.4       +3 -3      avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.sh
  
  Index: merlinx.sh
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- merlinx.sh	12 Sep 2003 15:25:15 -0000	1.3
  +++ merlinx.sh	14 Sep 2003 13:04:22 -0000	1.4
  @@ -23,11 +23,11 @@
   # Checking for REPOSITORY
   if [ "$MAVEN_HOME_LOCAL" = "" ] 
   then
  - REPOSITORY="$HOME/.maven/"
  + REPOSITORY="$HOME/.maven/repository"
   else
  - REPOSITORY="$MAVEN_HOME_LOCAL"
  + REPOSITORY="$MAVEN_HOME_LOCAL/repository"
   fi
   
  -RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Dmerlin.repository.local=$REPOSITORY -Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar
$*"
  +RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Dmerlin.system.repository=$REPOSITORY -Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar
$*"
   echo "RUN CMD IS: $RUN_CMD"
   exec $RUN_CMD
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message