avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix build.sh build.bat
Date Sat, 15 Dec 2001 07:12:36 GMT
donaldp     01/12/14 23:12:36

  Modified:    .        build.sh build.bat
  Log:
  Fixed up build files so they don't overide users AVALON_TOOLS env var. This way you don't
have any issueswhen compiling multiple projects from same shell some of which have a local
tools dir.
  
  This involved reordering search path (so ../jakarta-avalon/tools wins if present) and also
not modifying the var at all - instead creating a LOCAL_AVALON_TOOLS var.
  
  Submitted by: Leif Mortenson <leif@silveregg.co.jp>
  
  Revision  Changes    Path
  1.9       +9 -7      jakarta-avalon-phoenix/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/build.sh,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.sh	2001/12/11 10:01:35	1.8
  +++ build.sh	2001/12/15 07:12:36	1.9
  @@ -4,11 +4,13 @@
   echo "Phoenix Build System"
   echo "--------------------"
   
  +LOCAL_AVALON_TOOLS=$AVALON_TOOLS
  +
   if [ "$AVALON_TOOLS" = "" ] ; then
  -    if [ -d ../jakarta-avalon/tools ] ; then 
  -        AVALON_TOOLS=../jakarta-avalon/tools
  -    elif [ -d tools ] ; then 
  -        AVALON_TOOLS=tools
  +    if [ -d ../jakarta-avalon/tools ] ; then
  +        LOCAL_AVALON_TOOLS=../jakarta-avalon/tools
  +    elif [ -d tools ] ; then
  +        LOCAL_AVALON_TOOLS=tools
       else
           echo "Unable to locate tools directory at "
           echo "../jakarta-avalon/tools/ or tools/. "
  @@ -17,7 +19,7 @@
       fi
   fi
   
  -chmod u+x $AVALON_TOOLS/bin/antRun
  -chmod u+x $AVALON_TOOLS/bin/ant
  +chmod u+x $LOCAL_AVALON_TOOLS/bin/antRun
  +chmod u+x $LOCAL_AVALON_TOOLS/bin/ant
   
  -$AVALON_TOOLS/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs -Dtools.dir=$AVALON_TOOLS
$@ 
  +$LOCAL_AVALON_TOOLS/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs -Dtools.dir=$LOCAL_AVALON_TOOLS
$@
  
  
  
  1.10      +10 -11    jakarta-avalon-phoenix/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/build.bat,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.bat	2001/12/11 10:01:35	1.9
  +++ build.bat	2001/12/15 07:12:36	1.10
  @@ -1,23 +1,22 @@
   @echo off
   
  -echo ------------
  -echo Build System
  -echo ------------
  +if exist "tools\bin\ant.bat" set LOCAL_AVALON_TOOLS=tools
  +if exist "..\jakarta-avalon\tools\bin\ant.bat" set LOCAL_AVALON_TOOLS=..\jakarta-avalon\tools
  +if not "%AVALON_TOOLS%"=="" set LOCAL_AVALON_TOOLS=%AVALON_TOOLS%
   
  -if not "%AVALON_TOOLS%"=="" goto runAnt
  +if not "%LOCAL_AVALON_TOOLS%"=="" goto runAnt
   
  -if exist "..\jakarta-avalon\tools\bin\ant.bat" set AVALON_TOOLS=..\jakarta-avalon\tools
  -if exist "tools\bin\ant.bat" set AVALON_TOOLS=tools
  -
  -if not "%AVALON_TOOLS%"=="" goto runAnt
  -
   echo "Unable to locate tools directory at "
   echo "../jakarta-avalon/tools/ or tools/. "
   echo "Aborting."
   goto end
   
   :runAnt
  -set ANT_HOME=%AVALON_TOOLS%
  -%AVALON_TOOLS%\bin\ant.bat -logger org.apache.tools.ant.NoBannerLogger -emacs -Dtools.dir=%AVALON_TOOLS%
%1 %2 %3 %4 %5 %6 %7 %8
  +set OLD_ANT_HOME=%ANT_HOME%
  +set ANT_HOME=%LOCAL_AVALON_TOOLS%
  +%LOCAL_AVALON_TOOLS%\bin\ant.bat -logger org.apache.tools.ant.NoBannerLogger -emacs -Dtools.dir=%LOCAL_AVALON_TOOLS%
%1 %2 %3 %4 %5 %6 %7 %8
  +set ANT_HOME=%OLD_ANT_HOME%
  +set OLD_ANT_HOME=
   
   :end
  +set LOCAL_AVALON_TOOLS=
  
  
  

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


Mime
View raw message