Changeset 1595 for trunk/build.xml

Timestamp:

02/11/10 20:12:45 (2 years ago)

Author:

amandel

Message:

- Update IVY to 2.1.0
- refresh ivy.xml as needed for the update and clean up a bit

Files:

• trunk/build.xml (modified) (5 diffs)

trunk/build.xml

@@ -32 +32 @@
     ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  -->
-<project name="fawkeZ" basedir="." default="build" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project name="fawkeZ" basedir="." default="build" xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <import file="config/properties.xml"/>
@@ -46 +46 @@
        <fileset dir="${base.dir}/lib">
          <include name="default/xalan/xalan.jar"/>
-         <include name="default/xalan/serializer.jar"/>
+         <include name="default/serializer/serializer.jar"/>
          <include name="default/xercesImpl/xml-apis.jar"/>
          <include name="default/xercesImpl/xercesImpl.jar"/>
@@ -165 +165 @@
       <fail message="Outdated version of xerces found on classpath!"/>
     </target>
-
     <target name="check-xerces-ant"
        depends="check-xerces-ant-available, check-xerces-ant-version">
@@ -326 +325 @@
             todir="${base.dir}/lib/eclipse"/>
         <!-- xmlns:ivy="antlib:fr.jayasoft.ivy.ant" -->
-        <typedef resource="fr/jayasoft/ivy/ant/antlib.xml">
-            <classpath>
-                <pathelement location="${base.dir}/lib/ivy/ivy-2.0.0.jar"/>
-            </classpath>
-        </typedef>
-        <settings file="${base.dir}/config/ivyconf.xml" />
-        <resolve file="${base.dir}/config/ivy.xml" conf="default"/>
-        <retrieve pattern="${base.dir}/lib/[conf]/[module]/[artifact].[ext]"
+        <path id="ivy.classpath">
+                <pathelement location="${base.dir}/lib/ivy/ivy-2.1.0.jar"/>
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+            uri="antlib:org.apache.ivy.ant" classpath="${base.dir}/lib/ivy/ivy-2.1.0.jar"/>
+        <ivy:settings file="${base.dir}/config/ivyconf.xml" />
+        <ivy:resolve file="${base.dir}/config/ivy.xml" conf="default"/>
+        <ivy:retrieve pattern="${base.dir}/lib/[conf]/[module]/[artifact].[ext]"
             conf="default"/>
+        <ivy:report todir="${build.dir}/doc/ivy" dot="true"/> 
         <touch file="${base.dir}/lib/default/retrieve-3rd-party-libs.done"/>
     </target>
     <target name="report-dependency" depends="retrieve-3rd-party-libs">
         <mkdir dir="${build.dir}/ivy"/>
-        <report todir="${build.dir}/ivy"/>
+        <ivy:report todir="${build.dir}/ivy"/>
     </target>
 
@@ -400 +400 @@
             </fileset>
         </copy>
+        <taskdef name="xpathproperty" 
+            classname="org.jcoderz.commons.taskdefs.XpathPropertyTask">
+            <classpath>
+                <pathelement path="${build.dir}/bootstrap-classes"/>
+            </classpath>
+        </taskdef>
+        <xpathproperty name="xpathtest" xpath="/project/@name" file="build.xml"/>
+        <echo message="Result = ${xpathtest}"/>
     </target>