ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1078014 - in /ant/site: common-xooki-build.xml ivy/build.xml ivy/sources/build.xml ivyde/build.xml
Date Fri, 04 Mar 2011 15:42:10 GMT
Author: hibou
Date: Fri Mar  4 15:42:09 2011
New Revision: 1078014

URL: http://svn.apache.org/viewvc?rev=1078014&view=rev
Log:
Here the new build for both Ivy and IvyDE websites

Added:
    ant/site/common-xooki-build.xml
      - copied, changed from r1077973, ant/site/ivy/sources/build.xml
    ant/site/ivy/build.xml
      - copied, changed from r1077973, ant/site/ivy/sources/build.xml
    ant/site/ivyde/build.xml
      - copied, changed from r1077973, ant/site/ivy/sources/build.xml
Removed:
    ant/site/ivy/sources/build.xml

Copied: ant/site/common-xooki-build.xml (from r1077973, ant/site/ivy/sources/build.xml)
URL: http://svn.apache.org/viewvc/ant/site/common-xooki-build.xml?p2=ant/site/common-xooki-build.xml&p1=ant/site/ivy/sources/build.xml&r1=1077973&r2=1078014&rev=1078014&view=diff
==============================================================================
--- ant/site/ivy/sources/build.xml (original)
+++ ant/site/common-xooki-build.xml Fri Mar  4 15:42:09 2011
@@ -16,10 +16,10 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<project name="ivy-ivyde-site" xmlns:xooki="antlib:xooki">
+<project name="common-xooki-build" xmlns:xooki="antlib:xooki">
 
-    <taskdef uri="antlib:xooki" file="${basedir}/xooki/antlib.xml" />
-    <property name="target.dir" value="${basedir}/target" />
+    <dirname property="site.root.dir" file="${ant.file.common-xooki-build}" />
+    <taskdef uri="antlib:xooki" file="${site.root.dir}/xooki/antlib.xml" />
 
     <target name="/all" description="force whole site generation, disabling incremental
mode">
         <property name="checkUpToDate" value="false" />
@@ -27,151 +27,6 @@
 
     <!--
         ======================================================================================
-        Targets related to the Ivy web site
-        ======================================================================================
-    -->
-
-    <target name="generate-site-ivy" description="Generates site of Ivy for publication">
-        <!-- by default we use incremental mode, which checks if files require generation
-->
-        <property name="checkUpToDate" value="true" />
-        <condition property="overwrite">
-             <isfalse value="${checkUpToDate}"/>
-        </condition>
-        <copy todir="${target.dir}" overwrite="${overwrite}" >
-            <fileset dir="${basedir}">
-                <include name="*.cgi" />
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-                <include name="samples/**" />
-                <include name="schemas/**" />
-                <include name="presentations/**" />
-                <include name="test/**" />
-                <include name="history/latest-milestone/images/**" />
-                <include name="history/latest-milestone/samples/**" />
-            </fileset>
-        </copy>
-        <init-imported-history version="latest-milestone" />
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}">
-                <include name="history/latest-milestone/**/*.html"/>
-                <exclude name="history/latest-milestone/**/template.html"/>
-                <exclude name="history/latest-milestone/**/*Template.html"/>
-                <exclude name="history/latest-milestone/presentations/**"/>
-                <exclude name="history/latest-milestone/samples/**"/>
-                <exclude name="history/latest-milestone/**/xooki/**"/>
-                <!-- Some old version contains only one html page, and there are also
the 2.x and 2.1.x pages there -->
-                <include name="history/*.html"/>
-            </fileset>
-            <fileset dir="${basedir}">
-                <include name="**/*.html"/>
-                <exclude name="history/**"/>
-                <exclude name="**/template.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="presentations/**"/>
-                <exclude name="samples/**"/>
-                <exclude name="**/xooki/**"/>
-                <exclude name="target/**"/>
-                <exclude name="ivyde/**"/>
-            </fileset>
-        </xooki:generate>
-    	<generate-printdoc version="latest-milestone" />
-    </target>
-
-    <target name="generate-history-ivy" description="Generate the part of the Ivy website
of a specific history version">
-        <init-external-history version="${history.version}" />
-        <fail unless="history.version" message="Set the history.version property to specified
which history version you want to update" />
-        <copy todir="${target.dir}/history/${history.version}" overwrite="true" >
-            <fileset dir="${basedir}/history/${history.version}">
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-                <include name="samples/**" />
-                <include name="schemas/**" />
-                <include name="presentations/**" />
-                <include name="test/**" />
-            </fileset>
-        </copy>
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/history/${history.version}" checkUpToDate="false">
-            <fileset dir="${basedir}/history/${history.version}">
-                <include name="**/*.html"/>
-                <exclude name="**/template.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="presentations/**"/>
-                <exclude name="samples/**"/>
-                <exclude name="**/xooki/**"/>
-            </fileset>
-        </xooki:generate>
-        <generate-printdoc version="${history.version}" />
-    </target>
-
-    <!--
-        ======================================================================================
-        Targets related to the IvyDE web site
-        ======================================================================================
-    -->
-
-    <target name="generate-site-ivyde" description="Generates site of IvyDE for publication">
-        <!-- by default we use incremental mode, which checks if files require generation
-->
-        <property name="checkUpToDate" value="true" />
-        <condition property="overwrite">
-             <isfalse value="${checkUpToDate}"/>
-        </condition>
-        <copy todir="${target.dir}/ivyde" overwrite="${overwrite}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="*.cgi" />
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-                <include name="updatesite/**" />
-                <include name="history/latest-milestone/images/**" />
-            </fileset>
-        </copy>
-        <init-imported-history basepath="ivyde" version="latest-milestone" />
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/ivyde" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="history/latest-milestone/**/*.html"/>
-                <exclude name="history/latest-milestone/**/template.html"/>
-                <exclude name="history/latest-milestone/**/*Template.html"/>
-                <exclude name="history/latest-milestone/**/xooki/**"/>
-            </fileset>
-            <fileset dir="${basedir}/ivyde">
-                <include name="**/*.html"/>
-                <exclude name="history/**"/>
-                <exclude name="**/template*.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="**/xooki/**"/>
-            </fileset>
-        </xooki:generate>
-    </target>
-
-    <target name="generate-history-ivyde" description="Generate the part of the IvyDE
website of a specific history version">
-        <fail unless="history.version" message="Set the history.version property to specified
which history version you want to update" />
-        <init-external-history basepath="ivyde" version="${history.version}" />
-        <copy todir="${target.dir}/ivyde/history/${history.version}" overwrite="true"
>
-            <fileset dir="${basedir}/ivyde/history/${history.version}">
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-            </fileset>
-        </copy>
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/ivyde/history/${history.version}" checkUpToDate="false">
-            <fileset dir="${basedir}/ivyde/history/${history.version}">
-                <include name="**/*.html"/>
-                <exclude name="**/template*.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="**/xooki/**"/>
-            </fileset>
-        </xooki:generate>
-        <generate-printdoc basepath="${basedir}/ivyde" destpath="${target.dir}/ivyde"
version="${history.version}" />
-    </target>
-
-    <!--
-        ======================================================================================
         Generic targets and macros
         ======================================================================================
     -->
@@ -187,7 +42,7 @@
     -->
     <macrodef name="init-imported-history">
         <attribute name="version" />
-        <attribute name="basepath" default="." />
+        <attribute name="basepath" default="${sources.dir}" />
         <sequential>
             <echo file="@{basepath}/history/@{version}/config.extra.js"> 
 xooki.c.setImportLevel(2);
@@ -197,7 +52,7 @@ xooki.c.setImportLevel(2);
 
     <macrodef name="init-external-history">
         <attribute name="version" />
-        <attribute name="basepath" default="." />
+        <attribute name="basepath" default="${sources.dir}" />
         <sequential>
             <echo file="@{basepath}/history/@{version}/config.extra.js">
 xooki.c.path = { template : "../../historyTemplate.html" };
@@ -209,81 +64,13 @@ xooki.c.path = { template : "../../histo
 
     <macrodef name="generate-printdoc">
         <attribute name="version" />
-        <attribute name="basepath" default="${basedir}" />
+        <attribute name="basepath" default="${sources.dir}" />
         <attribute name="destpath" default="${target.dir}" />
         <sequential>
-            <xooki:print 
+            <xooki:print xookidir="${site.root.dir}/xooki"
                 src="@{basepath}/history/@{version}/index.html" 
                 dest="@{destpath}/history/@{version}/book.html" />
         </sequential>
     </macrodef>
 
-    <target name="tagsdoc" 
-            description="--> Generates tagsdoc.properties file which can be used in IvyDE
for code completion documentation">
-        <scriptdef name="generate-tagsdoc" language="javascript">
-            <element name="fileset" type="fileset"/>
-            <attribute name="destFile"/>
-            <![CDATA[
-                importPackage(java.io);
-                importPackage(javax.xml.xpath);
-                importPackage(org.xml.sax);
-                importPackage(javax.xml.parsers);
-
-                fs = elements.get("fileset").get(0);
-                srcDir = elements.get("fileset").get(0).getDir(project);
-
-                // Get the files (array) of that fileset
-                ds = fs.getDirectoryScanner(project);
-                srcFiles = ds.getIncludedFiles();
-
-
-                // iterate over that array
-                print('processing '+srcFiles.length+' source files...');
-                var xpath = XPathFactory.newInstance().newXPath();
-
-                out = new FileWriter(self.getProject().resolveFile(attributes.get("destfile")));
-                for (i=0; i<srcFiles.length; i++) {
-                    try {
-                        // get the values via Java API
-                        var file = new File(fs.getDir(project), srcFiles[i]);
-                        print('processing '+ file + '...');
-                    
-                        // skip DOCTYPE in source
-                        r = new BufferedReader(new FileReader(file));
-                        r.readLine();
-                        inputSource = new InputSource(r);
-
-                        builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-                        document = builder.parse(inputSource);
-
-                        var expression = "//span[@class='tagdoc']";
-                        var t = xpath.evaluate(expression, document, XPathConstants.NODE);
-                        if (t == null) {
-                            print('\tno tagdoc span found: ignored');
-                            continue;
-                        }
-                        var id = t.getAttributes().getNamedItem("id").getTextContent();
-
-                        out.write('##### ' + id + '\n');
-                        out.write(id + ' = ' + t.getTextContent() + '\n');
-
-                        expression = "//table[@class='ivy-attributes'][1]/tbody/tr/td[1]";
-                        var atts = xpath.evaluate(expression, document, XPathConstants.NODESET);
-                        for (j=0; j<atts.getLength(); j++) {
-                            out.write(id + '.@' + atts.item(j).getTextContent() + ' = ' 
-                                + xpath.evaluate("../td[2]", atts.item(j), XPathConstants.NODE).getTextContent()
+ '\n');
-                        }
-                    } catch (e) {
-                        print('\terror: ' + e);
-                    }
-                }
-                out.close();
-            ]]>
-        </scriptdef>
-        <property name="ivydoc" value="${basedir}/target/history/trunk/" />
-        <generate-tagsdoc destFile="tagsdoc.properties">
-            <fileset dir="${ivydoc}" includes="settings/**/*.html,resolver/**/*.html"
/>
-        </generate-tagsdoc>
-    </target>
-
 </project>

Copied: ant/site/ivy/build.xml (from r1077973, ant/site/ivy/sources/build.xml)
URL: http://svn.apache.org/viewvc/ant/site/ivy/build.xml?p2=ant/site/ivy/build.xml&p1=ant/site/ivy/sources/build.xml&r1=1077973&r2=1078014&rev=1078014&view=diff
==============================================================================
--- ant/site/ivy/sources/build.xml (original)
+++ ant/site/ivy/build.xml Fri Mar  4 15:42:09 2011
@@ -16,14 +16,12 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<project name="ivy-ivyde-site" xmlns:xooki="antlib:xooki">
+<project name="ivy-site" xmlns:xooki="antlib:xooki">
 
-    <taskdef uri="antlib:xooki" file="${basedir}/xooki/antlib.xml" />
-    <property name="target.dir" value="${basedir}/target" />
+    <property name="sources.dir" value="${basedir}/sources" />
+    <property name="target.dir" value="${basedir}/staging" />
 
-    <target name="/all" description="force whole site generation, disabling incremental
mode">
-        <property name="checkUpToDate" value="false" />
-    </target>
+    <import file="../common-xooki-build.xml" />
 
     <!--
         ======================================================================================
@@ -31,14 +29,14 @@
         ======================================================================================
     -->
 
-    <target name="generate-site-ivy" description="Generates site of Ivy for publication">
+    <target name="generate-site" description="Generates site for publication in the staging
area">
         <!-- by default we use incremental mode, which checks if files require generation
-->
         <property name="checkUpToDate" value="true" />
         <condition property="overwrite">
              <isfalse value="${checkUpToDate}"/>
         </condition>
         <copy todir="${target.dir}" overwrite="${overwrite}" >
-            <fileset dir="${basedir}">
+            <fileset dir="${sources.dir}">
                 <include name="*.cgi" />
                 <include name="images/**" />
                 <include name="style/**" />
@@ -54,7 +52,7 @@
         <init-imported-history version="latest-milestone" />
         <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
         <xooki:generate destDir="${target.dir}" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}">
+            <fileset dir="${sources.dir}">
                 <include name="history/latest-milestone/**/*.html"/>
                 <exclude name="history/latest-milestone/**/template.html"/>
                 <exclude name="history/latest-milestone/**/*Template.html"/>
@@ -64,7 +62,7 @@
                 <!-- Some old version contains only one html page, and there are also
the 2.x and 2.1.x pages there -->
                 <include name="history/*.html"/>
             </fileset>
-            <fileset dir="${basedir}">
+            <fileset dir="${sources.dir}">
                 <include name="**/*.html"/>
                 <exclude name="history/**"/>
                 <exclude name="**/template.html"/>
@@ -79,11 +77,11 @@
     	<generate-printdoc version="latest-milestone" />
     </target>
 
-    <target name="generate-history-ivy" description="Generate the part of the Ivy website
of a specific history version">
+    <target name="generate-history" description="Generate the part of the website of a
specific history version">
         <init-external-history version="${history.version}" />
         <fail unless="history.version" message="Set the history.version property to specified
which history version you want to update" />
         <copy todir="${target.dir}/history/${history.version}" overwrite="true" >
-            <fileset dir="${basedir}/history/${history.version}">
+            <fileset dir="${sources.dir}/history/${history.version}">
                 <include name="images/**" />
                 <include name="style/**" />
                 <include name="js/**" />
@@ -95,7 +93,7 @@
         </copy>
         <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
         <xooki:generate destDir="${target.dir}/history/${history.version}" checkUpToDate="false">
-            <fileset dir="${basedir}/history/${history.version}">
+            <fileset dir="${sources.dir}/history/${history.version}">
                 <include name="**/*.html"/>
                 <exclude name="**/template.html"/>
                 <exclude name="**/*Template.html"/>
@@ -107,117 +105,6 @@
         <generate-printdoc version="${history.version}" />
     </target>
 
-    <!--
-        ======================================================================================
-        Targets related to the IvyDE web site
-        ======================================================================================
-    -->
-
-    <target name="generate-site-ivyde" description="Generates site of IvyDE for publication">
-        <!-- by default we use incremental mode, which checks if files require generation
-->
-        <property name="checkUpToDate" value="true" />
-        <condition property="overwrite">
-             <isfalse value="${checkUpToDate}"/>
-        </condition>
-        <copy todir="${target.dir}/ivyde" overwrite="${overwrite}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="*.cgi" />
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-                <include name="updatesite/**" />
-                <include name="history/latest-milestone/images/**" />
-            </fileset>
-        </copy>
-        <init-imported-history basepath="ivyde" version="latest-milestone" />
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/ivyde" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="history/latest-milestone/**/*.html"/>
-                <exclude name="history/latest-milestone/**/template.html"/>
-                <exclude name="history/latest-milestone/**/*Template.html"/>
-                <exclude name="history/latest-milestone/**/xooki/**"/>
-            </fileset>
-            <fileset dir="${basedir}/ivyde">
-                <include name="**/*.html"/>
-                <exclude name="history/**"/>
-                <exclude name="**/template*.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="**/xooki/**"/>
-            </fileset>
-        </xooki:generate>
-    </target>
-
-    <target name="generate-history-ivyde" description="Generate the part of the IvyDE
website of a specific history version">
-        <fail unless="history.version" message="Set the history.version property to specified
which history version you want to update" />
-        <init-external-history basepath="ivyde" version="${history.version}" />
-        <copy todir="${target.dir}/ivyde/history/${history.version}" overwrite="true"
>
-            <fileset dir="${basedir}/ivyde/history/${history.version}">
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-            </fileset>
-        </copy>
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/ivyde/history/${history.version}" checkUpToDate="false">
-            <fileset dir="${basedir}/ivyde/history/${history.version}">
-                <include name="**/*.html"/>
-                <exclude name="**/template*.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="**/xooki/**"/>
-            </fileset>
-        </xooki:generate>
-        <generate-printdoc basepath="${basedir}/ivyde" destpath="${target.dir}/ivyde"
version="${history.version}" />
-    </target>
-
-    <!--
-        ======================================================================================
-        Generic targets and macros
-        ======================================================================================
-    -->
-
-    <!-- 
-    INITIALIZE IMPORTED DOCUMENTATION OF HISTORY VERSIONS
-    Imported documentations need to have a special configuration javascript
-    in their home, so that they know they are imported and properly
-    display the whole TOC, and not only their own one.
-    The targets below are used to initialize those imported versions
-    with ad hoc configuration file. It should only be called once 
-    per imported documentation version.
-    -->
-    <macrodef name="init-imported-history">
-        <attribute name="version" />
-        <attribute name="basepath" default="." />
-        <sequential>
-            <echo file="@{basepath}/history/@{version}/config.extra.js"> 
-xooki.c.setImportLevel(2);
-            </echo>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="init-external-history">
-        <attribute name="version" />
-        <attribute name="basepath" default="." />
-        <sequential>
-            <echo file="@{basepath}/history/@{version}/config.extra.js">
-xooki.c.path = { template : "../../historyTemplate.html" };
-            </echo>
-            <replace file="@{basepath}/history/@{version}/toc.json" token="&quot;title&quot;:&quot;Documentation&quot;"
-                value="&quot;title&quot;:&quot;Documentation (@{version})&quot;"
/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="generate-printdoc">
-        <attribute name="version" />
-        <attribute name="basepath" default="${basedir}" />
-        <attribute name="destpath" default="${target.dir}" />
-        <sequential>
-            <xooki:print 
-                src="@{basepath}/history/@{version}/index.html" 
-                dest="@{destpath}/history/@{version}/book.html" />
-        </sequential>
-    </macrodef>
-
     <target name="tagsdoc" 
             description="--> Generates tagsdoc.properties file which can be used in IvyDE
for code completion documentation">
         <scriptdef name="generate-tagsdoc" language="javascript">
@@ -280,7 +167,7 @@ xooki.c.path = { template : "../../histo
                 out.close();
             ]]>
         </scriptdef>
-        <property name="ivydoc" value="${basedir}/target/history/trunk/" />
+        <property name="ivydoc" value="${target.dir}/history/trunk/" />
         <generate-tagsdoc destFile="tagsdoc.properties">
             <fileset dir="${ivydoc}" includes="settings/**/*.html,resolver/**/*.html"
/>
         </generate-tagsdoc>

Copied: ant/site/ivyde/build.xml (from r1077973, ant/site/ivy/sources/build.xml)
URL: http://svn.apache.org/viewvc/ant/site/ivyde/build.xml?p2=ant/site/ivyde/build.xml&p1=ant/site/ivy/sources/build.xml&r1=1077973&r2=1078014&rev=1078014&view=diff
==============================================================================
--- ant/site/ivy/sources/build.xml (original)
+++ ant/site/ivyde/build.xml Fri Mar  4 15:42:09 2011
@@ -16,274 +16,74 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<project name="ivy-ivyde-site" xmlns:xooki="antlib:xooki">
+<project name="ivyde-site" xmlns:xooki="antlib:xooki">
 
-    <taskdef uri="antlib:xooki" file="${basedir}/xooki/antlib.xml" />
-    <property name="target.dir" value="${basedir}/target" />
+    <property name="sources.dir" value="${basedir}/sources" />
+    <property name="target.dir" value="${basedir}/staging" />
 
-    <target name="/all" description="force whole site generation, disabling incremental
mode">
-        <property name="checkUpToDate" value="false" />
-    </target>
+    <import file="../common-xooki-build.xml" />
 
     <!--
         ======================================================================================
-        Targets related to the Ivy web site
+        Targets related to the IvyDE web site
         ======================================================================================
     -->
 
-    <target name="generate-site-ivy" description="Generates site of Ivy for publication">
+    <target name="generate-site" description="Generates site for publication in the staging
area">
         <!-- by default we use incremental mode, which checks if files require generation
-->
         <property name="checkUpToDate" value="true" />
         <condition property="overwrite">
              <isfalse value="${checkUpToDate}"/>
         </condition>
-        <copy todir="${target.dir}" overwrite="${overwrite}" >
-            <fileset dir="${basedir}">
+        <copy todir="${target.dir}" overwrite="${overwrite}">
+            <fileset dir="${sources.dir}">
                 <include name="*.cgi" />
                 <include name="images/**" />
                 <include name="style/**" />
                 <include name="js/**" />
-                <include name="samples/**" />
-                <include name="schemas/**" />
-                <include name="presentations/**" />
-                <include name="test/**" />
+                <include name="updatesite/**" />
                 <include name="history/latest-milestone/images/**" />
-                <include name="history/latest-milestone/samples/**" />
             </fileset>
         </copy>
         <init-imported-history version="latest-milestone" />
         <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
         <xooki:generate destDir="${target.dir}" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}">
+            <fileset dir="${sources.dir}">
                 <include name="history/latest-milestone/**/*.html"/>
                 <exclude name="history/latest-milestone/**/template.html"/>
                 <exclude name="history/latest-milestone/**/*Template.html"/>
-                <exclude name="history/latest-milestone/presentations/**"/>
-                <exclude name="history/latest-milestone/samples/**"/>
                 <exclude name="history/latest-milestone/**/xooki/**"/>
-                <!-- Some old version contains only one html page, and there are also
the 2.x and 2.1.x pages there -->
-                <include name="history/*.html"/>
             </fileset>
-            <fileset dir="${basedir}">
+            <fileset dir="${sources.dir}">
                 <include name="**/*.html"/>
                 <exclude name="history/**"/>
-                <exclude name="**/template.html"/>
+                <exclude name="**/template*.html"/>
                 <exclude name="**/*Template.html"/>
-                <exclude name="presentations/**"/>
-                <exclude name="samples/**"/>
                 <exclude name="**/xooki/**"/>
-                <exclude name="target/**"/>
-                <exclude name="ivyde/**"/>
             </fileset>
         </xooki:generate>
-    	<generate-printdoc version="latest-milestone" />
     </target>
 
-    <target name="generate-history-ivy" description="Generate the part of the Ivy website
of a specific history version">
-        <init-external-history version="${history.version}" />
+    <target name="generate-history" description="Generate the part of the website of a
specific history version">
         <fail unless="history.version" message="Set the history.version property to specified
which history version you want to update" />
+        <init-external-history version="${history.version}" />
         <copy todir="${target.dir}/history/${history.version}" overwrite="true" >
-            <fileset dir="${basedir}/history/${history.version}">
+            <fileset dir="${sources.dir}/history/${history.version}">
                 <include name="images/**" />
                 <include name="style/**" />
                 <include name="js/**" />
-                <include name="samples/**" />
-                <include name="schemas/**" />
-                <include name="presentations/**" />
-                <include name="test/**" />
             </fileset>
         </copy>
         <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
         <xooki:generate destDir="${target.dir}/history/${history.version}" checkUpToDate="false">
-            <fileset dir="${basedir}/history/${history.version}">
-                <include name="**/*.html"/>
-                <exclude name="**/template.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="presentations/**"/>
-                <exclude name="samples/**"/>
-                <exclude name="**/xooki/**"/>
-            </fileset>
-        </xooki:generate>
-        <generate-printdoc version="${history.version}" />
-    </target>
-
-    <!--
-        ======================================================================================
-        Targets related to the IvyDE web site
-        ======================================================================================
-    -->
-
-    <target name="generate-site-ivyde" description="Generates site of IvyDE for publication">
-        <!-- by default we use incremental mode, which checks if files require generation
-->
-        <property name="checkUpToDate" value="true" />
-        <condition property="overwrite">
-             <isfalse value="${checkUpToDate}"/>
-        </condition>
-        <copy todir="${target.dir}/ivyde" overwrite="${overwrite}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="*.cgi" />
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-                <include name="updatesite/**" />
-                <include name="history/latest-milestone/images/**" />
-            </fileset>
-        </copy>
-        <init-imported-history basepath="ivyde" version="latest-milestone" />
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/ivyde" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="history/latest-milestone/**/*.html"/>
-                <exclude name="history/latest-milestone/**/template.html"/>
-                <exclude name="history/latest-milestone/**/*Template.html"/>
-                <exclude name="history/latest-milestone/**/xooki/**"/>
-            </fileset>
-            <fileset dir="${basedir}/ivyde">
+            <fileset dir="${sources.dir}/history/${history.version}">
                 <include name="**/*.html"/>
-                <exclude name="history/**"/>
                 <exclude name="**/template*.html"/>
                 <exclude name="**/*Template.html"/>
                 <exclude name="**/xooki/**"/>
             </fileset>
         </xooki:generate>
-    </target>
-
-    <target name="generate-history-ivyde" description="Generate the part of the IvyDE
website of a specific history version">
-        <fail unless="history.version" message="Set the history.version property to specified
which history version you want to update" />
-        <init-external-history basepath="ivyde" version="${history.version}" />
-        <copy todir="${target.dir}/ivyde/history/${history.version}" overwrite="true"
>
-            <fileset dir="${basedir}/ivyde/history/${history.version}">
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="js/**" />
-            </fileset>
-        </copy>
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache
Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/ivyde/history/${history.version}" checkUpToDate="false">
-            <fileset dir="${basedir}/ivyde/history/${history.version}">
-                <include name="**/*.html"/>
-                <exclude name="**/template*.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="**/xooki/**"/>
-            </fileset>
-        </xooki:generate>
-        <generate-printdoc basepath="${basedir}/ivyde" destpath="${target.dir}/ivyde"
version="${history.version}" />
-    </target>
-
-    <!--
-        ======================================================================================
-        Generic targets and macros
-        ======================================================================================
-    -->
-
-    <!-- 
-    INITIALIZE IMPORTED DOCUMENTATION OF HISTORY VERSIONS
-    Imported documentations need to have a special configuration javascript
-    in their home, so that they know they are imported and properly
-    display the whole TOC, and not only their own one.
-    The targets below are used to initialize those imported versions
-    with ad hoc configuration file. It should only be called once 
-    per imported documentation version.
-    -->
-    <macrodef name="init-imported-history">
-        <attribute name="version" />
-        <attribute name="basepath" default="." />
-        <sequential>
-            <echo file="@{basepath}/history/@{version}/config.extra.js"> 
-xooki.c.setImportLevel(2);
-            </echo>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="init-external-history">
-        <attribute name="version" />
-        <attribute name="basepath" default="." />
-        <sequential>
-            <echo file="@{basepath}/history/@{version}/config.extra.js">
-xooki.c.path = { template : "../../historyTemplate.html" };
-            </echo>
-            <replace file="@{basepath}/history/@{version}/toc.json" token="&quot;title&quot;:&quot;Documentation&quot;"
-                value="&quot;title&quot;:&quot;Documentation (@{version})&quot;"
/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="generate-printdoc">
-        <attribute name="version" />
-        <attribute name="basepath" default="${basedir}" />
-        <attribute name="destpath" default="${target.dir}" />
-        <sequential>
-            <xooki:print 
-                src="@{basepath}/history/@{version}/index.html" 
-                dest="@{destpath}/history/@{version}/book.html" />
-        </sequential>
-    </macrodef>
-
-    <target name="tagsdoc" 
-            description="--> Generates tagsdoc.properties file which can be used in IvyDE
for code completion documentation">
-        <scriptdef name="generate-tagsdoc" language="javascript">
-            <element name="fileset" type="fileset"/>
-            <attribute name="destFile"/>
-            <![CDATA[
-                importPackage(java.io);
-                importPackage(javax.xml.xpath);
-                importPackage(org.xml.sax);
-                importPackage(javax.xml.parsers);
-
-                fs = elements.get("fileset").get(0);
-                srcDir = elements.get("fileset").get(0).getDir(project);
-
-                // Get the files (array) of that fileset
-                ds = fs.getDirectoryScanner(project);
-                srcFiles = ds.getIncludedFiles();
-
-
-                // iterate over that array
-                print('processing '+srcFiles.length+' source files...');
-                var xpath = XPathFactory.newInstance().newXPath();
-
-                out = new FileWriter(self.getProject().resolveFile(attributes.get("destfile")));
-                for (i=0; i<srcFiles.length; i++) {
-                    try {
-                        // get the values via Java API
-                        var file = new File(fs.getDir(project), srcFiles[i]);
-                        print('processing '+ file + '...');
-                    
-                        // skip DOCTYPE in source
-                        r = new BufferedReader(new FileReader(file));
-                        r.readLine();
-                        inputSource = new InputSource(r);
-
-                        builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-                        document = builder.parse(inputSource);
-
-                        var expression = "//span[@class='tagdoc']";
-                        var t = xpath.evaluate(expression, document, XPathConstants.NODE);
-                        if (t == null) {
-                            print('\tno tagdoc span found: ignored');
-                            continue;
-                        }
-                        var id = t.getAttributes().getNamedItem("id").getTextContent();
-
-                        out.write('##### ' + id + '\n');
-                        out.write(id + ' = ' + t.getTextContent() + '\n');
-
-                        expression = "//table[@class='ivy-attributes'][1]/tbody/tr/td[1]";
-                        var atts = xpath.evaluate(expression, document, XPathConstants.NODESET);
-                        for (j=0; j<atts.getLength(); j++) {
-                            out.write(id + '.@' + atts.item(j).getTextContent() + ' = ' 
-                                + xpath.evaluate("../td[2]", atts.item(j), XPathConstants.NODE).getTextContent()
+ '\n');
-                        }
-                    } catch (e) {
-                        print('\terror: ' + e);
-                    }
-                }
-                out.close();
-            ]]>
-        </scriptdef>
-        <property name="ivydoc" value="${basedir}/target/history/trunk/" />
-        <generate-tagsdoc destFile="tagsdoc.properties">
-            <fileset dir="${ivydoc}" includes="settings/**/*.html,resolver/**/*.html"
/>
-        </generate-tagsdoc>
+        <generate-printdoc destpath="${target.dir}" version="${history.version}" />
     </target>
 
 </project>



Mime
View raw message