cvs commit: xml-forrest/tools/ant/bin ant ant.bat

[je...@apache.org]

jefft       2003/09/17 03:02:39

  Modified:    .        status.xml
               tools/ant/bin ant ant.bat
  Log:
  Don't source /etc/antrc and ~/.antrc, as they may contain stuff that breaks
  Forrest (in jpackage-derived RPMs).  Thanks to Eric BURGHARD
  
  Revision  Changes    Path
  1.219     +5 -1      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.218
  retrieving revision 1.219
  diff -u -r1.218 -r1.219
  --- status.xml	16 Sep 2003 23:12:13 -0000	1.218
  +++ status.xml	17 Sep 2003 10:02:39 -0000	1.219
  @@ -25,6 +25,10 @@
   
     <changes>
       <release version="0.6-dev" date="unreleased">
  +      <action dev="JT" type="fix" context="core">
  +        The 'forrest' command no longer sources /etc/antrc and
  +        ~/.antrc, which solves problems on some *nix distributions.
  +      </action>
         <action dev="JJP" type="update" context="core"
           due-to="Eric Burghard" due-to-email="eburghar@free.fr" >
           Added creation of TOC support on PDF files.
  
  
  
  1.4       +4 -4      xml-forrest/tools/ant/bin/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/ant/bin/ant,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant	30 Oct 2002 09:08:27 -0000	1.3
  +++ ant	17 Sep 2003 10:02:39 -0000	1.4
  @@ -4,8 +4,8 @@
   #   reserved.
   
   # load system-wide ant configuration
  -if [ -f "/etc/ant.conf" ] ; then 
  -  . /etc/ant.conf
  +if [ -f "/etc/forrest.conf" ] ; then 
  +  . /etc/forrest.conf
   fi
   
   # provide default values for people who don't use RPMs
  @@ -17,8 +17,8 @@
   fi
   
   # load user ant configuration
  -if [ -f "$HOME/.antrc" ] ; then 
  -  . "$HOME/.antrc"
  +if [ -f "$HOME/.forrestrc" ] ; then 
  +  . "$HOME/.forrestrc"
   fi
   
   # OS specific support.  $var _must_ be set to either true or false.
  
  
  
  1.4       +2 -2      xml-forrest/tools/ant/bin/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/ant/bin/ant.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.bat	30 Oct 2002 09:08:27 -0000	1.3
  +++ ant.bat	17 Sep 2003 10:02:39 -0000	1.4
  @@ -3,7 +3,7 @@
   REM   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
   REM   reserved.
   
  -if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
  +if exist "%HOME%\forrestrc_pre.bat" call "%HOME%\forrestrc_pre.bat"
   
   if "%OS%"=="Windows_NT" @setlocal
   
  @@ -92,5 +92,5 @@
   if "%OS%"=="Windows_NT" @endlocal
   
   :mainEnd
  -if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
  +if exist "%HOME%\forrestrc_post.bat" call "%HOME%\forrestrc_post.bat"