Mercurial > public > develkit

changeset 94:1290b23e7b76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modify ivy and gradle to use same local repo
author smith@nwoca.org
date Sat, 03 Mar 2012 21:19:58 +0000
parents f351338a3b3a
children ebb42488396a
files init.gradle ssdt.default.ivy.settings.xml
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/init.gradle	Wed Feb 22 19:14:04 2012 +0000
+++ b/init.gradle	Sat Mar 03 21:19:58 2012 +0000
@@ -1,6 +1,11 @@
 
 gradle.ssdtDevelkitLocation = gradle.hasProperty('ssdtDevelkitLocation') ? gradle.ssdtDevelkitLocation : 'http://hg.ssdt-ohio.org/browse/public/develkit'
 
+ant.property(file: System.getProperty('user.home') + "/.ssdt/private.properties")
+if (ant.properties['ivy.default.ivy.user.dir']) {
+  gradle.ivyUserDir = ant.properties['ivy.default.ivy.user.dir'] ?: System.getProperty('user.home') + "/.ivy2"
+}
+
 gradle.addListener(new ArtifactoryGradleSettings())
 
 gradle.bambooBuild = System.getenv().any { it.key.startsWith('BAMBOO')}
@@ -31,6 +36,7 @@
         if ( local ) {                  
             logger.info "removing local repo: $it"
             new File(System.properties['user.home'] + "/.ssdt/local-repo").deleteDir() 
+            new File(gradle.ivyUserDir + "/local").deleteDir() 
         }
     }    
     
@@ -55,10 +61,13 @@
                 if (!gradle.bambooBuild) {                         
                     add(new org.apache.ivy.plugins.resolver.FileSystemResolver()) {
                         name = 'local'
-                        addIvyPattern System.properties['user.home'] + "/.ssdt/local-repo/[module]-ivy-[revision].xml"
-                        addArtifactPattern System.properties['user.home'] + "/.ssdt/local-repo/[module]-[revision](-[classifier]).[ext]"
+                        addIvyPattern gradle.ivyUserDir + "/local/[module]-ivy-[revision].xml"
+                        addArtifactPattern gradle.ivyUserDir + '/local/[module]-[revision](-[classifier]).[ext]'
                         descriptor = 'optional'
                         checkmodified = true
+                        changingMatcher = 'regexp'
+                        changingPattern = '.*SNAPSHOT'   
+                        force = true
                     }                       
                 }                
                 add(new org.apache.ivy.plugins.resolver.URLResolver()) {
--- a/ssdt.default.ivy.settings.xml	Wed Feb 22 19:14:04 2012 +0000
+++ b/ssdt.default.ivy.settings.xml	Sat Mar 03 21:19:58 2012 +0000
@@ -18,8 +18,8 @@
     <resolvers >
         <chain name="default">
             <filesystem name="local" checkmodified="true" force="true" local="true" changingPattern=".*SNAPSHOT" >
-                <ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}" />
-                <artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
+                <ivy pattern="${ivy.local.default.root}/[module]-ivy-[revision].xml" />
+                <artifact pattern="${ivy.local.default.root}/[module]-[revision](-[classifier]).[ext]" />
             </filesystem>
      
             <url name="ssdt-snapshots" changingPattern=".*SNAPSHOT" checkmodified="true" m2compatible="true" cache="snapshot-cache">