svn commit: r606440 - in /ant/ivy/site: build.xml xooki/antlib.xml

[xavier]

Author: xavier
Date: Sat Dec 22 01:55:35 2007
New Revision: 606440

URL: http://svn.apache.org/viewvc?rev=606440&view=rev
Log:
review how to regenerate whole site, to avoid deleting svn meta data

Modified:
    ant/ivy/site/build.xml
    ant/ivy/site/xooki/antlib.xml

Modified: ant/ivy/site/build.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/build.xml?rev=606440&r1=606439&r2=606440&view=diff
==============================================================================
--- ant/ivy/site/build.xml (original)
+++ ant/ivy/site/build.xml Sat Dec 22 01:55:35 2007
@@ -20,15 +20,22 @@
         xmlns:xooki="antlib:xooki">
 
     <property name="target.dir" value="${basedir}/target" />
+
+    <target name="/all" description="--> force whole site generation, 
disabling incremental mode">
+        <property name="checkUpToDate" value="false" />
+    </target>
         
     <target name="generate-site" depends="init-imported-history"
             description="--> Generates site for publication">
+        <!-- by default we use incremental mode, which checks if files require 
generation -->
+        <property name="checkUpToDate" value="true" />
+        
                <!-- xooki:generate requires sun java 6 jdk (with jrunscript) 
in path and Apache Ant 1.7 -->
         <copy todir="${target.dir}">
                <fileset dir="${basedir}" 
                        
includes="*.cgi,images/**,style/**,samples/**,js/**,schemas/**,presentations/**,history/*/images/**,history/*/samples/**"
 />
         </copy>
-        <xooki:generate destDir="${target.dir}" checkUpToDate="true">
+        <xooki:generate destDir="${target.dir}" 
checkUpToDate="${checkUpToDate}">
                        <fileset dir="${basedir}">
                            <include name="**/*.html"/>
                            <exclude name="**/template.html"/>
@@ -45,7 +52,7 @@
         <copy todir="${target.dir}/ivyde">
                <fileset dir="${basedir}/ivyde" includes="images/**,style/**" />
         </copy>
-        <xooki:generate destDir="${target.dir}/ivyde" checkUpToDate="true">
+        <xooki:generate destDir="${target.dir}/ivyde" 
checkUpToDate="${checkUpToDate}">
                        <fileset dir="${basedir}/ivyde">
                            <include name="**/*.html"/>
                            <exclude name="template.html"/>
@@ -53,10 +60,6 @@
                            <exclude name="**/xooki/**"/>
                        </fileset>
                </xooki:generate>
-    </target>
-
-    <target name="clean" description="--> clean generated site">
-        <delete dir="${target.dir}" />
     </target>
         
         

Modified: ant/ivy/site/xooki/antlib.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/xooki/antlib.xml?rev=606440&r1=606439&r2=606440&view=diff
==============================================================================
--- ant/ivy/site/xooki/antlib.xml (original)
+++ ant/ivy/site/xooki/antlib.xml Sat Dec 22 01:55:35 2007
@@ -25,7 +25,7 @@
                        var filename = file.getName();
                        var filepath = srcFiles[i].substring(0, 
srcFiles[i].lastIndexOf(project.getProperty("file.separator"))+1);
                 
-                if (attributes.get("checkuptodate")) {
+                if (attributes.get("checkuptodate") == "true") {
                     p = "xooki."+file.getAbsolutePath().replace(' 
','_')+".uptodate";
                     upToDate = project.createTask("uptodate");
                     upToDate.setProperty(p);