forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/tools/ant/bin ant ant.bat
Date Wed, 17 Sep 2003 12:16:25 GMT
jefft       2003/09/17 05:16:25

  Modified:    tools/ant/bin Tag: FORREST_05_BRANCH 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
  No                   revision
  No                   revision
  1.3.12.1  +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.3.12.1
  diff -u -r1.3 -r1.3.12.1
  --- ant	30 Oct 2002 09:08:27 -0000	1.3
  +++ ant	17 Sep 2003 12:16:25 -0000	1.3.12.1
  @@ -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.3.12.1  +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.3.12.1
  diff -u -r1.3 -r1.3.12.1
  --- ant.bat	30 Oct 2002 09:08:27 -0000	1.3
  +++ ant.bat	17 Sep 2003 12:16:25 -0000	1.3.12.1
  @@ -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"
   
  
  
  

Mime
View raw message