You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@jakarta.apache.org by se...@apache.org on 2007/03/10 16:10:52 UTC

svn commit: r516725 - /jakarta/site/build.xml

Author: sebb
Date: Sat Mar 10 07:10:51 2007
New Revision: 516725

URL: http://svn.apache.org/viewvc?view=rev&rev=516725
Log:
Allow build with Java 1.6
Empty temporary work directory otherwise obsolete files can accumulate

Modified:
    jakarta/site/build.xml

Modified: jakarta/site/build.xml
URL: http://svn.apache.org/viewvc/jakarta/site/build.xml?view=diff&rev=516725&r1=516724&r2=516725
==============================================================================
--- jakarta/site/build.xml (original)
+++ jakarta/site/build.xml Sat Mar 10 07:10:51 2007
@@ -65,11 +65,12 @@
   
     <condition property="target.vm" value="valid">
       <or>
+        <equals arg1="1.6" arg2="${java.specification.version}"/>
         <equals arg1="1.5" arg2="${java.specification.version}"/>
         <equals arg1="1.4" arg2="${java.specification.version}"/>
       </or>
     </condition>
-    <fail unless="target.vm" message="Must build with Java 1.4/1.5"/>
+    <fail unless="target.vm" message="Must build with Java 1.4/1.5/1.6"/>
 
     <!-- Create destination directory if necessary -->
     <mkdir     dir="${docs.dest}"/>
@@ -104,9 +105,12 @@
 	<transform from="${docs.src}/site/news" to="${docs.dest}/site/news"/>
 	<transform from="${news.gen.dir}" to="${docs.dest}/site/news"/>
  
-    <echo>*** Build download xdocs</echo>
+    <echo>*** Build and/or empty download xdocs</echo>
     <mkdir dir="${docs.downloads.tmp}"/>
-    
+  	
+  	<!-- Need to empty the input directory, otherwise obsolete files can remain -->
+    <delete dir="${docs.downloads.tmp}" file="*.xml"/>
+
     <!-- Seems like we could do one transform and generate the .cgi at the same time, using a text
           output method. -->
           



---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: site-cvs-help@jakarta.apache.org