ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r787676 - in /ant/ivy/ivyde/trunk: build.xml doc/dev/release.html doc/template-eclipse.html template-doc.html template-eclipse-doc.html
Date Tue, 23 Jun 2009 14:01:02 GMT
Author: hibou
Date: Tue Jun 23 14:01:01 2009
New Revision: 787676

URL: http://svn.apache.org/viewvc?rev=787676&view=rev
Log:
- avoid duplicate template files
- document how to package the sources

Added:
    ant/ivy/ivyde/trunk/doc/template-eclipse.html   (props changed)
      - copied unchanged from r787240, ant/ivy/ivyde/trunk/template-eclipse-doc.html
Removed:
    ant/ivy/ivyde/trunk/template-doc.html
    ant/ivy/ivyde/trunk/template-eclipse-doc.html
Modified:
    ant/ivy/ivyde/trunk/build.xml
    ant/ivy/ivyde/trunk/doc/dev/release.html

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=787676&r1=787675&r2=787676&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Tue Jun 23 14:01:01 2009
@@ -40,7 +40,7 @@
     <property name="dist.dir" value="${basedir}/dist" />
     <property name="dist.work.dir" value="${work.dir}/dist" />
     <property name="dist.work.doc.dir" value="${dist.work.dir}/doc" />
-    <property name="doc-dist.work.dir" value="${work.dir}/doc-dist" />
+    <property name="dist.work.src.dir" value="${dist.work.dir}/doc" />
     <property name="doc-eclipse.work.dir" value="${work.dir}/doc-eclipse" />
     <property name="eclipse.work.dir" value="${work.dir}/eclipse" />
     <property name="eclipse-doc.dir" value="${basedir}/org.apache.ivyde.eclipse/doc" />
@@ -53,7 +53,7 @@
         <property name="forceContextQualifier" value="${version.qualifier}-${DSTAMP}${TSTAMP}-RELEASE"
/>
     </target>
 
-    <target name="dist" depends="generate-eclipse-doc,build,package-binaries,checksum"
description="Build every artifacts for distribution" />
+    <target name="dist" depends="generate-eclipse-doc,build,package-binaries" description="Build
every artifacts for distribution" />
 
     <target name="clean" description="Remove every build artifacts">
         <delete dir="${work.dir}" />
@@ -156,17 +156,12 @@
 
     <target name="generate-dist-doc-html">
         <taskdef uri="antlib:xooki" file="${basedir}/doc/xooki/antlib.xml" />
-        <mkdir dir="${doc-dist.work.dir}" />
-        <copy todir="${doc-dist.work.dir}">
-            <fileset dir="${src.doc.dir}" />
-        </copy>
-        <copy file="${basedir}/template-doc.html" tofile="${doc-dist.work.dir}/template.html"
overwrite="true" />
         <property name="checkUpToDate" value="true" />
         <mkdir dir="${dist.work.doc.dir}" />
         <xooki:generate destDir="${dist.work.doc.dir}" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${doc-dist.work.dir}">
+            <fileset dir="${src.doc.dir}">
                 <include name="**/*.html" />
-                <exclude name="template.html" />
+                <exclude name="template*.html" />
                 <exclude name="**/xooki/**" />
             </fileset>
         </xooki:generate>
@@ -438,12 +433,12 @@
         <copy todir="${doc-eclipse.work.dir}">
             <fileset dir="${src.doc.dir}" />
         </copy>
-        <copy file="${basedir}/template-eclipse-doc.html" tofile="${doc-eclipse.work.dir}/template.html"
overwrite="true" />
+        <copy file="${src.doc.dir}/template-eclipse.html" tofile="${doc-eclipse.work.dir}/template.html"
overwrite="true" />
         <property name="checkUpToDate" value="true" />
         <xooki:generate destDir="${eclipse-doc.dir}" checkUpToDate="${checkUpToDate}">
             <fileset dir="${doc-eclipse.work.dir}">
                 <include name="**/*.html" />
-                <exclude name="template.html" />
+                <exclude name="template*.html" />
                 <exclude name="**/xooki/**" />
             </fileset>
         </xooki:generate>
@@ -499,7 +494,7 @@
                 out.close();
             ]]>
         </scriptdef>
-    <generate-eclipse-toc jsontocfile="${src.doc.dir}/toc.json" destFile="${eclipse-doc.dir}/toc.xml"
/>
-</target>
+        <generate-eclipse-toc jsontocfile="${src.doc.dir}/toc.json" destFile="${eclipse-doc.dir}/toc.xml"
/>
+    </target>
 
 </project>

Modified: ant/ivy/ivyde/trunk/doc/dev/release.html
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/doc/dev/release.html?rev=787676&r1=787675&r2=787676&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/doc/dev/release.html (original)
+++ ant/ivy/ivyde/trunk/doc/dev/release.html Tue Jun 23 14:01:01 2009
@@ -87,6 +87,21 @@
 
 Then launch the build:
 <pre>ant /release clean dist -DbaseLocation=/home/me/...../eclipse/</pre>
+
+Package the sources:
+<pre>
+cd work
+mkdir sources
+cd sources
+svn export https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION
+cd $VERSION
+zip -r ../../../dist/apache-ivyde-sources-$VERSION.zip *
+tar cvzf ../../../dist/apache-ivyde-sources-$VERSION.tgz *
+</pre>
+
+Generate the checksums:
+<pre>ant checksum</pre>
+
 And sign the artifacts:
 <pre>./signArtifacts.sh</pre>
 

Propchange: ant/ivy/ivyde/trunk/doc/template-eclipse.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/doc/template-eclipse.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/doc/template-eclipse.html
------------------------------------------------------------------------------
    svn:mime-type = text/html



Mime
View raw message