Sophie

Sophie

distrib > Mageia > 2 > i586 > by-pkgid > 57599de595f7dc70a30fb85cfaa80809 > files > 2

gant-1.9.6-2.mga2.src.rpm

diff -Nru gant-1.9.6/build.gradle gant-1.9.6-gil/build.gradle
--- gant-1.9.6/build.gradle	2011-07-22 15:24:08.000000000 +0200
+++ gant-1.9.6-gil/build.gradle	2011-08-17 19:58:58.289090267 +0200
@@ -18,6 +18,7 @@
 
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.api.artifacts.repositories.WebdavResolver
+import org.apache.ivy.plugins.resolver.FileSystemResolver
 
 artifact = 'gant'
 mavenNameExtension = '_groovy'
@@ -58,14 +59,12 @@
 groovyVersions = [
   //  '1.6' : '1.6.9' , // GroovyShell API of 1.6.9 is incompatible with 1.9.x
   '1.7' : '1.7.10' ,
-  '1.8' : '1.8.1' ,
-  '1.9' : '1.9.0-beta-1'
 ]
 
 //  One series of Groovy needs using for the standalone distribution. This version of Groovy will be packaged with
 //  the "standalone" distribution of Gant.  It will generally be the latest widely available released version of Groovy.
 
-groovyStandaloneSeries = '1.8'
+groovyStandaloneSeries = '1.7'
 
 //  Organize the build using subprojects.  There is a subproject gant which is for the build using the
 //  locally installed Groovy and there is one for each version of Groovy obtained from the Maven repository
@@ -144,24 +143,29 @@
     }
   }
   repositories {
-    mavenCentral ( )
-    mavenRepo ( urls : 'http://repository.codehaus.org/' )
+    //mavenCentral ( )
+    //mavenRepo ( urls : 'http://repository.codehaus.org/' )
     //
     //  When disconnected from the Internet the above cannot be found.  To make sure things work use a local
     //  Maven cache as well.  Assumes the cache has all the needed content.
     //
     //  Also Groovy 1.9.0-beta-1-SNAPSHOT is in my cache but not in the repositories above.
     //
-    mavenRepo ( urls : 'file:///home/users/russel/.m2/repository' )
+    //mavenRepo ( urls : 'file:///home/users/russel/.m2/repository' )
+        add(new FileSystemResolver()) {
+            name = 'repo'
+            addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
+            addArtifactPattern "/usr/share/java/[module].[ext]"
+        }
   }
   dependencies {
     compile (
              'commons-cli:commons-cli:1.2' ,
              'org.apache.ant:ant:1.8.2'
              )
-    testCompile ( 'junit:junit:4.8.2' )
+    testCompile ( 'junit:junit4:4.8.2' )
     testRuntime ( 'org.apache.ivy:ivy:2.2.0' )
-    deployJars ( webdavWagonName )
+    //deployJars ( webdavWagonName )
   }
   compileGroovy.options.compilerArgs = [ '-Xlint' ]
   [ compileGroovy , compileTestGroovy ]*.options*.encoding = 'UTF-8'
@@ -186,7 +190,6 @@
   def packageTitle = 'Gant ' + gantVersion
   def copyrightString = 'Copyright © 2006–9  The Codehaus.  All Rights Reserved.'
   javadoc {
-    options.overview ( 'overview.html' )
     options.showAll ( )
     options.encoding ( 'UTF-8' )
     options.setUse ( true )
@@ -205,7 +208,6 @@
     //  need it.  Should we put a dependency in for symmetry or rely on it working not to bother?
     ////dependsOn ( 'classes' )
     packageNames = [ 'gant.*' , 'org.codehaus.gant.*' ] // Why have to have this when not needed for javadoc?
-    overview = 'overview.html'
     includePrivate = false
     encoding = 'UTF-8'
     use = true
diff -Nru gant-1.9.6/settings.gradle gant-1.9.6-gil/settings.gradle
--- gant-1.9.6/settings.gradle	2011-07-17 09:48:21.000000000 +0200
+++ gant-1.9.6-gil/settings.gradle	2011-08-17 19:45:54.307042057 +0200
@@ -14,4 +14,4 @@
 //
 //  Author : Russel Winder <russel@russel.org.uk>
 
-include 'gant' , 'gant_groovy1.7' , 'gant_groovy1.8' , 'gant_groovy1.9'
+include 'gant' , 'gant_groovy1.7'