svn commit: r410731 - in /forrest/trunk/tools/ant/bin: README-forrest-upgrade.txt ant ant.bat

[cr...@apache.org]

Author: crossley
Date: Wed May 31 20:39:02 2006
New Revision: 410731

URL: http://svn.apache.org/viewvc?rev=410731&view=rev
Log:
We have some changes to the Ant scripts which get clobbered.
Bring back r8757:
Don't source /etc/antrc and ~/.antrc, as they may contain stuff that breaks
Forrest (in jpackage-derived RPMs).  Thanks to Eric BURGHARD

Added:
    forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt   (with props)
Modified:
    forrest/trunk/tools/ant/bin/ant
    forrest/trunk/tools/ant/bin/ant.bat

Added: forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt?rev=410731&view=auto
==============================================================================
--- forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt (added)
+++ forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt Wed May 31 20:39:02 2006
@@ -0,0 +1,7 @@
+Notes for upgrading Forrest's packaged Ant.
+
+We have some changes to the Ant scripts.
+See svn log for details.
+
+ant
+ant.bat

Propchange: forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/tools/ant/bin/ant
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant?rev=410731&r1=410730&r2=410731&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/ant (original)
+++ forrest/trunk/tools/ant/bin/ant Wed May 31 20:39:02 2006
@@ -45,16 +45,16 @@
   usejikes=$use_jikes_default
 else
   # load system-wide ant configuration
-  if [ -f "/etc/ant.conf" ] ; then
-    . /etc/ant.conf
+  if [ -f "/etc/forrest.conf" ] ; then
+    . /etc/forrest.conf
   fi
 
   # load user ant configuration
   if [ -f "$HOME/.ant/ant.conf" ] ; then
     . $HOME/.ant/ant.conf
   fi
-  if [ -f "$HOME/.antrc" ] ; then
-    . "$HOME/.antrc"
+  if [ -f "$HOME/.forrestrc" ] ; then
+    . "$HOME/.forrestrc"
   fi
 
   # provide default configuration values

Modified: forrest/trunk/tools/ant/bin/ant.bat
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant.bat?rev=410731&r1=410730&r2=410731&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/ant.bat (original)
+++ forrest/trunk/tools/ant/bin/ant.bat Wed May 31 20:39:02 2006
@@ -15,7 +15,7 @@
 REM  See the License for the specific language governing permissions and
 REM  limitations under the License.
 
-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
 if "%OS%"=="WINNT" @setlocal
@@ -123,5 +123,5 @@
 if "%OS%"=="WINNT" @endlocal
 
 :mainEnd
-if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
+if exist "%HOME%\forrestrc_post.bat" call "%HOME%\forrestrc_post.bat"