Mercurial > public > develkit

diff bootstrap.xml @ 5:9c847b8c7e9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TL-32: Update ssdt-common-build to remove obsolte tasks and remove CVS assumptions.
author smith@nwoca.org
date Fri, 17 Dec 2010 18:23:14 -0500
parents be1051bf262f
children e779cd205e30
line wrap: on
line diff
--- a/bootstrap.xml	Fri Dec 17 16:55:03 2010 -0500
+++ b/bootstrap.xml	Fri Dec 17 18:23:14 2010 -0500
@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ssdt.bootstrap"  basedir=".">
+<project name="ssdt.bootstrap"  basedir="." default="" xmlns:ssdt="http://www.ssdt-ohio.org/ant/common">
     <echo message="invoking ssdt bootstrap" level="info"/>
 
     <property   file="${ssdt.devel.kit}/private.properties"/>
     <property   name="user.home.ant.lib"        value="${user.home}/.ant/lib"/>
+    <property   name="ssdt.ivy.jar.src"         value="http://ivy.ssdt.nwoca.org/repository/ivy/ivy.jar"/>
     <mkdir      dir="${ssdt.devel.kit}"/>
-
-<!--    <macrodef name="ssdt-import-ant">
-        <attribute name="file"/>
-        <sequential>
-    <get        dest="${ssdt.devel.kit}/ivy-ant.xml"
-                src="${ssdt.devel.kit.src}/ivy-ant.xml"
-                usetimestamp="true"/>
-    <import    file="${ssdt.devel.kit}/ivy-ant.xml"/>
-
-        </sequential>
-    </macrodef> -->
-
-    <property   name="ssdt.ivy.jar.src"         value="http://ivy.ssdt.nwoca.org/repository/ivy/ivy.jar"/>
-
     <mkdir      dir="${user.home.ant.lib}"/>
 
-    <get        dest="${user.home.ant.lib}/ivy.jar"
-                src="${ssdt.ivy.jar.src}"
-                usetimestamp="true"/>
-
-    <get        dest="${ssdt.devel.kit}/ivy-ant.xml"
-                src="${ssdt.devel.kit.src}/ivy-ant.xml"
-                usetimestamp="true"/>
-    <import    file="${ssdt.devel.kit}/ivy-ant.xml"/>
+    <macrodef name="import-ant" uri="http://www.ssdt-ohio.org/ant/common">
+        <attribute name="file"/>
+        <sequential>
+            <get dest="${ssdt.devel.kit}/@{file}"
+                src="${ssdt.devel.kit.src}/@{file}"
+                usetimestamp="true" verbose="false" />
+            <import    file="${ssdt.devel.kit}/@{file}"/>
+        </sequential>
+    </macrodef> 
 
-    <get        dest="${ssdt.devel.kit}/antcontrib-ant.xml"
-                src="${ssdt.devel.kit.src}/antcontrib-ant.xml"
-                usetimestamp="true"/>
-    <import     file="${ssdt.devel.kit}/antcontrib-ant.xml"/>
+    <macrodef name="fetch-jar"  uri="http://www.ssdt-ohio.org/ant/common">
+        <attribute name="dest" default="${user.home.ant.lib}"/>
+        <attribute name="src"/>
+        <sequential>
+            <get dest="@{dest}"
+                src="@{src}"
+                usetimestamp="true" verbose="false" />
+        </sequential>
+    </macrodef>
 
-    <get        dest="${ssdt.devel.kit}/ssdt-common-build.xml"
-                src="${ssdt.devel.kit.src}/ssdt-common-build.xml"
-                usetimestamp="true"/>
+    <ssdt:fetch-jar         dest="${user.home.ant.lib}/ivy.jar"
+                            src="${ssdt.ivy.jar.src}"/>
 
-    <import file="${ssdt.devel.kit}/ssdt-common-build.xml"/>
-
+    <ssdt:import-ant file="ivy-ant.xml"/>
+    <ssdt:import-ant file="antcontrib-ant.xml"/>
+    <ssdt:import-ant file="ssdt-common-build.xml"/>
 
 </project>