forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r189638 - in /forrest/trunk/plugins: build.xml org.apache.forrest.plugin.input.simplified-docbook/build.xml pluginTemplate/build.xml
Date Wed, 08 Jun 2005 21:05:41 GMT
Author: rgardler
Date: Wed Jun  8 14:05:40 2005
New Revision: 189638

URL: http://svn.apache.org/viewcvs?rev=189638&view=rev
Log:
deploy versioned plugins (partial solution for FOR-528), also took the opportunity to add
some properties to the plugin build file that will be needed for (FOR-533)

Modified:
    forrest/trunk/plugins/build.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.simplified-docbook/build.xml
    forrest/trunk/plugins/pluginTemplate/build.xml

Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?rev=189638&r1=189637&r2=189638&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Wed Jun  8 14:05:40 2005
@@ -183,13 +183,17 @@
     <copy todir="${deploy.plugins.svn-dir}" 
           overwrite="true"
           file="${forrest.plugins.descriptor.file}"/>
-  	
+  	<!-- ================================================ -->
+    <!-- FIXME: RE-ENABLE CHECKING                        -->
+    <!-- ================================================ -->
     <!-- check in to SVN -->
+    <!--
     <svncommit
         target="${deploy.plugins.svn-dir}"
         repositoryurl="${deploy.plugins.svn.url}"
         commitmessage="Deployment plugins descriptor file plugins.xml (deployed by 'deploy-plugins.xml'
target of plugin build script)"
     />
+    -->
   </target>
 	
   <target name="deploy-docs"
@@ -229,23 +233,28 @@
       <arg value="--targets"/>
       <arg value="${deploy.docs.svn-filestoadd}"/>
     </exec>
+    <!-- ================================================ -->
+    <!-- FIXME: RE-ENABLE CHECKING                        -->
+    <!-- ================================================ -->
     <!-- check in to SVN -->
+    <!--
   	<svncommit
         target="${deploy.docs.svn-dir}"
         repositoryurl="${deploy.plugins.svn.url}"
         commitmessage="Deployment of docs for ${plugin-name} plugin (deployed by 'deploy-docs'
target of plugin build script)"
     />
+    -->
   </target>
           
   <target name="deploy"
-          description="Deploy the plugin to the website SVN"
+          description="Deploy the plugin to the website SVN to make it available for download"
           depends="clean, deploy-plugins.xml, deploy-docs, dist, checkout-deployed-plugins">
     <echo>Deploying ${plugin-name} to the web server</echo>
 	
     <!-- copy new plugin files into sandbox -->
-    <copy todir="${deploy.plugins.svn-dir}" 
+    <copy todir="${deploy.plugins.svn-dir}/${forrest.version}" 
           overwrite="true" 
-          file="${forrest.plugins.dist.dir}/${plugin-name}.zip"/>
+          file="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"/>
      
     <!-- add new files to SVN -->
     <!-- svnadd doesn't work (it doesn't change the working directory properly) -->
@@ -306,12 +315,11 @@
     </ant>    
   </target>
   
-  <!-- FIXME: needs to append plugin version number to filename -->
   <target name="dist"
           description="Build the distribution archive for all the plugins"
           depends="init">
-    <mkdir dir="${forrest.plugins.dist.dir}"/>  
-    <zip destfile="${forrest.plugins.dist.dir}/${plugin-name}.zip"
+    <mkdir dir="${forrest.plugins.dist.dir}/${forrest.version}"/>  
+    <zip destfile="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"
        basedir="${forrest.plugins.dir}/${plugin-name}"
        includes="**"
        excludes="**/build/**"/>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.simplified-docbook/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.simplified-docbook/build.xml?rev=189638&r1=189637&r2=189638&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.simplified-docbook/build.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.simplified-docbook/build.xml Wed
Jun  8 14:05:40 2005
@@ -18,6 +18,13 @@
 <project default="docs" basedir="." name="Forrest plugin build file">
 
   <property name="plugin-name" value="org.apache.forrest.plugin.input.simplified-docbook"/>
+  <property name="forrest.version" value="0.7"/>
+  <property name="type" value="input"/>
+  <property name="plugin-version" value="0.1"/>
+  <property name="description" value="Enable Simplified Docbook to be used as input."/>
+  <property name="author" value="Apache Forrest Project"/>
+  <property name="websiteURL" value="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.simplified-docbook"/>
+  <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
 
   <import file="../build.xml"/>
   

Modified: forrest/trunk/plugins/pluginTemplate/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/pluginTemplate/build.xml?rev=189638&r1=189637&r2=189638&view=diff
==============================================================================
--- forrest/trunk/plugins/pluginTemplate/build.xml (original)
+++ forrest/trunk/plugins/pluginTemplate/build.xml Wed Jun  8 14:05:40 2005
@@ -15,15 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="docs" basedir="." name="Forrest plugin build file">
+<project default="docs" basedir="." name="Forrest @plugin-name@ build file">
+  <property name="plugin-name" value="@plugin-name@"/>
   <property name="forrest.version" value="@forrest-version@"/>
   <property name="type" value="@plugin-type@"/>
-  <property name="plugin-name" value="@plugin-name@"/>
-  <property name="descritpion" value="@plugin-desc@"/>
+  <property name="plugin-version" value="0.1-dev"/>
+  <property name="description" value="@plugin-desc@"/>
   <property name="author" value="Apache Forrest Project"/>
   <property name="websiteURL" value="http://forrest.apache.org/docs/plugins/@plugin-name@"/>
   <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
-  <property name="version" value="0.1-dev"/>
   
   <import file="../build.xml"/>
 



Mime
View raw message