forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r106464 - in forrest/trunk/plugins: . IMSManifest OpenOffice.org feeder org.apache.forrest.plugin.fbits org.apache.forrest.plugin.logs org.apache.forrest.plugin.pdf-output pluginTemplate simplified-docbook text-output wiki
Date Wed, 24 Nov 2004 21:03:53 GMT
Author: rgardler
Date: Wed Nov 24 13:03:52 2004
New Revision: 106464

URL: http://svn.apache.org/viewcvs?view=rev&rev=106464
Log:
Bring all build targets into the main plugin build file, allow individual plugin build files
to override functionlaity.
Modified:
   forrest/trunk/plugins/IMSManifest/build.xml
   forrest/trunk/plugins/OpenOffice.org/build.xml
   forrest/trunk/plugins/build.xml
   forrest/trunk/plugins/feeder/build.xml
   forrest/trunk/plugins/org.apache.forrest.plugin.fbits/build.xml
   forrest/trunk/plugins/org.apache.forrest.plugin.logs/build.xml
   forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml
   forrest/trunk/plugins/pluginTemplate/build.xml
   forrest/trunk/plugins/simplified-docbook/build.xml
   forrest/trunk/plugins/text-output/build.xml
   forrest/trunk/plugins/wiki/build.xml

Modified: forrest/trunk/plugins/IMSManifest/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/IMSManifest/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/IMSManifest/build.xml&r1=106463&p2=forrest/trunk/plugins/IMSManifest/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/IMSManifest/build.xml	(original)
+++ forrest/trunk/plugins/IMSManifest/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,36 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
-  <property name="build.dir" location="build"/>
   <property name="plugin-name" value="IMSManifest"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/OpenOffice.org/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/OpenOffice.org/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/OpenOffice.org/build.xml&r1=106463&p2=forrest/trunk/plugins/OpenOffice.org/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/OpenOffice.org/build.xml	(original)
+++ forrest/trunk/plugins/OpenOffice.org/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,36 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
-  <property name="build.dir" location="build"/>
   <property name="plugin-name" value="OpenOffice.org"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/build.xml&r1=106463&p2=forrest/trunk/plugins/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/build.xml	(original)
+++ forrest/trunk/plugins/build.xml	Wed Nov 24 13:03:52 2004
@@ -14,27 +14,30 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="local-deploy" basedir="." name="Forrest Plugins build file">
-  <property name="forrest.root-dir"           location=".."/>   
+<project default="local-deploy" basedir="." name="Forrest_Plugins_build_file">
+  <property environment="env"/>
+  <property name="forrest.root-dir"           location="${env.FORREST_HOME}"/>   
+  <property name="forrest.home"               location="${env.FORREST_HOME}/main" />
 
   <property name="forrest.ant.lib.dir"        location="${forrest.root-dir}/tools/ant/lib"/>
 
   <property name="forrest.build.dir"          location="${forrest.root-dir}/build"/>
   <property name="forrest.plugins.dir"        location="${forrest.root-dir}/plugins"/>
   
-  <property name="plugins.dist-dir" value="build/dist"/>
-  <property name="plugins.localDeploy-dir" value="${forrest.build.dir}/plugins"/>
-  
-  <property name="plugin.src.dir" value="src"/>
-  <property name="plugin.resources.dir" value="resources"/>
-  <property name="plugin.stylesheets.dir" value="${plugin.resources.dir}/stylesheets"/>
-  
-  <property name="plugin.template.dir" value="pluginTemplate"/>
-  
-  <property name="deploy.svn.user" value=""/>
-  <property name="deploy.svn.password" value=""/>
-  <property name="deploy.svn.url" value="https://svn.apache.org/repos/asf/forrest/site/plugins"/>
-  <property name="deploy.svn.commit-message" value="Automatic deployment from plugins
build"/>
-  <property name="deploy.svn.svn-dir" location="${forrest.build.dir}/svn-plugins-deploy"/>
-  <property name="deploy.svn.svn-filestoadd" location="build/svn-deploy.toadd"/>
+  <property name="plugins.dir"                location="${ant.file.Forrest_Plugins_build_file}/.."/>
+  <property name="plugins.dist-dir"           location="build/dist"/>
+  <property name="plugins.localDeploy-dir"    location="${forrest.build.dir}/plugins"/>
+  
+  <property name="plugin.src.dir"             value="src"/>
+  <property name="plugin.resources.dir"       value="resources"/>
+  <property name="plugin.stylesheets.dir"     value="${plugin.resources.dir}/stylesheets"/>
+  
+  <property name="plugin.template.dir"        value="pluginTemplate"/>
+  
+  <property name="deploy.svn.user"            value=""/>
+  <property name="deploy.svn.password"        value=""/>
+  <property name="deploy.svn.url"             value="https://svn.apache.org/repos/asf/forrest/site/plugins"/>
+  <property name="deploy.svn.commit-message"  value="Automatic deployment from plugins
build"/>
+  <property name="deploy.svn.svn-dir"         location="${forrest.build.dir}/svn-plugins-deploy"/>
+  <property name="deploy.svn.svn-filestoadd"  location="build/svn-deploy.toadd"/>
   
   
   <taskdef resource="net/sf/antcontrib/antcontrib.properties">
@@ -52,28 +55,39 @@
   <target name="init">
     <input message="Which plugin you which to operate on?"
            addproperty="plugin-name"/>
-    
-    <!-- if the plugin.dir is not yet set we must be running interactively, so the plugin.dir
is the same as the plugin-name -->
-    <property name="plugin.dir" value="${plugin-name}"/>
+    <echo>Forrest root is ${forrest.root-dir}, home is ${forrest.home}</echo>
     
     <mkdir dir="${plugins.dist-dir}"/>  
   </target>
   
+  <target name="clean" depends="init">
+    <delete dir="${plugins.localDeploy-dir}/${plugin-name}"/>
+    <delete dir="${plugins.dist-dir}"/>
+  </target>
+  
   <!-- FIXME: Forrest should really use the plugins in-place if they are available as
source -->
   <target name="local-deploy"
           description="Deploy a plugin locally"
           depends="init">
+          
+    <echo>Locally deploying ${plugin-name}</echo>
     
     <copy toDir="${plugins.localDeploy-dir}/${plugin-name}">
-      <fileset dir="${plugin.dir}">
+      <fileset dir="${plugins.dir}/${plugin-name}">
        <exclude name="**/build/**"/>
       </fileset>
     </copy>
+    <!-- FIXME: execute local build file -->
+    <antcall target="build"/>
   </target>
   
+  <target name="build"
+          description="Any local actions that need to be carried out by the plugin are done
here"/>
+  
   <target name="deploy"
           description="Deploy the plugin to SVN"
           depends="dist">
+    <echo>Deploying ${plugin-name} to the web server</echo>
     <!-- get current plugins directory from SVN -->
     <svncheckout
         repositoryurl="${deploy.svn.url}"
@@ -114,13 +128,21 @@
         commitmessage="Deployment of ${plugin-name} plugin (deployed by 'deploy' target of
plugin build script)"
     />
   </target>
+   
+  <target name="docs" depends="local-deploy">
+    <echo>Building Docs for ${plugin-name}</echo>
+    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
+      <property name="forrest.home" value="${forrest.home}"/>  
+      <property name="project.home" value="${basedir}"/>
+    </ant>    
+  </target>
   
   <!-- FIXME: needs to append FOrrest version number to filename -->
   <target name="dist"
           description="Build the distribution archive for all the plugins"
-          depends="init">
+          depends="init, test">
     <zip destfile="${plugins.dist-dir}/${plugin-name}.zip"
-       basedir="${plugin.dir}"
+       basedir="${plugin-name}"
        includes="**"
        excludes="**/build/**"/>
   </target>
@@ -148,6 +170,8 @@
     <move file="${plugin-name}/sitemap.xmap"
           tofile="${plugin-name}/${plugin-type}.xmap"/>
   </target>
+  
+  <target name="test" depends="init, clean, docs"/>
 </project>
   
   

Modified: forrest/trunk/plugins/feeder/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/feeder/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/feeder/build.xml&r1=106463&p2=forrest/trunk/plugins/feeder/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/feeder/build.xml	(original)
+++ forrest/trunk/plugins/feeder/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,36 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
-  <property name="build.dir" location="build"/>
   <property name="plugin-name" value="feeder"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbits/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/build.xml&r1=106463&p2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/build.xml	(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,36 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
-  <property name="build.dir" location="build"/>
   <property name="plugin-name" value="org.apache.forrest.plugin.fbits"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.logs/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.logs/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/org.apache.forrest.plugin.logs/build.xml&r1=106463&p2=forrest/trunk/plugins/org.apache.forrest.plugin.logs/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.logs/build.xml	(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.logs/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,35 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
   <property name="plugin-name" value="org.apache.forrest.plugin.logs"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml&r1=106463&p2=forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml	(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml	Wed Nov 24 13:03:52
2004
@@ -16,36 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
-  <property name="build.dir" location="build"/>
   <property name="plugin-name" value="org.apache.forrest.plugin.pdf-output"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/pluginTemplate/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/pluginTemplate/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/pluginTemplate/build.xml&r1=106463&p2=forrest/trunk/plugins/pluginTemplate/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/pluginTemplate/build.xml	(original)
+++ forrest/trunk/plugins/pluginTemplate/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,35 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
   <property name="plugin-name" value="@plugin-name@"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/simplified-docbook/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/simplified-docbook/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/simplified-docbook/build.xml&r1=106463&p2=forrest/trunk/plugins/simplified-docbook/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/simplified-docbook/build.xml	(original)
+++ forrest/trunk/plugins/simplified-docbook/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,36 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
-  <property name="build.dir" location="build"/>
   <property name="plugin-name" value="simplified-docbook"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/text-output/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/text-output/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/text-output/build.xml&r1=106463&p2=forrest/trunk/plugins/text-output/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/text-output/build.xml	(original)
+++ forrest/trunk/plugins/text-output/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,35 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
   <property name="plugin-name" value="text-output"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Modified: forrest/trunk/plugins/wiki/build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/wiki/build.xml?view=diff&rev=106464&p1=forrest/trunk/plugins/wiki/build.xml&r1=106463&p2=forrest/trunk/plugins/wiki/build.xml&r2=106464
==============================================================================
--- forrest/trunk/plugins/wiki/build.xml	(original)
+++ forrest/trunk/plugins/wiki/build.xml	Wed Nov 24 13:03:52 2004
@@ -16,36 +16,20 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="forrest.root-dir" location="../.."/>   
-  <property name="forrest.home" location="../../main" />  
-  <property name="build.dir" location="build"/>
   <property name="plugin-name" value="wiki"/>
 
-  <target name="local-deploy">
-    <echo>Locally deploying ${plugin-name}</echo>
-    <ant antfile="../build.xml" target="local-deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
+  <import file="../build.xml"/>
   
-  <target name="deploy"
-    description="Deploy the plugin (by default this deploys to Apache Forrest web servers)">
-    <echo>Deploying ${plugin-name} to the web server</echo>
-    <ant antfile="../build.xml" target="deploy">  
-      <property name="plugin.dir" value="../${plugin-name}"/>
-    </ant>
-  </target>
-   
-  <target name="docs" depends="local-deploy">
-    <echo>Building Docs for ${plugin-name}</echo>
-    <ant antfile="${forrest.home}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
-      <property name="project.home" value="${basedir}"/>
-    </ant>
-    
+  <!-- Add any additional installation work here in the build target, for example:
+  <target name="build"
+          description="Extract the tools">
+     <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
   </target>
-  
-  <target name="test" depends="docs"/>
+  -->
 </project>
   
   

Mime
View raw message