Mercurial > public > develkit

changeset 6:e779cd205e30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TL-32: Add default ivy settings and update fetch typedef.
author smith@nwoca.org
date Fri, 17 Dec 2010 21:25:13 -0500
parents 9c847b8c7e9c
children 361f0d420ad4
files antcontrib-ant.xml bootstrap.xml ssdt.default.ivy.settings.xml
diffstat 3 files changed, 42 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/antcontrib-ant.xml	Fri Dec 17 18:23:14 2010 -0500
+++ b/antcontrib-ant.xml	Fri Dec 17 21:25:13 2010 -0500
@@ -4,7 +4,7 @@
     <property           name="ssdt.ant-contrib.jar.src"     value="http://ivy.ssdt.nwoca.org/repository/ant-contrib/ant-contrib.jar"/>
 
 
-    <ssdt:fetch-jar     dest="${user.home.ant.lib}/ant-contrib.jar"
+    <ssdt:fetch         dest="${user.home.ant.lib}/ant-contrib.jar"
                         src="${ssdt.ant-contrib.jar.src}"/>
 
     <taskdef           resource="net/sf/antcontrib/antcontrib.properties">
--- a/bootstrap.xml	Fri Dec 17 18:23:14 2010 -0500
+++ b/bootstrap.xml	Fri Dec 17 21:25:13 2010 -0500
@@ -4,7 +4,9 @@
 
     <property   file="${ssdt.devel.kit}/private.properties"/>
     <property   name="user.home.ant.lib"        value="${user.home}/.ant/lib"/>
+    <property   name="ssdt.devel.kit.src"       value="http://hg.ssdt-ohio.org/browse/public/develkit"/>
     <property   name="ssdt.ivy.jar.src"         value="http://ivy.ssdt.nwoca.org/repository/ivy/ivy.jar"/>
+    <property   name="ssdt.ivy.settings.src"    value="${ssdt.devel.kit.src}/ssdt.default.ivy.settings.xml"/>
     <mkdir      dir="${ssdt.devel.kit}"/>
     <mkdir      dir="${user.home.ant.lib}"/>
 
@@ -18,7 +20,7 @@
         </sequential>
     </macrodef> 
 
-    <macrodef name="fetch-jar"  uri="http://www.ssdt-ohio.org/ant/common">
+    <macrodef name="fetch"  uri="http://www.ssdt-ohio.org/ant/common">
         <attribute name="dest" default="${user.home.ant.lib}"/>
         <attribute name="src"/>
         <sequential>
@@ -28,8 +30,10 @@
         </sequential>
     </macrodef>
 
-    <ssdt:fetch-jar         dest="${user.home.ant.lib}/ivy.jar"
-                            src="${ssdt.ivy.jar.src}"/>
+    <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"/>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ssdt.default.ivy.settings.xml	Fri Dec 17 21:25:13 2010 -0500
@@ -0,0 +1,34 @@
+<!-- SSDT default ivy settings.
+    This file should be used by all SSDT projects based on Ivy.  It should included from
+    the project's local ivysettings.xml file.
+-->
+<ivysettings>
+    <settings defaultResolver="default"/>
+    <caches defaultCacheDir="${user.home}/.ivy2/cache" useOrigin="true">
+        <cache name="ssdt-cache" basedir="${user.home}/.ivy2/ssdt-cache"/>
+    </caches>
+    <property name="ivy.local.default.root" value="${user.home}/.ivy2/local" override="false"/>
+    <property name="ivy.default.ivy.user.dir" value="${user.home}/.ivy2" override="false"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+    <resolvers >
+        <chain name="default" checkmodified="true" changingMatcher="*.*SNAPSHOT">
+            <filesystem name="local" checkmodified="true" force="true" cache="ssdt-cache" changingMatcher="*.*SNAPSHOT">
+                <ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}" />
+                <artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
+            </filesystem>
+            <url name="ssdt-snapshots" checkmodified="true" changingMatcher="*.*SNAPSHOT">
+                <ivy pattern="http://ivy.ssdt.nwoca.org/snapshots/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
+                <artifact pattern="http://ivy.ssdt.nwoca.org/snapshots/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
+            </url>
+            <url name="ssdt-repository">
+                <ivy pattern="http://ivy.ssdt.nwoca.org/repository/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+                <artifact pattern="http://ivy.ssdt.nwoca.org/repository/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+            </url>
+            <ibiblio name="ssdt-repo" root="http://repos.ssdt.nwoca.org/artifactory/repo/" m2compatible="true"/>
+        </chain>
+    </resolvers>
+</ivysettings>
\ No newline at end of file