Author: maartenc
Date: Mon Jan 12 14:44:50 2009
New Revision: 733950
URL: http://svn.apache.org/viewvc?rev=733950&view=rev
Log:
Load the xooki antlib inside the 'generate-doc' target. This allows us to run
the other targets with JDK 1.4. (merged from 2.0.0 branch)
Modified:
ant/ivy/core/trunk/ (props changed)
ant/ivy/core/trunk/build-release.xml
Propchange: ant/ivy/core/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 14:44:50 2009
@@ -1,4 +1,4 @@
-/ant/ivy/core/branches/2.0.0:727520-732505
+/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
/ant/ivy/core/trunk:695737,696014-696031,696442
Modified: ant/ivy/core/trunk/build-release.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build-release.xml?rev=733950&r1=733949&r2=733950&view=diff
==============================================================================
--- ant/ivy/core/trunk/build-release.xml (original)
+++ ant/ivy/core/trunk/build-release.xml Mon Jan 12 14:44:50 2009
@@ -22,9 +22,9 @@
xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
<import file="build.xml"/>
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml" />
-
<target name="generate-doc">
+ <taskdef uri="antlib:xooki"
file="${doc.src.dir}/xooki/antlib.xml" />
+
<copy todir="${doc.build.dir}">
<fileset dir="${doc.src.dir}"
includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
</copy>
