svn commit: r410743 - in /forrest/trunk: site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml tools/ant/bin/ant tools/ant/bin/ant.bat

[cr...@apache.org]

Author: crossley
Date: Wed May 31 21:47:50 2006
New Revision: 410743

URL: http://svn.apache.org/viewvc?rev=410743&view=rev
Log:
Forrest uses its own packaged Ant, so do not use libraries from any system Ant.
Cause ANT_HOME to be set to our local libraries.

Modified:
    forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
    forrest/trunk/tools/ant/bin/ant
    forrest/trunk/tools/ant/bin/ant.bat

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml?rev=410743&r1=410742&r2=410743&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml Wed May 31 21:47:50 2006
@@ -80,19 +80,20 @@
         <a href="http://ant.apache.org/">Apache Ant</a>
         to automate some steps in the process. Since ant
         is distributed as part of Forrest, all you need to do
-        is add the ant executable directory to your system path. The
+        is add Forrest's 'ant' executable directory to your system path. The
         name of this directory is <code>tools/ant/bin</code>
         in your Forrest program directory.
-        (Alternatively you can prefix all calls to ant in
-        the following instructions with the full path of the ant binary directory.)
-        Also clear the ANT_HOME environment variable.
+        Alternatively you can prefix all calls to ant in
+        the following instructions with the full path of the ant binary directory, i.e.
+        $FORREST_HOME/tools/ant/bin/ant
       </p>
       <p>
         If instead you really want to use your own version of Ant,
         then you will need to copy
         forrest/lib/core/xml-commons-resolver.jar
-        to $ANT_HOME/lib directory, otherwise your plugins will go across
-        the network to get the DTDs on every parse.
+        to $ANT_HOME/lib directory, otherwise the building of your plugins will go across
+        the network to get the DTDs on every xml parse. Be aware that Forrest
+        might be relying on some Ant features in its version.
       </p>
     </section>
 

Modified: forrest/trunk/tools/ant/bin/ant
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant?rev=410743&r1=410742&r2=410743&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/ant (original)
+++ forrest/trunk/tools/ant/bin/ant Wed May 31 21:47:50 2006
@@ -87,7 +87,8 @@
            ;;
 esac
 
-if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
+# Forrest uses its own packaged Ant, so don't use the system Ant libraries
+#if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
   ## resolve links - $0 may be a link to ant's home
   PRG="$0"
   progname=`basename "$0"`
@@ -107,7 +108,7 @@
 
   # make it fully qualified
   ANT_HOME=`cd "$ANT_HOME" && pwd`
-fi
+#fi
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then

Modified: forrest/trunk/tools/ant/bin/ant.bat
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant.bat?rev=410743&r1=410742&r2=410743&view=diff
==============================================================================
--- forrest/trunk/tools/ant/bin/ant.bat (original)
+++ forrest/trunk/tools/ant/bin/ant.bat Wed May 31 21:47:50 2006
@@ -23,7 +23,9 @@
 rem %~dp0 is expanded pathname of the current script under NT
 set DEFAULT_ANT_HOME=%~dp0..
 
-if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
+REM Forrest uses its own packaged Ant, so don't use the system Ant libraries
+REM if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
+set ANT_HOME=%DEFAULT_ANT_HOME%
 set DEFAULT_ANT_HOME=
 
 set _USE_CLASSPATH=yes