Mercurial > public > develkit

changeset 8:26a4d8410fdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TL-32: Refactor ivy include for non-ivy based projects.
author smith@nwoca.org
date Sat, 18 Dec 2010 14:20:32 -0500
parents 361f0d420ad4
children ae7d512164d0
files bootstrap.xml ivy-ant.xml
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap.xml	Sat Dec 18 11:54:16 2010 -0500
+++ b/bootstrap.xml	Sat Dec 18 14:20:32 2010 -0500
@@ -30,12 +30,6 @@
         </sequential>
     </macrodef>
 
-    <ssdt:fetch         dest="${user.home.ant.lib}/ivy.jar"
-                        src="${ssdt.ivy.jar.src}"/>
-    <ssdt:fetch         dest="${ssdt.devel.kit}/ssdt.default.ivy.settings.xml"
-                        src="${ssdt.ivy.settings.src}"/>
-
-    <ssdt:import-ant file="ivy-ant.xml"/>
     <ssdt:import-ant file="antcontrib-ant.xml"/>
     <ssdt:import-ant file="ssdt-common-build.xml"/>
 </project>
--- a/ivy-ant.xml	Sat Dec 18 11:54:16 2010 -0500
+++ b/ivy-ant.xml	Sat Dec 18 14:20:32 2010 -0500
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ivy-ant"  basedir="." xmlns:ivy="antlib:fr.jayasoft.ivy.ant" >
+<project name="ivy-ant"  basedir="." 
+    xmlns:ivy="antlib:fr.jayasoft.ivy.ant"
+    xmlns:ssdt="http://www.ssdt-ohio.org/ant/common">
+
+    <ssdt:fetch         dest="${user.home.ant.lib}/ivy.jar"
+                        src="${ssdt.ivy.jar.src}"/>
 
     <dirname property="ivy.home" file="${ant.file.ivy-ant}"/>
     <property name="ivy-ant.location" location="${ant.file.ivy-ant}"/>
@@ -12,6 +17,9 @@
     <property name="ivy.local.default.root"
               value="${user.home}/.ivy2/local"/>
 
+    <ssdt:fetch dest="${ssdt.devel.kit}/ssdt.default.ivy.settings.xml"
+                src="${ssdt.ivy.settings.src}"/>
+
     <target name="ivy-report" depends="init">
         <mkdir dir="${build.dir}/ivy"/>
         <ivy:resolve log="quiet" file="ivy.xml"/>