Nabble - GANT

Re: End of year reflections

2009-12-19T06:58:34Z

Russel, I would prefer to see Gant become part of Groovy! Quoting from you in an post last year: "I am increasingly of the view that Gant should cease trying to be a build framework and leave this role to a rapidly evolving Gradle. Gant should instead reposition itself as a lightweight, embeddable Ant task scripting system." I agree with that with emphasis on positioning Gant as a (Ant) scripting system extension to base Groovy. My view is that Gant provides a significant improvement in how to create and maintain groovy scripts (with or without Ant). The dependency framework is very useful in organizing scripts and the built-in target based parameters makes more complex scripts easy to parameterize, test, and extend. For instance, using declarative code (maps) and automatically generating targets with dependencies that can be individually run and tested with little or no parameterization or other overhead. It is also easy to include simple testing targets directly with the script. Rarely anymore would I consider doing JUST a groovy script. It would seem more natural for Gant as a general extension of Groovy to be absorbed into Groovy as opposed to Grails which a much more specific solution.

On Dec 19, 2009, at 1:47 AM, Russel Winder wrote:

The year has been interesting, and indeed exciting, for Groovy and
Groovy related technologies.   In terms of stuff relating to Gant:
Gradle is rapidly becoming the build tool of choice, Maven is getting a
Groovy front end as well as Groovy plugins, and Ant is getting a Groovy
front end. Build is getting significantly Groovier, all started by Gant
I think, but . . .

In a spontaneous straw poll at Groovy & Grails eXchange 2009, there
seemed to be 60-70 people in the audience prepared to admit to being
Gant users, but only 1 or 2 individuals using Gant for build. The
inference from this is that everyone is using Gradle, Maven or Ant for
build, and that the use of Gant is almost entirely in a Grails context.

As has been noted and commented on by more than one outsider, i.e. from
the Ant and Maven communities, not from the Groovy community, the vibe
in the Gradle community is strong, whereas there is no Gant community to
speak of.

Earlier in the year I asked if there was anyone interested in being more
active in Gant development. Whilst one or two people have chipped in
with the occasional patch, this has not turned into an active community.
As of now there is no real active Gant development.

It is true that I have spent some significant time over the last couple
of weeks replacing the Ant/Gant build of Gant with a Gradle build. But
none of this is about developing Gant itself.

This inexorably leads to wondering whether Gant's time as a separate
project is over: is now a good time to explicitly accept that Gant has
evolved into being a component of Grails. A component that can be used
separately from Grails (see for example grails-doc which is being used
by a number of projects now), but one whose home is embedded in the
Grails community. My feeling is yes. This email is to see if people
have another vision.

As soon as possible after the release of Groovy 1.7.0, I shall release
Gant 1.9.0. Assuming that no Gant 1.9.1 is needed soon after, and that
no-one steps forward to take over the Gant project, it is my proposal to
ask Graeme to absorb Gant into the Grails infrastructure, and for the
Gant project to cease to be a self-standing one.

This is not a negative proposal, nor any admission of failure, just an
acceptance that things evolve.

--
Russel.
=============================================================================
Dr Russel Winder      Partner
                                           xmpp: russel@...
Concertant LLP        t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,   f: +44 8700 516 084   voip: sip:russel.winder@...
London SW11 1EN, UK   m: +44 7770 465 077   skype: russel_winder

From forum: GANT -- User

[gant-scm] [10488] gant/trunk: Update the manifest a bit to bring in line with the way it is done in GPars.

2009-12-19T01:01:10Z

[10488] gant/trunk: Update the manifest a bit to bring in line with the way it is done in GPars.

Revision: 10488
Author: russel
Date: 2009-12-19 03:01:10 -0600 (Sat, 19 Dec 2009)

Log Message

Update the manifest a bit to bring in line with the way it is done in GPars.

Diff

Modified: gant/trunk/build.gant (10487 => 10488)

--- gant/trunk/build.gant	2009-12-19 08:16:42 UTC (rev 10487)
+++ gant/trunk/build.gant	2009-12-19 09:01:10 UTC (rev 10488)
@@ -208,15 +208,21 @@
 final makeManifest = { ->
   mkdir ( dir : buildMetadataDirectory )
   copy ( todir : buildMetadataDirectory ,  file : 'LICENCE.txt' )
+  def theVendor = 'The Codehaus'
+  def theTitle = 'Gant: Scripting Ant tasks with Groovy.'
   manifest ( file : buildMetadataDirectory + '/MANIFEST.MF' ) {
+    attribute ( name : 'Bundle-Vendor' , value : theVendor )
+    attribute ( name : 'Bundle-Description', value : 'gant' )
+    attribute ( name : 'Bundle-DocURL' , value : 'http://gant.codehaus.org' )
     attribute ( name : 'Built-By' , value : System.properties.'user.name' )
     attribute ( name : 'Extension-Name' , value : 'gant' )
-    attribute ( name : 'Specification-Title' , value : 'Gant: scripting Ant tasks with Groovy.' )
+    attribute ( name : 'Specification-Title' , value : theTitle )
     attribute ( name : 'Specification-Version' , value : gantVersion )
-    attribute ( name : 'Specification-Vendor' , value : 'The Codehaus' )
-    attribute ( name : 'Implementation-Title' , value : 'Gant: Scripting Ant tasks with Groovy.' )
+    attribute ( name : 'Specification-Vendor' , value : theVendor )
+    attribute ( name : 'Implementation-Title' , value : theTitle )
     attribute ( name : 'Implementation-Version' , value : gantVersion ) 
-    attribute ( name : 'Implementation-Vendor' , value : 'The Codehaus' )
+    attribute ( name : 'Implementation-Vendor' , value : theVendor )
+    attribute ( name : 'Export-Package' , value : '*'' )
   }
 }

Modified: gant/trunk/build.gradle (10487 => 10488)

--- gant/trunk/build.gradle	2009-12-19 08:16:42 UTC (rev 10487)
+++ gant/trunk/build.gradle	2009-12-19 09:01:10 UTC (rev 10488)
@@ -69,6 +69,7 @@
 allprojects {
   group =  'org.codehaus.gant'
   version = gantVersion
+  bundleVersion = gantVersion
 }
 
 subprojects {
@@ -89,8 +90,10 @@
   def theTitle = 'Gant: Scripting Ant tasks with Groovy.'
   configure ( jar.osgi ) {
     name = 'Gant'
+    version = gantVersion
+    symbolicName = 'gant'
     instruction 'Bundle-Vendor' , theVendor
-    instruction 'Bundle-Description' , theTitle
+    instruction 'Bundle-Description' , group
     instruction 'Bundle-DocURL' , 'http://gant.codehaus.org'
     instruction 'Built-By' , System.properties.'user.name'
     instruction 'Extension-Name' , artifact
@@ -99,7 +102,8 @@
     instruction 'Specification-Vendor' , theVendor
     instruction 'Implementation-Title' , theTitle
     instruction 'Implementation-Version' , gantVersion
-    instruction'Implementation-Vendor' , theVendor
+    instruction 'Implementation-Vendor' , theVendor
+    instruction 'Export-Package' , '*'
   }
   repositories {
     mavenCentral ( )

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10487] gant/trunk/build.gradle: Using the 'whenReady' approach leads to failure on Bamboo.

2009-12-19T00:16:43Z

[10487] gant/trunk/build.gradle: Using the 'whenReady' approach leads to failure on Bamboo.

Revision: 10487
Author: russel
Date: 2009-12-19 02:16:42 -0600 (Sat, 19 Dec 2009)

Log Message

Using the 'whenReady' approach leads to failure on Bamboo.
Revert to using exception catching for now.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10486 => 10487)

--- gant/trunk/build.gradle	2009-12-18 17:26:44 UTC (rev 10486)
+++ gant/trunk/build.gradle	2009-12-19 08:16:42 UTC (rev 10487)
@@ -236,18 +236,26 @@
     dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
     compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
     test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( groovyAntTaskTestVersionPropertyFileContent + groovyVersion ) }
-    uploadArchives {
-      repositories.mavenDeployer {
-        uniqueVersion = false
-        configuration = configurations.deployJars
-        repository ( url : 'https://dav.codehaus.org/repository/gant' ) {
-          authentication ( userName : gant_repoUserName , password : gant_repoPassword )
+    try {
+      uploadArchives {
+        repositories.mavenDeployer {
+          uniqueVersion = false
+          configuration = configurations.deployJars
+          repository ( url : 'https://dav.codehaus.org/repository/gant' ) {
+            authentication ( userName : gant_repoUserName , password : gant_repoPassword )
+          }
+          snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' ) {
+            authentication ( userName: gant_repoUserName , password : gant_repoPassword )
+          }
         }
-        snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' ) {
-          authentication ( userName: gant_repoUserName , password : gant_repoPassword )
-        }
       }
     }
+    catch ( Exception e ) { 
+      //  If gant_repoUserName and/or gant_repoPassword are not defined, do nothing.
+    }
+    /*
+     *  This approach fails for CI servers.
+     *
     gradle.taskGraph.whenReady { graph ->
       if ( graph.hasTask ( uploadArchives ) ) {
         // Ensure these properties are defined.  Fail early if they are not.
@@ -255,6 +263,8 @@
         gant_repoPassword
       }
     }
+    *
+    */
     binCopySpec = copySpec {
       def scriptsDirectory = '../scripts'
       from ( '..' ) { include ( 'README*' ) }
@@ -405,15 +415,23 @@
 //  dependsOn ( buildDistribution )
   uploadDescriptor = false
   doFirst {
-    it.repositories.add ( new WebdavResolver ( ) ) {
-      name = 'gantReleases'
-      user = gant_repoUserName
-      userPassword = gant_repoPassword
-      addArtifactPattern ( 'https://dav.codehaus.org/snapshots.dist/gant/distributions/[artifact]-[revision](-[classifier]).[ext]' )
+    try {
+      it.repositories.add ( new WebdavResolver ( ) ) {
+        name = 'gantReleases'
+        user = gant_repoUserName
+        userPassword = gant_repoPassword
+        addArtifactPattern ( 'https://dav.codehaus.org/snapshots.dist/gant/distributions/[artifact]-[revision](-[classifier]).[ext]' )
+      }
     }
+    catch ( Exception e ) {
+      //  If gant_repoUserName and/or gant_repoPassword are not defined, do nothing.
+    }
   }
 }
 
+/*
+ *  This approach fails for CI servers.
+ *
 gradle.taskGraph.whenReady { graph ->
   if ( graph.hasTask ( uploadDistribution ) ) {
     // Ensure these properties are defined.  Fail early if they are not.
@@ -421,6 +439,8 @@
     gant_repoPassword
   }
 }
+*
+*/
 
 // =====================================================================
 //

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

End of year reflections

2009-12-18T23:47:03Z

The year has been interesting, and indeed exciting, for Groovy and
Groovy related technologies. In terms of stuff relating to Gant:
Gradle is rapidly becoming the build tool of choice, Maven is getting a
Groovy front end as well as Groovy plugins, and Ant is getting a Groovy
front end. Build is getting significantly Groovier, all started by Gant
I think, but . . .

In a spontaneous straw poll at Groovy & Grails eXchange 2009, there
seemed to be 60-70 people in the audience prepared to admit to being
Gant users, but only 1 or 2 individuals using Gant for build. The
inference from this is that everyone is using Gradle, Maven or Ant for
build, and that the use of Gant is almost entirely in a Grails context.

As has been noted and commented on by more than one outsider, i.e. from
the Ant and Maven communities, not from the Groovy community, the vibe
in the Gradle community is strong, whereas there is no Gant community to
speak of.

Earlier in the year I asked if there was anyone interested in being more
active in Gant development. Whilst one or two people have chipped in
with the occasional patch, this has not turned into an active community.
As of now there is no real active Gant development.

It is true that I have spent some significant time over the last couple
of weeks replacing the Ant/Gant build of Gant with a Gradle build. But
none of this is about developing Gant itself.

This inexorably leads to wondering whether Gant's time as a separate
project is over: is now a good time to explicitly accept that Gant has
evolved into being a component of Grails. A component that can be used
separately from Grails (see for example grails-doc which is being used
by a number of projects now), but one whose home is embedded in the
Grails community. My feeling is yes. This email is to see if people
have another vision.

As soon as possible after the release of Groovy 1.7.0, I shall release
Gant 1.9.0. Assuming that no Gant 1.9.1 is needed soon after, and that
no-one steps forward to take over the Gant project, it is my proposal to
ask Graeme to absorb Gant into the Grails infrastructure, and for the
Gant project to cease to be a self-standing one.

This is not a negative proposal, nor any admission of failure, just an
acceptance that things evolve.

--
Russel.
=============================================================================
Dr Russel Winder Partner
xmpp: russel@...
Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder@...
London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder

signature.asc (204 bytes) Download Attachment

From forum: GANT -- Dev

End of year reflections

2009-12-18T23:47:03Z

signature.asc (204 bytes) Download Attachment

From forum: GANT -- User

[gant-scm] [10486] gant/trunk/build.gradle: Various minor changes to make things more self-documenting.

2009-12-18T09:26:44Z

[10486] gant/trunk/build.gradle: Various minor changes to make things more self-documenting.

Revision: 10486
Author: russel
Date: 2009-12-18 11:26:44 -0600 (Fri, 18 Dec 2009)

Log Message

Various minor changes to make things more self-documenting.
Use a more 'fail early' technique for the authentication tokens for uploading.
Put in place the beginnings of distribution uploading to augment the Maven repository artifact uploading.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10485 => 10486)

--- gant/trunk/build.gradle	2009-12-17 20:14:26 UTC (rev 10485)
+++ gant/trunk/build.gradle	2009-12-18 17:26:44 UTC (rev 10486)
@@ -15,6 +15,7 @@
 //  Author : Russel Winder <russel.winder@...>
 
 import org.apache.tools.ant.filters.ReplaceTokens
+import org.gradle.api.artifacts.repositories.WebdavResolver
 
 artifact = 'gant'
 mavenNameExtension = '_groovy'
@@ -228,31 +229,31 @@
 
 ciBuildTasks = [ ]
 
-forEachDistributionVersion { archivesBaseName ->
-  def groovyVersion = groovyVersions[ archivesBaseName.replace ( artifact + mavenNameExtension , '' ) ]
-  project ( archivesBaseName ) {
+forEachDistributionVersion { projectName->
+  def groovyVersion = groovyVersions[ projectName.replace ( artifact + mavenNameExtension , '' ) ]
+  project ( projectName ) {
     usePlugin ( 'maven' )
     dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
     compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
     test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( groovyAntTaskTestVersionPropertyFileContent + groovyVersion ) }
-    try {
-      uploadArchives {
-        repositories.mavenDeployer {
-          uniqueVersion = false
-          configuration = configurations.deployJars
-          repository ( url : 'https://dav.codehaus.org/repository/gant' ) {
-            authentication ( userName : gant_repoUserName , password : gant_repoPassword )
-          }
-          snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' ) {
-            authentication ( userName: gant_repoUserName , password : gant_repoPassword )
-          }
+    uploadArchives {
+      repositories.mavenDeployer {
+        uniqueVersion = false
+        configuration = configurations.deployJars
+        repository ( url : 'https://dav.codehaus.org/repository/gant' ) {
+          authentication ( userName : gant_repoUserName , password : gant_repoPassword )
         }
+        snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' ) {
+          authentication ( userName: gant_repoUserName , password : gant_repoPassword )
+        }
       }
     }
-    catch ( Exception e ) {
-      //  If gant_repoUserName and/or gant_repoPassword are not defined then there will be an exception, but
-      //  we don't really care since all that happens is that the archive uploading task is not initialized
-      //  and if these are not defined you can't upload anyway!
+    gradle.taskGraph.whenReady { graph ->
+      if ( graph.hasTask ( uploadArchives ) ) {
+        // Ensure these properties are defined.  Fail early if they are not.
+        gant_repoUserName
+        gant_repoPassword
+      }
     }
     binCopySpec = copySpec {
       def scriptsDirectory = '../scripts'
@@ -260,7 +261,7 @@
       into ( 'conf' ) { from ( scriptsDirectory + '/conf' ) { include ( '*.conf' ) } } 
       into ( 'lib' ) {
         from ( libsDir )
-        rename ( archivesBaseName + '-' + version , artifact + '-' + version + mavenNameExtension + '-' + groovyVersion )
+        rename ( projectName + '-' + version , artifact + '-' + version + mavenNameExtension + '-' + groovyVersion )
       }
       into ( 'bin' ) {
         fileMode = 0755
@@ -280,20 +281,23 @@
       classifier = mavenNameExtension + '-' + groovyVersion
       into ( gantPrefix ) { from binCopySpec }
     }
+    distributionTasks += [ binTgz , binZip ]
   }
-  ciBuildTasks << archivesBaseName + ':build'  
-  distributionTasks += [ ':' + archivesBaseName + ':binTgz' , ':' + archivesBaseName + ':binZip' ]
+  //  Due to weird effective scoping of projects -- caused by cloning of bindings for projects? -- need to
+  //  do the following to get the above tasks into the list defined by the main script.
+  distributionTasks += project ( projectName ).distributionTasks
+  ciBuildTasks << projectName + ':build'  
 }
 
 // =====================================================================
 //
 //  Create the standalone distribution.
 
-projectName = 'gant_groovy' + groovyStandaloneSeries
+projectNameForStandalone = 'gant_groovy' + groovyStandaloneSeries
 
 standaloneCopySpec = copySpec {
   def scriptsDirectory = 'scripts'
-  def projectBase = project ( projectName )
+  def projectBase = project ( projectNameForStandalone )
   from ( '.' ) { include ( 'README*' ) }
   into ( 'conf' ) { from ( scriptsDirectory + '/conf' ) { include ( '*.conf' ) } } 
   into ( 'lib' ) {
@@ -309,7 +313,7 @@
   }
 }
 
-task standaloneBinTgz ( type : Tar , dependsOn : projectName + ':jar' , description : 'Create a tarball of the standalone distribution.' ) {
+task standaloneBinTgz ( type : Tar , dependsOn : projectNameForStandalone + ':jar' , description : 'Create a tarball of the standalone distribution.' ) {
   baseName = artifact
   version = gantVersion
   compression = Compression.GZIP
@@ -317,7 +321,7 @@
   into ( gantPrefix ) { from standaloneCopySpec }
 }
 
-task standaloneBinZip ( type : Zip , dependsOn : projectName + ':jar' , description : 'Create a zip file of the standalone distribution.' ) {
+task standaloneBinZip ( type : Zip , dependsOn : projectNameForStandalone + ':jar' , description : 'Create a zip file of the standalone distribution.' ) {
   baseName = artifact
   version = gantVersion
   destinationDir = buildDir
@@ -381,22 +385,47 @@
 
 // =====================================================================
 //
+//  Configuration for getting all the distribution materials uploaded to Codehaus.
 
 configurations { distribution }
 
-//artifacts {
-//distributionTasks.each { task -> distribution task }
-//}
+artifacts {
+  distributionTasks.each { task -> distribution task }
+}
 
 dependencies {
   distribution ( 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2' )
 }
 
-//distributionTargetList = [ 'docTgz' , 'docZip' , 'srcTgz' , 'srcZip' ]
-//forEachDistributionVersion { distributionTargetList += [ ':' + it + ':binTgz' , ':' + it + ':binZip' ] }
+task buildDistribution ( dependsOn : distributionTasks , description : 'Build all the uploadable distribution archives.' )
 
-task buildDistribution ( dependsOn : distributionTasks )
+task uploadDistribution ( type : Upload , dependsOn : buildDistribution , description : 'Upload all the distribution archives.' ) {
+  configuration = configurations.distribution
+//uploadDistribution {
+//  dependsOn ( buildDistribution )
+  uploadDescriptor = false
+  doFirst {
+    it.repositories.add ( new WebdavResolver ( ) ) {
+      name = 'gantReleases'
+      user = gant_repoUserName
+      userPassword = gant_repoPassword
+      addArtifactPattern ( 'https://dav.codehaus.org/snapshots.dist/gant/distributions/[artifact]-[revision](-[classifier]).[ext]' )
+    }
+  }
+}
 
+gradle.taskGraph.whenReady { graph ->
+  if ( graph.hasTask ( uploadDistribution ) ) {
+    // Ensure these properties are defined.  Fail early if they are not.
+    gant_repoUserName
+    gant_repoPassword
+  }
+}
+
+// =====================================================================
+//
+//  Odds and sods.
+
 task ciBuild ( description : 'Run just the builds that use Groovy from the Maven repository.  Used mainly on CI servers.' , dependsOn : ciBuildTasks )
 
 task wrapper ( type : Wrapper ) {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10485] gant/trunk/build.gradle: Correct the typo.

2009-12-17T12:14:26Z

[10485] gant/trunk/build.gradle: Correct the typo.

Revision: 10485
Author: russel
Date: 2009-12-17 14:14:26 -0600 (Thu, 17 Dec 2009)

Log Message

Correct the typo.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10484 => 10485)

--- gant/trunk/build.gradle	2009-12-17 20:09:21 UTC (rev 10484)
+++ gant/trunk/build.gradle	2009-12-17 20:14:26 UTC (rev 10485)
@@ -63,7 +63,7 @@
 
 // =====================================================================
 //
-//  Specifications of things for all the (sub)projects.
+//  Specifications of things for all the (subprojects.
 
 allprojects {
   group =  'org.codehaus.gant'

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10484] gant/trunk/build.gradle: Crucial change to allow uploading artefacts to the Codehaus Maven repository.

2009-12-17T12:09:21Z

[10484] gant/trunk/build.gradle: Crucial change to allow uploading artefacts to the Codehaus Maven repository.

Revision: 10484
Author: russel
Date: 2009-12-17 14:09:21 -0600 (Thu, 17 Dec 2009)

Log Message

Crucial change to allow uploading artefacts to the Codehaus Maven repository.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10483 => 10484)

--- gant/trunk/build.gradle	2009-12-17 19:47:34 UTC (rev 10483)
+++ gant/trunk/build.gradle	2009-12-17 20:09:21 UTC (rev 10484)
@@ -16,7 +16,6 @@
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
-group =  'org.codehaus.gant'
 artifact = 'gant'
 mavenNameExtension = '_groovy'
 
@@ -64,10 +63,14 @@
 
 // =====================================================================
 //
-//  Specifications of things for all the subprojects.
+//  Specifications of things for all the (sub)projects.
 
+allprojects {
+  group =  'org.codehaus.gant'
+  version = gantVersion
+}
+
 subprojects {
-  version = gantVersion
   usePlugin ( 'groovy' )
   usePlugin ( 'osgi' )
   sourceCompatibility = 5
@@ -406,4 +409,3 @@
   ant.delete ( dir : buildDir )
   ant.delete { fileset ( dir : '.' , includes : 'texput.log,**/*~,' + groovyAntTaskTestVersionPropertyFile.name ) }
 }
-

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10483] gant/trunk/build.gradle: Various tidyings up and progress towards uploading distributions.

2009-12-17T11:47:34Z

[10483] gant/trunk/build.gradle: Various tidyings up and progress towards uploading distributions.

Revision: 10483
Author: russel
Date: 2009-12-17 13:47:34 -0600 (Thu, 17 Dec 2009)

Log Message

Various tidyings up and progress towards uploading distributions.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10482 => 10483)

--- gant/trunk/build.gradle	2009-12-17 19:47:28 UTC (rev 10482)
+++ gant/trunk/build.gradle	2009-12-17 19:47:34 UTC (rev 10483)
@@ -18,6 +18,7 @@
 
 group =  'org.codehaus.gant'
 artifact = 'gant'
+mavenNameExtension = '_groovy'
 
 gantVersion = '1.9.0-SNAPSHOT'
 gantPrefix = artifact + '-' + gantVersion
@@ -49,21 +50,24 @@
 //  the same source for each subproject, the only difference is the version of Groovy used for compilation.
 
 def forEachDistributionVersion ( Closure c ) {
-  for ( String s : groovyVersions.keySet ( ) ) { c ( 'gant_groovy' + s ) }
+  for ( String s : groovyVersions.keySet ( ) ) { c ( artifact + mavenNameExtension + s ) }
 }
   
 def forEachProject ( Closure c ) {
-  c ( 'gant' )
+  c ( artifact )
   forEachDistributionVersion ( c )
 }
 
 forEachProject { item ->  if ( ! ( new File ( item ) ).isDirectory ( ) ) { ant.mkdir ( dir : item ) } }
 
-allprojects {
-  version = gantVersion
-}
+distributionTasks = [ ]
 
+// =====================================================================
+//
+//  Specifications of things for all the subprojects.
+
 subprojects {
+  version = gantVersion
   usePlugin ( 'groovy' )
   usePlugin ( 'osgi' )
   sourceCompatibility = 5
@@ -164,6 +168,11 @@
   defaultTasks ( 'build' ) 
 }
 
+// =====================================================================
+//
+//  Use the locally installed Groovy or the standalone version from the Maven repository.  This subproject
+//  is used for local installation and also for generating the documentation.
+
 project ( ':gant' ) {
   //  If the user has GROOVY_HOME set then use that Groovy rather than the one specified in the properties
   //  files.  However we have to fiddle to find the version number.
@@ -183,7 +192,6 @@
     groovyVersion = groovyVersions[groovyStandaloneSeries]
     versionMessage = 'Using Groovy version ' + groovyVersion
   }
-  archivesBaseName = artifact
   dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
   compileGroovy.doFirst { println ( '\n\t' + versionMessage +'\n' ) }
   test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( groovyAntTaskTestVersionPropertyFileContent + groovyVersion ) }
@@ -211,10 +219,14 @@
   task uninstall ( description : "Delete ${installDirectory} so as to remove the Gant installation." ) << { ant.delete ( dir : installDirectory ) } 
 }
 
+// =====================================================================
+//
+//  The subprojects compiling the source against specific Groovy version from the Maven repository.
+
 ciBuildTasks = [ ]
 
 forEachDistributionVersion { archivesBaseName ->
-  def groovyVersion = groovyVersions[ archivesBaseName.replace ( artifact + '_groovy' , '' ) ]
+  def groovyVersion = groovyVersions[ archivesBaseName.replace ( artifact + mavenNameExtension , '' ) ]
   project ( archivesBaseName ) {
     usePlugin ( 'maven' )
     dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
@@ -239,53 +251,103 @@
       //  we don't really care since all that happens is that the archive uploading task is not initialized
       //  and if these are not defined you can't upload anyway!
     }
-    scriptsDirectory = '../scripts'
     binCopySpec = copySpec {
+      def scriptsDirectory = '../scripts'
       from ( '..' ) { include ( 'README*' ) }
       into ( 'conf' ) { from ( scriptsDirectory + '/conf' ) { include ( '*.conf' ) } } 
-      into ( 'lib' ) { from ( libsDir ) }
+      into ( 'lib' ) {
+        from ( libsDir )
+        rename ( archivesBaseName + '-' + version , artifact + '-' + version + mavenNameExtension + '-' + groovyVersion )
+      }
       into ( 'bin' ) {
         fileMode = 0755
-        from ( [ scriptsDirectory + '/bin' , scriptsDirectory + '/bin_requiresGroovy' ] )
-        //filter ( ReplaceTokens , tokens : [ GROOVYJAR : 'groovy-' + groovyVersion + '.jar' ] )
+        from ( [ scriptsDirectory + '/bin' , scriptsDirectory + '/bin_requiresGroovy' ] ) {
+          //filter ( ReplaceTokens , tokens : [ GROOVYJAR : 'groovy-' + groovyVersion + '.jar' ] )
+        }
       }
     }
     task binTgz ( type : Tar , dependsOn : 'jar' , description : 'Build the distribution tarball.' ) {
+      baseName = artifact
+      classifier = mavenNameExtension + '-' + groovyVersion
       compression = Compression.GZIP
       into ( gantPrefix ) { from binCopySpec }
     }
     task binZip ( type : Zip , dependsOn : 'jar' , description : 'Build the distribution zip file.' ) {
+      baseName = artifact
+      classifier = mavenNameExtension + '-' + groovyVersion
       into ( gantPrefix ) { from binCopySpec }
     }
-   
-        //tarfileset ( dir : buildInstallDirectory , mode : '755' , prefix : gantPrefix ) { include ( name : 'bin/*' ) }
-        /*
-          tarfileset ( dir : buildInstallDirectory , prefix : gantPrefix ) {
-          include ( name : '**' )
-          exclude ( name : 'bin/*' )
-          }
-        */
   }
   ciBuildTasks << archivesBaseName + ':build'  
+  distributionTasks += [ ':' + archivesBaseName + ':binTgz' , ':' + archivesBaseName + ':binZip' ]
 }
 
+// =====================================================================
+//
+//  Create the standalone distribution.
+
+projectName = 'gant_groovy' + groovyStandaloneSeries
+
+standaloneCopySpec = copySpec {
+  def scriptsDirectory = 'scripts'
+  def projectBase = project ( projectName )
+  from ( '.' ) { include ( 'README*' ) }
+  into ( 'conf' ) { from ( scriptsDirectory + '/conf' ) { include ( '*.conf' ) } } 
+  into ( 'lib' ) {
+    from ( projectBase.libsDir )
+    from ( projectBase.configurations.runtime )
+    from ( 'jarfiles' )
+  }
+  into ( 'bin' ) {
+    fileMode = 0755
+    from ( [ scriptsDirectory + '/bin' , scriptsDirectory + '/bin_standalone' ] ) {
+      //filter ( ReplaceTokens , tokens : [ GROOVYJAR : 'groovy-' + groovyVersions[groovyStandaloneSeries] + '.jar' ] )
+    }
+  }
+}
+
+task standaloneBinTgz ( type : Tar , dependsOn : projectName + ':jar' , description : 'Create a tarball of the standalone distribution.' ) {
+  baseName = artifact
+  version = gantVersion
+  compression = Compression.GZIP
+  destinationDir = buildDir
+  into ( gantPrefix ) { from standaloneCopySpec }
+}
+
+task standaloneBinZip ( type : Zip , dependsOn : projectName + ':jar' , description : 'Create a zip file of the standalone distribution.' ) {
+  baseName = artifact
+  version = gantVersion
+  destinationDir = buildDir
+  into ( gantPrefix ) { from standaloneCopySpec }
+}
+
+distributionTasks += [ standaloneBinTgz , standaloneBinZip ]
+
+// =====================================================================
+//
+//  Create the documentation distribution.
+
 task docTgz ( type : Tar , dependsOn : [ ':gant:javadoc' , ':gant:groovydoc' ] , description : 'Create a tarball of the documentation' ) {
-  baseName = 'gant_doc'
+  baseName = artifact + '_doc'
   version = gantVersion
   compression = Compression.GZIP
   destinationDir = buildDir
-  into ( gantPrefix + '/docs' )
-  from ( project ( ':gant' ).docsDir )
+  into ( gantPrefix + '/docs' ) { from ( project ( ':gant' ).docsDir ) }
 }
 
 task docZip ( type : Zip , dependsOn : [ ':gant:javadoc' , ':gant:groovydoc' ] , description : 'Create a zip file of the documentation' ) {
-  baseName = 'gant_doc'
+  baseName = artifact + '_doc'
   version = gantVersion
   destinationDir = buildDir
-  into ( gantPrefix + '/docs' )
-  from ( project ( ':gant' ).docsDir )
+  into ( gantPrefix + '/docs' ) { from ( project ( ':gant' ).docsDir ) }
 }
 
+distributionTasks += [ docTgz , docZip ]
+
+// =====================================================================
+//
+//  Create the source distribution.
+
 srcContent = [
   'documentation/' , 'examples/' , 'scripts/' , 'jarfiles/' , 'src/' ,
   'build.gradle' , 'settings.gradle' , 'gradlew' ,'gradlew.bat' , 'wrapper/' ,
@@ -293,43 +355,44 @@
   'Gant_Trunk.ipr' , 'Gant_Trunk.iws' ,
   '.classpath' , '.project' , '.settings/' ,
   'LICENCE.txt' ,
-  'README_Distribution.txt' , 'README_Install.txt' ,
+  'README_Install.txt' ,
   'releaseNotes.txt' ,
-  'pom.xml.in' ,
 ]
 
 task srcTgz ( type : Tar , description : 'Create a tarball of the source.' ) {
-  baseName = 'gant_src'
+  baseName = artifact + '_src'
   version = gantVersion
   compression = Compression.GZIP
   destinationDir = buildDir
-  into ( gantPrefix )
-  from ( projectDir ) { srcContent.each { include it } }
+  into ( gantPrefix ) { from ( projectDir ) { srcContent.each { include it } } }
 }
 
 task srcZip ( type : Zip , description : 'Create a zip file of the source.' ) {
-  baseName = 'gant_src'
+  baseName = artifact + '_src'
   version = gantVersion
   destinationDir = buildDir
-  into ( gantPrefix )
-  from ( projectDir ) { srcContent.each { include it } }
+  into ( gantPrefix ) { from ( projectDir ) { srcContent.each { include it } } }
 }
 
+distributionTasks += [ srcTgz , srcZip ]
+
+// =====================================================================
+//
+
 configurations { distribution }
 
-artifacts {
-  distribution srcTgz
-  distribution srcZip
-}
+//artifacts {
+//distributionTasks.each { task -> distribution task }
+//}
 
 dependencies {
   distribution ( 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2' )
 }
 
-distributionTargetList = [ 'docTgz' , 'docZip' , 'srcTgz' , 'srcZip' ]
-forEachDistributionVersion { distributionTargetList += [ ':' + it + ':binTgz' , ':' + it + ':binZip' ] }
+//distributionTargetList = [ 'docTgz' , 'docZip' , 'srcTgz' , 'srcZip' ]
+//forEachDistributionVersion { distributionTargetList += [ ':' + it + ':binTgz' , ':' + it + ':binZip' ] }
 
-task buildDistribution ( dependsOn : distributionTargetList )
+task buildDistribution ( dependsOn : distributionTasks )
 
 task ciBuild ( description : 'Run just the builds that use Groovy from the Maven repository.  Used mainly on CI servers.' , dependsOn : ciBuildTasks )

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10482] gant/trunk: Add the top-level project build directory to the clobber list.

2009-12-17T11:47:29Z

[10482] gant/trunk: Add the top-level project build directory to the clobber list.

Revision: 10482
Author: russel
Date: 2009-12-17 13:47:28 -0600 (Thu, 17 Dec 2009)

Log Message

Add the top-level project build directory to the clobber list.

Modified Paths

gant/trunk/build.gradle

Removed Paths

gant/trunk/lib/

Diff

Modified: gant/trunk/build.gradle (10481 => 10482)

--- gant/trunk/build.gradle	2009-12-17 19:47:22 UTC (rev 10481)
+++ gant/trunk/build.gradle	2009-12-17 19:47:28 UTC (rev 10482)
@@ -340,6 +340,7 @@
 
 task clobber ( description : 'Do a really detailed clean.' ) << {
   forEachProject { item -> ant.delete ( dir : item ) }
+  ant.delete ( dir : buildDir )
   ant.delete { fileset ( dir : '.' , includes : 'texput.log,**/*~,' + groovyAntTaskTestVersionPropertyFile.name ) }
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10481] gant/trunk/build.gradle: Sever reworking of the Gradle build file leading towards creating the Gant distribution.

2009-12-17T11:47:23Z

[10481] gant/trunk/build.gradle: Sever reworking of the Gradle build file leading towards creating the Gant distribution.

Revision: 10481
Author: russel
Date: 2009-12-17 13:47:22 -0600 (Thu, 17 Dec 2009)

Log Message

Sever reworking of the Gradle build file leading towards creating the Gant distribution.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10480 => 10481)

--- gant/trunk/build.gradle	2009-12-17 19:47:18 UTC (rev 10480)
+++ gant/trunk/build.gradle	2009-12-17 19:47:22 UTC (rev 10481)
@@ -16,7 +16,11 @@
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
+group =  'org.codehaus.gant'
+artifact = 'gant'
+
 gantVersion = '1.9.0-SNAPSHOT'
+gantPrefix = artifact + '-' + gantVersion
 
 //  Nominate for each supported series of Groovy, exactly which version to use.
 
@@ -25,25 +29,27 @@
   '1.7' : '1.7-rc-2'
 ]
 
-//  This is the version to use for all self-contained builds -- this version of Groovy will be packaged with
-//  Gant.  It should be the latest widely available version of Groovy.
+//  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 version of Groovy.
 
-groovyStandaloneVersion = groovyVersions['1.6']
+groovyStandaloneSeries = '1.6'
 
+//  In order to communicate the version of Groovy being used for a particular test to the Gant Ant task
+//  test, a file has to be written with the Groovy version number clearly stated.  Ensure correct data
+//  coupling between this and src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml.
+
 def groovyAntTaskTestVersionPropertyFileContent = 'groovyAntTaskTestVersion =  '
 def groovyAntTaskTestVersionPropertyFile = new File ( 'groovyAntTaskTestVersion.properties' )
 
 //  Organize the build using subprojects.  There is a subproject gant which is for the build using the
-//  locally installed Groovy and then there is one for each version of Groovy obtained from the Maven
-//  repository that is supported.  These functions ease doing the iteration over all the subprojects.  NB
-//  Gradle requires the directories for each of the subprojects to exist.  There is an assumption that each
+//  locally installed Groovy and there is one for each version of Groovy obtained from the Maven repository
+//  that is supported.  These functions ease doing the iteration over all the subprojects.  NB Gradle
+//  requires the directories for each of the subprojects to exist.  There is an assumption that each
 //  subproject has its own source, etc.  This build slightly perverts the general approach by using exactly
 //  the same source for each subproject, the only difference is the version of Groovy used for compilation.
 
 def forEachDistributionVersion ( Closure c ) {
-  //  NB use here the list of Groovy series supported, and ensure the same string uis used as there are keys
-  //  in the groovyVersions map above.
-  for ( String s : [ '1.6' , '1.7' ] ) { c ( 'gant_groovy' + s ) }
+  for ( String s : groovyVersions.keySet ( ) ) { c ( 'gant_groovy' + s ) }
 }
   
 def forEachProject ( Closure c ) {
@@ -53,24 +59,16 @@
 
 forEachProject { item ->  if ( ! ( new File ( item ) ).isDirectory ( ) ) { ant.mkdir ( dir : item ) } }
 
-//  Keep track of all the build products that need to be uploaded as part of the distribution.
-
-distributionUploadList = [ ]
-
 allprojects {
-  group =  'org.codehaus.gant'
-  artifact = 'gant'
   version = gantVersion
-}  
+}
 
 subprojects {
   usePlugin ( 'groovy' )
   usePlugin ( 'osgi' )
   sourceCompatibility = 5
   targetCompatibility = 5
-  configurations {
-    deployJars
- }
+  configurations { deployJars }
   sourceSets {
     //  NB All the subprojects are actually using the same source code and this is in a different place so
     //  the location of the source must be specified explicitly.
@@ -89,10 +87,10 @@
     instruction 'Built-By' , System.properties.'user.name'
     instruction 'Extension-Name' , artifact
     instruction 'Specification-Title' , theTitle
-    instruction 'Specification-Version' , version
+    instruction 'Specification-Version' , gantVersion
     instruction 'Specification-Vendor' , theVendor
     instruction 'Implementation-Title' , theTitle
-    instruction 'Implementation-Version' , version
+    instruction 'Implementation-Version' , gantVersion
     instruction'Implementation-Vendor' , theVendor
   }
   repositories {
@@ -129,7 +127,7 @@
   }
   //task integTest ( type : AntTest , description : 'Run the integration tests.' ) {
   //}
-  def packageTitle = 'Gant ' + version
+  def packageTitle = 'Gant ' + gantVersion
   def copyrightString = 'Copyright &#169; 2006&#8211;9  The Codehaus.  All Rights Reserved.'
   javadoc {
     options.overview ( 'overview.html' )
@@ -182,7 +180,7 @@
     versionMessage = 'Using Groovy version ' + groovyVersion + ' from ' + groovyHome
   }
   else {
-    groovyVersion = groovyStandaloneVersion
+    groovyVersion = groovyVersions[groovyStandaloneSeries]
     versionMessage = 'Using Groovy version ' + groovyVersion
   }
   archivesBaseName = artifact
@@ -210,73 +208,7 @@
       from ( [ 'build/libs' , '../jarfiles' ] )
     }
   }
-  task uninstall ( description : "Delete ${installDirectory} so as to remove the Gant installation." ) << { ant.delete ( dir : installDirectory ) }
-  //
-  gantPrefix = 'gant-' + version
-  binDistRoot = distsDir.path + '/' + gantPrefix
-  binTarPath = binDistRoot + '.tar'
-  binTgzPath = binDistRoot + '.tgz'
-  binZipPath = binDistRoot + '.zip'
-  distributionUploadList += [ binTgzPath , binZipPath ]
-  task tarBin ( dependsOn : 'jar' ) << {
-    ant.mkdir ( dir : distsDir )
-    ant.tar ( destfile : binTarPath ) {
-      //tarfileset ( dir : buildInstallDirectory , mode : '755' , prefix : gantPrefix ) { include ( name : 'bin/*' ) }
-      /*
-      tarfileset ( dir : buildInstallDirectory , prefix : gantPrefix ) {
-        include ( name : '**' )
-        exclude ( name : 'bin/*' )
-      }
-      */
-      tarfileset ( dir : libsDir , includes : '*.jar' , prefix : gantPrefix + System.properties.'file.separator' + 'lib' )
-      tarfileset ( dir : '../scripts/conf' , includes : '*.conf' , prefix : gantPrefix + System.properties.'file.separator' + 'conf' )
-      tarfileset ( dir : '..' , includes : 'README*' , prefix : gantPrefix )
-    }
-  }
-  task zipBin ( dependsOn : tarBin ) << {
-    ant.zip ( destfile : binZipPath ) { tarfileset ( src : binTarPath ) }
-  }
-  //
-  docDistRoot = distsDir.path + '/gant_doc-' + version
-  docTarPath = docDistRoot + '.tar'
-  docTgzPath = docDistRoot + '.tgz'
-  docZipPath = docDistRoot + '.zip'
-  distributionUploadList += [ docTgzPath , docZipPath ]
-  task tarDoc ( dependsOn: documentation) << {
-    ant.mkdir ( dir : distsDir )
-    ant.tar ( destfile : docTarPath ) {
-      tarfileset ( dir : docsDir , prefix : gantPrefix + System.properties.'file.separator' + 'doc' )
-    }
-    ant.gzip ( src : docTarPath , destfile : docTgzPath )
-  }
-  task zipDoc ( dependsOn : tarDoc ) << {
-    ant.zip ( destfile : docZipPath ) { tarfileset ( src : docTarPath ) }
-  }
-  srcDistRoot = distsDir.path + '/gant_src-' + version
-  srcTarPath = srcDistRoot + '.tar'
-  srcTgzPath = srcDistRoot + '.tgz'
-  srcZipPath = srcDistRoot + '.zip'
-  distributionUploadList += [ srcTgzPath , srcZipPath ]
-  task tarSrc << {
-    ant.mkdir ( dir : distsDir )
-    ant.tar ( destfile : srcTarPath ) {
-      tarfileset ( dir : '..' , includes : [
-                     'build.gant' , 'buildMaven.gant' , 'build.properties' , 'build.xml' ,
-                     '.classpath' , '.project' ,
-                     'LICENCE.txt' ,
-                     'README_Distribution.txt' , 'README_Install.txt' ,
-                     'releaseNotes.txt'
-                   ].join ( ',' ) , prefix : gantPrefix )
-      [ 'documentation' , 'examples' , '.settings' , 'scripts' , 'jarfiles' , 'src/main/groovy' , 'src/test/groovy' ].each { directory ->
-        tarfileset ( dir : '../' + directory , prefix : gantPrefix + System.properties.'file.separator' + directory )
-      }
-    }
-    ant.gzip ( src : srcTarPath , destfile : srcTgzPath )
-  }
-  task zipSrc ( dependsOn : tarSrc ) << {
-    ant.zip ( destfile : srcZipPath ) { tarfileset ( src : srcTarPath ) }
-  }
-  task prepareDistribution ( dependsOn : [ tarDoc , zipDoc , tarSrc , zipSrc ] ) << { }
+  task uninstall ( description : "Delete ${installDirectory} so as to remove the Gant installation." ) << { ant.delete ( dir : installDirectory ) } 
 }
 
 ciBuildTasks = [ ]
@@ -303,14 +235,102 @@
       }
     }
     catch ( Exception e ) {
-      // If the gant_repoUserName and/or gant_repoPassword are not defined then there will be an exception,
-      // but we don't really care since all that happens is that the archive uploading task is not
-      // initialized and if these are not defined you can;t upload anyway!
+      //  If gant_repoUserName and/or gant_repoPassword are not defined then there will be an exception, but
+      //  we don't really care since all that happens is that the archive uploading task is not initialized
+      //  and if these are not defined you can't upload anyway!
     }
+    scriptsDirectory = '../scripts'
+    binCopySpec = copySpec {
+      from ( '..' ) { include ( 'README*' ) }
+      into ( 'conf' ) { from ( scriptsDirectory + '/conf' ) { include ( '*.conf' ) } } 
+      into ( 'lib' ) { from ( libsDir ) }
+      into ( 'bin' ) {
+        fileMode = 0755
+        from ( [ scriptsDirectory + '/bin' , scriptsDirectory + '/bin_requiresGroovy' ] )
+        //filter ( ReplaceTokens , tokens : [ GROOVYJAR : 'groovy-' + groovyVersion + '.jar' ] )
+      }
+    }
+    task binTgz ( type : Tar , dependsOn : 'jar' , description : 'Build the distribution tarball.' ) {
+      compression = Compression.GZIP
+      into ( gantPrefix ) { from binCopySpec }
+    }
+    task binZip ( type : Zip , dependsOn : 'jar' , description : 'Build the distribution zip file.' ) {
+      into ( gantPrefix ) { from binCopySpec }
+    }
+   
+        //tarfileset ( dir : buildInstallDirectory , mode : '755' , prefix : gantPrefix ) { include ( name : 'bin/*' ) }
+        /*
+          tarfileset ( dir : buildInstallDirectory , prefix : gantPrefix ) {
+          include ( name : '**' )
+          exclude ( name : 'bin/*' )
+          }
+        */
   }
-  ciBuildTasks << archivesBaseName + ':build'
+  ciBuildTasks << archivesBaseName + ':build'  
 }
 
+task docTgz ( type : Tar , dependsOn : [ ':gant:javadoc' , ':gant:groovydoc' ] , description : 'Create a tarball of the documentation' ) {
+  baseName = 'gant_doc'
+  version = gantVersion
+  compression = Compression.GZIP
+  destinationDir = buildDir
+  into ( gantPrefix + '/docs' )
+  from ( project ( ':gant' ).docsDir )
+}
+
+task docZip ( type : Zip , dependsOn : [ ':gant:javadoc' , ':gant:groovydoc' ] , description : 'Create a zip file of the documentation' ) {
+  baseName = 'gant_doc'
+  version = gantVersion
+  destinationDir = buildDir
+  into ( gantPrefix + '/docs' )
+  from ( project ( ':gant' ).docsDir )
+}
+
+srcContent = [
+  'documentation/' , 'examples/' , 'scripts/' , 'jarfiles/' , 'src/' ,
+  'build.gradle' , 'settings.gradle' , 'gradlew' ,'gradlew.bat' , 'wrapper/' ,
+  'ciBuild' ,
+  'Gant_Trunk.ipr' , 'Gant_Trunk.iws' ,
+  '.classpath' , '.project' , '.settings/' ,
+  'LICENCE.txt' ,
+  'README_Distribution.txt' , 'README_Install.txt' ,
+  'releaseNotes.txt' ,
+  'pom.xml.in' ,
+]
+
+task srcTgz ( type : Tar , description : 'Create a tarball of the source.' ) {
+  baseName = 'gant_src'
+  version = gantVersion
+  compression = Compression.GZIP
+  destinationDir = buildDir
+  into ( gantPrefix )
+  from ( projectDir ) { srcContent.each { include it } }
+}
+
+task srcZip ( type : Zip , description : 'Create a zip file of the source.' ) {
+  baseName = 'gant_src'
+  version = gantVersion
+  destinationDir = buildDir
+  into ( gantPrefix )
+  from ( projectDir ) { srcContent.each { include it } }
+}
+
+configurations { distribution }
+
+artifacts {
+  distribution srcTgz
+  distribution srcZip
+}
+
+dependencies {
+  distribution ( 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2' )
+}
+
+distributionTargetList = [ 'docTgz' , 'docZip' , 'srcTgz' , 'srcZip' ]
+forEachDistributionVersion { distributionTargetList += [ ':' + it + ':binTgz' , ':' + it + ':binZip' ] }
+
+task buildDistribution ( dependsOn : distributionTargetList )
+
 task ciBuild ( description : 'Run just the builds that use Groovy from the Maven repository.  Used mainly on CI servers.' , dependsOn : ciBuildTasks )
 
 task wrapper ( type : Wrapper ) {
@@ -322,3 +342,4 @@
   forEachProject { item -> ant.delete ( dir : item ) }
   ant.delete { fileset ( dir : '.' , includes : 'texput.log,**/*~,' + groovyAntTaskTestVersionPropertyFile.name ) }
 }
+

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10480] gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml: Add an advisory comment.

2009-12-17T11:47:18Z

[10480] gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml: Add an advisory comment.

Revision: 10480
Author: russel
Date: 2009-12-17 13:47:18 -0600 (Thu, 17 Dec 2009)

Log Message

Add an advisory comment.

Modified Paths

gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml

Diff

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml (10479 => 10480)

--- gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml	2009-12-17 19:47:13 UTC (rev 10479)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml	2009-12-17 19:47:18 UTC (rev 10480)
@@ -46,6 +46,7 @@
       <fileset dir="${toplevelDirectory}/jarfiles" includes="maven-ant-tasks-*.jar"/>
     </path>
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
+    <!-- NB Make sure the literal data here is consistent with that in the build.gradle file at the project level. -->
     <property file="${toplevelDirectory}/groovyAntTaskTestVersion.properties"/>
     <artifact:dependencies pathId="groovyJarsId">
       <dependency groupId="org.codehaus.groovy" artifactId="groovy-all" version="${groovyAntTaskTestVersion}"/>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10479] gant/trunk/releaseNotes.txt: Update teh release notes a bit.

2009-12-17T11:47:14Z

[10479] gant/trunk/releaseNotes.txt: Update teh release notes a bit.

Revision: 10479
Author: russel
Date: 2009-12-17 13:47:13 -0600 (Thu, 17 Dec 2009)

Log Message

Update teh release notes a bit.

Modified Paths

gant/trunk/releaseNotes.txt

Diff

Modified: gant/trunk/releaseNotes.txt (10478 => 10479)

--- gant/trunk/releaseNotes.txt	2009-12-17 19:47:09 UTC (rev 10478)
+++ gant/trunk/releaseNotes.txt	2009-12-17 19:47:13 UTC (rev 10479)
@@ -17,7 +17,10 @@
 
 Updated to Groovy 1.7-rc-2 for Groovy 1.7.x and Groovy 1.6.7 for Groovy 1.6.x.
 
+Switch from using Ant as a boostrap and then Gant to manage the project to using Gradle for all build and
+install activity.
 
+
 1.8.1
 -----

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10478] gant/trunk/README_Install.txt: Update the installation notes.

2009-12-17T11:47:09Z

[10478] gant/trunk/README_Install.txt: Update the installation notes.

Revision: 10478
Author: russel
Date: 2009-12-17 13:47:09 -0600 (Thu, 17 Dec 2009)

Log Message

Update the installation notes.

Modified Paths

gant/trunk/README_Install.txt

Diff

Modified: gant/trunk/README_Install.txt (10477 => 10478)

--- gant/trunk/README_Install.txt	2009-12-17 19:47:04 UTC (rev 10477)
+++ gant/trunk/README_Install.txt	2009-12-17 19:47:09 UTC (rev 10478)
@@ -3,8 +3,8 @@
 This is Gant, a Groovy way of working with Ant tasks -- no more XML :-)
 
 The method of installation depends on whether you have downloaded a tarball or
-zipfile distribution, or you have a Bazaar branch or a Subversion store
-checkout (or even a Git clone of the Subversion repository).
+zipfile distribution, or you have a Bazaar branch -- or a Subversion checkout,
+or even a Git clone -- of the source.
 
 Distribution
 ------------
@@ -18,11 +18,10 @@
 There are a number of distinct distributions:
 
           1.  Requires a separate Groovy installation.  There are builds:
-                a.  compiled against Groovy 1.5.8;
-                b.  compiled against Groovy 1.6.5; and
-                c.  compiled against Groovy 1.7-beta-2.
+                a.  compiled against Groovy 1.6.7; and
+                b.  compiled against Groovy 1.7-rc-2.
 
-            2.  Self-contained, includes all dependent jars.
+          2.  Self-contained, includes all dependent jars.
 
 You might like to set up an environment variable GANT_HOME set to the
 directory created by the untar or unzip, though this is not essential, it is
@@ -31,23 +30,29 @@
 The script $GANT_HOME/bin/gant for systems with a Posix shell, or
 $GANT_HOME/bin/gant.bat on Windows is the mechanism for launching a Gant run.
 
+Distributions 1a and 1b only include the direct Gant materials.  The Maven
+target set depends on use of the Maven Ant tasks, and the Ivy tool depends on
+the Ivy jar, these will have to be downloaded and installed into
+$GANT_HOME/lib unless they are already available on on your CLASSPATH.
+
 Using a Bazaar Branch
 ---------------------
 
 You first need to get a source tree.  Bazaar is the version control system
-used for developing Gant.  The master branch is held in a Subversion
-repository at Codehaus, but there is also a mirror held at Launchpad so you
-can do either:
+used for developing Gant.  For reasons that are unlikely to become apparent
+quickly, the master branch is actually held in the Subversion repository at
+Codehaus.  However the effective mainline is a branch on Launchpad.  So to get
+a branch:
 
-        bzr branch http://svn.codehaus.org/gant/gant/trunk Gant_Trunk
+        bzr branch lp:gant Gant_Trunk
 
 or
 
-        bzr branch lp:gant Gant_Trunk
+        bzr branch http://svn.codehaus.org/gant/gant/trunk Gant_Trunk
 
-to get a branch.  (If you are going to actively develop Gant, you almost
-certainly want to have a shared repository in which this mirror branch is kept
-so that you can then make feature branches from it.)
+(If you are going to actively develop Gant, you almost certainly want to have
+a shared repository in which this mirror branch is kept so that you can then
+make feature branches from it.)
 
 Gradle is used as the build system for Gant, so you will need to set the
 gant_installPath property in ~/.gradle/gradle.properties so you can install
@@ -57,12 +62,17 @@
 
 Then you type:
 
-     ./gradlew gant:install
+     ./gradlew :gant:install
 
-and all the necessary magic happens.  You probably want to set the GROOVY_HOME
-environment variable to point at the Groovy installation that the Gant
-installation is to work with.
+and all the necessary magic happens.  The first time you use the Gradle
+Wrapper, it will connect to the Internet to download the various jars that
+comprise Gradle.  This takes a while.  However this is only needed the first
+time, thereafter it uses the version you downloaded.
 
+
+You probably want to set the GROOVY_HOME environment variable to point at the
+Groovy installation that the Gant installation is to work with.
+
 Contact
 -------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10477] gant/trunk/README_Tests.txt: Having removed Groovy 1.5.x support, most of this file is redundant.

2009-12-17T11:47:04Z

[10477] gant/trunk/README_Tests.txt: Having removed Groovy 1.5.x support, most of this file is redundant.

Revision: 10477
Author: russel
Date: 2009-12-17 13:47:04 -0600 (Thu, 17 Dec 2009)

Log Message

Having removed Groovy 1.5.x support, most of this file is redundant.

Removed Paths

gant/trunk/README_Tests.txt

Diff

Deleted: gant/trunk/README_Tests.txt (10476 => 10477)

--- gant/trunk/README_Tests.txt	2009-12-17 00:11:07 UTC (rev 10476)
+++ gant/trunk/README_Tests.txt	2009-12-17 19:47:04 UTC (rev 10477)
@@ -1,25 +0,0 @@
-There are trivial and yet breaking changes to the way in which things
-are output in Groovy 1.6.x compared to Groovy 1.5.x.  In particular,
-strings in lists are no longer embedded in double quotes on output --
-this makes things more harmonious with the way Java does things -- and
-the groovyc task no longer issues the message "No sources to compile"
-when there are no sources to compile.  Sadly, it means some of the
-Gant tests have to distinguish which version of Groovy is being used.
-If support for Groovy 1.5.x is removed then this code must be reviewed
-and the special code removed.
-
-The Gant Ant task tests requires the Ant XML scripts to have access to
-the org.codehaus.gant.ant.Gant class.  This means the path to the
-class has to be known.  Currently the Ant/Gant build compilation
-products are used.  This has "quite interesting" consequences: in
-particular, the Eclipse, NetBeans, IntelliJ IDEA and Gradle builds put
-the compilation products in their own private places.  Unless the
-Ant/Gant build is created as well then these other builds will fail a
-number of the org.codehaus.gant.ant.tests.Gant_Test tests.  Moreover,
-both the product classes and the test classes must be built and
-available, the Gant script tests relay on being able to access the
-Gant_Test class.
-
-;;; Local Variables: ***
-;;; fill-column: 78 ***
-;;; End: ***

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10476] gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests: Change the way the data coupling between top-level build spec and the Ant task tests occurs.

2009-12-16T16:11:07Z

[10476] gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests: Change the way the data coupling between top-level build spec and the Ant task tests occurs.

Revision: 10476
Author: russel
Date: 2009-12-16 18:11:07 -0600 (Wed, 16 Dec 2009)

Log Message

Change the way the data coupling between top-level build spec and the Ant task tests occurs.

Modified Paths

gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/build.gant
gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml

Diff

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/build.gant (10475 => 10476)

--- gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/build.gant	2009-12-16 21:49:21 UTC (rev 10475)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/build.gant	2009-12-17 00:11:07 UTC (rev 10476)
@@ -16,9 +16,6 @@
 
 ant.property ( file : 'build.properties' )
 
-ant.property ( file : toplevelDirectory + '/local.build.properties' )
-ant.property ( file : toplevelDirectory + '/gradle.properties' )
-
 //// This build file has to work in two contexts.  If GROOVY_HOME is set in the environment then the jars
 //// from that installation of Groovy should be used so as to ensure testing in the right context.  If the
 //// environment does not have a GROOVY_HOME set then grab some specific versions to make things work.

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml (10475 => 10476)

--- gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml	2009-12-16 21:49:21 UTC (rev 10475)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/ant/tests/commonBits.xml	2009-12-17 00:11:07 UTC (rev 10476)
@@ -21,7 +21,6 @@
 <project name="Common Ant File Bits for Gant Ant Task Test" xmlns:artifact="urn:maven-artifact-ant" basedir="." >
 
   <property file="build.properties"/>
-  <property file="${toplevelDirectory}/gradle.properties"/>
 
   <property environment="environment"/>
 
@@ -47,7 +46,7 @@
       <fileset dir="${toplevelDirectory}/jarfiles" includes="maven-ant-tasks-*.jar"/>
     </path>
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
-    <property file="${toplevelDirectory}/${groovyAntTaskTestVersionPropertyFileName}"/>
+    <property file="${toplevelDirectory}/groovyAntTaskTestVersion.properties"/>
     <artifact:dependencies pathId="groovyJarsId">
       <dependency groupId="org.codehaus.groovy" artifactId="groovy-all" version="${groovyAntTaskTestVersion}"/>
     </artifact:dependencies>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10475] gant/trunk/build.gradle: Experiment to see if catching the exception solves the problem on Bamboo.

2009-12-16T13:49:22Z

[10475] gant/trunk/build.gradle: Experiment to see if catching the exception solves the problem on Bamboo.

Revision: 10475
Author: russel
Date: 2009-12-16 15:49:21 -0600 (Wed, 16 Dec 2009)

Log Message

Experiment to see if catching the exception solves the problem on Bamboo.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10474 => 10475)

--- gant/trunk/build.gradle	2009-12-16 21:27:55 UTC (rev 10474)
+++ gant/trunk/build.gradle	2009-12-16 21:49:21 UTC (rev 10475)
@@ -288,18 +288,25 @@
     dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
     compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
     test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( groovyAntTaskTestVersionPropertyFileContent + groovyVersion ) }
-    uploadArchives {
-      repositories.mavenDeployer {
-        uniqueVersion = false
-        configuration = configurations.deployJars
-        repository ( url : 'https://dav.codehaus.org/repository/gant' ) {
-          authentication ( userName : gant_repoUserName , password : gant_repoPassword )
-        }
-        snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' ){
+    try {
+      uploadArchives {
+        repositories.mavenDeployer {
+          uniqueVersion = false
+          configuration = configurations.deployJars
+          repository ( url : 'https://dav.codehaus.org/repository/gant' ) {
+            authentication ( userName : gant_repoUserName , password : gant_repoPassword )
+          }
+          snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' ) {
             authentication ( userName: gant_repoUserName , password : gant_repoPassword )
+          }
         }
       }
     }
+    catch ( Exception e ) {
+      // If the gant_repoUserName and/or gant_repoPassword are not defined then there will be an exception,
+      // but we don't really care since all that happens is that the archive uploading task is not
+      // initialized and if these are not defined you can;t upload anyway!
+    }
   }
   ciBuildTasks << archivesBaseName + ':build'
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10474] gant/trunk/build.gradle: Improve the handling of the Groovy version specification.

2009-12-16T13:27:57Z

[10474] gant/trunk/build.gradle: Improve the handling of the Groovy version specification.

Revision: 10474
Author: russel
Date: 2009-12-16 15:27:55 -0600 (Wed, 16 Dec 2009)

Log Message

Improve the handling of the Groovy version specification.
Various bits of tidying up.
Adding the beginnings of the distribution builds.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10473 => 10474)

--- gant/trunk/build.gradle	2009-12-16 10:48:47 UTC (rev 10473)
+++ gant/trunk/build.gradle	2009-12-16 21:27:55 UTC (rev 10474)
@@ -18,28 +18,18 @@
 
 gantVersion = '1.9.0-SNAPSHOT'
 
-//  This should be a list of all the currently published versions of Groovy.  Addition to or deletion from
-//  the list of items here will need a consistent change throughout.
+//  Nominate for each supported series of Groovy, exactly which version to use.
 
-groovy16Version = '1.6.7'
-groovy17Version = '1.7-rc-2'
+groovyVersions = [
+  '1.6' : '1.6.7' ,
+  '1.7' : '1.7-rc-2'
+]
 
 //  This is the version to use for all self-contained builds -- this version of Groovy will be packaged with
 //  Gant.  It should be the latest widely available version of Groovy.
 
-groovyStandaloneVersion = groovy16Version
+groovyStandaloneVersion = groovyVersions['1.6']
 
-//  Should always use the same versions of things as Groovy uses.  There perhaps ought to be a way of not
-//  specifying these by discovering which version Groovy uses and then using that. 
-
-junitVersion = '4.7'
-commonsCliVersion = '1.2'
-ivyVersion = '2.1.0'
-antVersion = '1.7.1'
-mavenAntTaskVersion = '2.0.10'
-bndVersion = '0.0.380'
-coberturaVersion = '1.9'
-
 def groovyAntTaskTestVersionPropertyFileContent = 'groovyAntTaskTestVersion =  '
 def groovyAntTaskTestVersionPropertyFile = new File ( 'groovyAntTaskTestVersion.properties' )
 
@@ -51,6 +41,8 @@
 //  the same source for each subproject, the only difference is the version of Groovy used for compilation.
 
 def forEachDistributionVersion ( Closure c ) {
+  //  NB use here the list of Groovy series supported, and ensure the same string uis used as there are keys
+  //  in the groovyVersions map above.
   for ( String s : [ '1.6' , '1.7' ] ) { c ( 'gant_groovy' + s ) }
 }
   
@@ -61,6 +53,10 @@
 
 forEachProject { item ->  if ( ! ( new File ( item ) ).isDirectory ( ) ) { ant.mkdir ( dir : item ) } }
 
+//  Keep track of all the build products that need to be uploaded as part of the distribution.
+
+distributionUploadList = [ ]
+
 allprojects {
   group =  'org.codehaus.gant'
   artifact = 'gant'
@@ -105,11 +101,11 @@
   }
   dependencies {
     compile (
-             'commons-cli:commons-cli:' + commonsCliVersion ,
-             'org.apache.ant:ant:' + antVersion
+             'commons-cli:commons-cli:1.2' ,
+             'org.apache.ant:ant:1.7.1'
              )
-    testCompile ( 'junit:junit:' + junitVersion )
-    testRuntime ( 'org.apache.ivy:ivy:' + ivyVersion )
+    testCompile ( 'junit:junit:4.7' )
+    testRuntime ( 'org.apache.ivy:ivy:2.1.0' )
     deployJars ( 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2' )
   }
   compileGroovy.options.compilerArgs = ['-Xlint']
@@ -167,14 +163,6 @@
     footer = copyrightString
   }
   task documentation ( dependsOn: [ 'javadoc' , 'groovydoc' ] , description : 'Create the API documentation.' )
-  task zipDoc ( type : Zip , dependsOn : documentation ) {
-    appendix = 'docs'
-    from ( docsDir )
-  }
-  task zipSrc ( type : Zip ) {
-    appendix = 'src'
-    from ( sourceSets.main.allSource )
-  }
   defaultTasks ( 'build' ) 
 }
 
@@ -191,15 +179,15 @@
     groovyVersion = ( items[0].name =~ groovyVersionPatternString )[0][2]
     assert groovyVersion
     repositories { flatDir ( name : 'groovyInstallation' , dirs : [ new File ( groovyHome , 'embeddable' ) , groovyLib ] ) }
-    println ( "# :gant -- using Groovy version ${groovyVersion} from ${groovyHome}." )
+    versionMessage = 'Using Groovy version ' + groovyVersion + ' from ' + groovyHome
   }
   else {
     groovyVersion = groovyStandaloneVersion
-    println ( "# :gant -- assuming Groovy version ${groovyVersion} is to be used." )
+    versionMessage = 'Using Groovy version ' + groovyVersion
   }
   archivesBaseName = artifact
   dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
-  compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
+  compileGroovy.doFirst { println ( '\n\t' + versionMessage +'\n' ) }
   test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( groovyAntTaskTestVersionPropertyFileContent + groovyVersion ) }
   def  installDirectory = '/usr/share/gant'
   try { installDirectory = evaluate ( '"' + gant_installPath + '"' ) }
@@ -223,12 +211,78 @@
     }
   }
   task uninstall ( description : "Delete ${installDirectory} so as to remove the Gant installation." ) << { ant.delete ( dir : installDirectory ) }
+  //
+  gantPrefix = 'gant-' + version
+  binDistRoot = distsDir.path + '/' + gantPrefix
+  binTarPath = binDistRoot + '.tar'
+  binTgzPath = binDistRoot + '.tgz'
+  binZipPath = binDistRoot + '.zip'
+  distributionUploadList += [ binTgzPath , binZipPath ]
+  task tarBin ( dependsOn : 'jar' ) << {
+    ant.mkdir ( dir : distsDir )
+    ant.tar ( destfile : binTarPath ) {
+      //tarfileset ( dir : buildInstallDirectory , mode : '755' , prefix : gantPrefix ) { include ( name : 'bin/*' ) }
+      /*
+      tarfileset ( dir : buildInstallDirectory , prefix : gantPrefix ) {
+        include ( name : '**' )
+        exclude ( name : 'bin/*' )
+      }
+      */
+      tarfileset ( dir : libsDir , includes : '*.jar' , prefix : gantPrefix + System.properties.'file.separator' + 'lib' )
+      tarfileset ( dir : '../scripts/conf' , includes : '*.conf' , prefix : gantPrefix + System.properties.'file.separator' + 'conf' )
+      tarfileset ( dir : '..' , includes : 'README*' , prefix : gantPrefix )
+    }
+  }
+  task zipBin ( dependsOn : tarBin ) << {
+    ant.zip ( destfile : binZipPath ) { tarfileset ( src : binTarPath ) }
+  }
+  //
+  docDistRoot = distsDir.path + '/gant_doc-' + version
+  docTarPath = docDistRoot + '.tar'
+  docTgzPath = docDistRoot + '.tgz'
+  docZipPath = docDistRoot + '.zip'
+  distributionUploadList += [ docTgzPath , docZipPath ]
+  task tarDoc ( dependsOn: documentation) << {
+    ant.mkdir ( dir : distsDir )
+    ant.tar ( destfile : docTarPath ) {
+      tarfileset ( dir : docsDir , prefix : gantPrefix + System.properties.'file.separator' + 'doc' )
+    }
+    ant.gzip ( src : docTarPath , destfile : docTgzPath )
+  }
+  task zipDoc ( dependsOn : tarDoc ) << {
+    ant.zip ( destfile : docZipPath ) { tarfileset ( src : docTarPath ) }
+  }
+  srcDistRoot = distsDir.path + '/gant_src-' + version
+  srcTarPath = srcDistRoot + '.tar'
+  srcTgzPath = srcDistRoot + '.tgz'
+  srcZipPath = srcDistRoot + '.zip'
+  distributionUploadList += [ srcTgzPath , srcZipPath ]
+  task tarSrc << {
+    ant.mkdir ( dir : distsDir )
+    ant.tar ( destfile : srcTarPath ) {
+      tarfileset ( dir : '..' , includes : [
+                     'build.gant' , 'buildMaven.gant' , 'build.properties' , 'build.xml' ,
+                     '.classpath' , '.project' ,
+                     'LICENCE.txt' ,
+                     'README_Distribution.txt' , 'README_Install.txt' ,
+                     'releaseNotes.txt'
+                   ].join ( ',' ) , prefix : gantPrefix )
+      [ 'documentation' , 'examples' , '.settings' , 'scripts' , 'jarfiles' , 'src/main/groovy' , 'src/test/groovy' ].each { directory ->
+        tarfileset ( dir : '../' + directory , prefix : gantPrefix + System.properties.'file.separator' + directory )
+      }
+    }
+    ant.gzip ( src : srcTarPath , destfile : srcTgzPath )
+  }
+  task zipSrc ( dependsOn : tarSrc ) << {
+    ant.zip ( destfile : srcZipPath ) { tarfileset ( src : srcTarPath ) }
+  }
+  task prepareDistribution ( dependsOn : [ tarDoc , zipDoc , tarSrc , zipSrc ] ) << { }
 }
 
 ciBuildTasks = [ ]
 
 forEachDistributionVersion { archivesBaseName ->
-  def groovyVersion = getProperty ( archivesBaseName.replace ( artifact + '_' , '' ).replace ( '.' , '' ) + 'Version' )
+  def groovyVersion = groovyVersions[ archivesBaseName.replace ( artifact + '_groovy' , '' ) ]
   project ( archivesBaseName ) {
     usePlugin ( 'maven' )
     dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

Re: Supported Groovy versions

2009-12-16T09:22:23Z

On Wed, 2009-12-16 at 08:37 +0000, Russel Winder wrote:
> To date whenever there has been a Gant release, versions have been
> released compiled against Groovys 1.5.x, 1.6.x and 1.7.x. With the
> release of Gant 1.9.0 -- which will happen with the release of Groovy
> 1.7.0 -- I am proposing not to make a release of Gant compiled against
> Groovy 1.5.8, i.e. I propose to drop all support for Groovy 1.5.x.
>
> Is this a reasonable position to take?

Three people have indicated a preference to allow support for Groovy 1.5
to die. This therefore represents a majority approval nem con. All
support for Groovy's earlier than 1.6.0 has now been removed from the
Gant source. It only affects the testing code, but it is now a lot
neater :-)

--
Russel.
=============================================================================
Dr Russel Winder Partner
xmpp: russel@...
Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder@...
London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder

signature.asc (204 bytes) Download Attachment

From forum: GANT -- User

Re: Supported Groovy versions

2009-12-16T05:08:08Z

Yes, dropping 1.5.x support is ok.

On Dec 16, 2009, at 2:37 AM, Russel Winder wrote:

> To date whenever there has been a Gant release, versions have been
> released compiled against Groovys 1.5.x, 1.6.x and 1.7.x. With the
> release of Gant 1.9.0 -- which will happen with the release of Groovy
> 1.7.0 -- I am proposing not to make a release of Gant compiled against
> Groovy 1.5.8, i.e. I propose to drop all support for Groovy 1.5.x.
>
> Is this a reasonable position to take?
>
> Thanks.
>
> --
> Russel.
> =============================================================================
> Dr Russel Winder Partner
> xmpp: russel@...
> Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
> 41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder@...
> London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- User

[gant-scm] [10473] gant/trunk/build.gradle: Begin to add the distribution creation bits.

2009-12-16T02:48:48Z

[10473] gant/trunk/build.gradle: Begin to add the distribution creation bits.

Revision: 10473
Author: russel
Date: 2009-12-16 04:48:47 -0600 (Wed, 16 Dec 2009)

Log Message

Begin to add the distribution creation bits.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10472 => 10473)

--- gant/trunk/build.gradle	2009-12-16 10:27:18 UTC (rev 10472)
+++ gant/trunk/build.gradle	2009-12-16 10:48:47 UTC (rev 10473)
@@ -167,6 +167,14 @@
     footer = copyrightString
   }
   task documentation ( dependsOn: [ 'javadoc' , 'groovydoc' ] , description : 'Create the API documentation.' )
+  task zipDoc ( type : Zip , dependsOn : documentation ) {
+    appendix = 'docs'
+    from ( docsDir )
+  }
+  task zipSrc ( type : Zip ) {
+    appendix = 'src'
+    from ( sourceSets.main.allSource )
+  }
   defaultTasks ( 'build' ) 
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10472] gant/trunk: Remove the use of gradle.properties file: add the properties direct to the build.gradle file.

2009-12-16T02:27:19Z

[10472] gant/trunk: Remove the use of gradle.properties file: add the properties direct to the build.gradle file.

Revision: 10472
Author: russel
Date: 2009-12-16 04:27:18 -0600 (Wed, 16 Dec 2009)

Log Message

Remove the use of gradle.properties file:  add the properties direct to the build.gradle file.
Add the properties to teh build.gant file, but remember this will shortly be deleted as the Gradle build becomes the norm for all activities.
Remove all support for versions of Groovy prior to 1.6.0.

Modified Paths

gant/trunk/build.gant
gant/trunk/build.gradle
gant/trunk/settings.gradle
gant/trunk/src/test/groovy/gant/targets/tests/Clean_Test.groovy
gant/trunk/src/test/groovy/gant/tools/tests/Execute_Test.groovy
gant/trunk/src/test/groovy/gant/tools/tests/LaTeX_Test.groovy
gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBinding_Test.groovy
gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBuilder_Test.groovy
gant/trunk/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy
gant/trunk/src/test/groovy/org/codehaus/gant/tests/Targets_Test.groovy

Removed Paths

gant/trunk/gradle.properties

Diff

Modified: gant/trunk/build.gant (10471 => 10472)

--- gant/trunk/build.gant	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/build.gant	2009-12-16 10:27:18 UTC (rev 10472)
@@ -19,26 +19,38 @@
 final tgzExtension = '.tgz'
 
 property ( file : 'local.build.properties' )
-property ( file : 'gradle.properties' )
 
-carryOn = true
-[ 'gantVersion' ,
-  'groovy15Version' , 'groovy16Version' , 'groovy17Version' ,
-  'groovyStandaloneVersion' ,
-  'junitVersion' , 'commonsCliVersion' , 'ivyVersion' , 'antVersion' , 'mavenAntTaskVersion' , 'bndVersion' , 'coberturaVersion' ,
-  'groovyAntTaskTestVersionPropertyFileName' ,
-].each { name ->
-  try { binding.getVariable ( name ) }
-  catch ( MissingPropertyException mpe ) {
-    ant.project.log ( "${name} is not defined." )
-    carryOn = false
-  }
-}
-if ( ! carryOn ) {
-  ant.project.log ( 'A required property is not set, so terminating.' )
-  System.exit ( 1 )
-}
+gantVersion = '1.9.0-SNAPSHOT'
+gantBundleVersion = '1.9.0-SNAPSHOT'
 
+//  This should be a list of all the currently published versions of Groovy.  Addition to or deletion from
+//  the list of items here will need a consistent change throughout.
+
+groovy16Version = '1.6.7'
+groovy17Version = '1.7-rc-2'
+
+//  This is the version to use for all self-contained builds -- this version of Groovy will be packaged with
+//  Gant.  It should be the latest widely available version of Groovy.
+
+groovyStandaloneVersion = groovy16Version
+
+//  Should always use the same versions of things as Groovy uses.  There perhaps ought to be a way of not
+//  specifying these by discovering which version Groovy uses and then using that. 
+
+junitVersion = '4.7'
+commonsCliVersion = '1.2'
+ivyVersion = '2.1.0'
+antVersion = '1.7.1'
+mavenAntTaskVersion = '2.0.10'
+bndVersion = '0.0.380'
+coberturaVersion = '1.9'
+
+//  The Gant Ant task tests need to have the Groovy version and the easiest way to pass this information is
+//  as a global value, i.e via a file.  This is the name of the file to be used to hold a property called
+//  groovyAntTaskTestVersion.
+
+groovyAntTaskTestVersionPropertyFileName = 'groovyAntTaskTestVersion.properties'
+
 gantPrefix = 'gant-' + gantVersion
 
 try { usingCobertura = Boolean.valueOf ( usingCobertura ) }
@@ -127,26 +139,17 @@
 
 final distributionDirectories = [ 'documentation' , 'examples' , '.settings' , scriptsDirectory , jarfilesDirectory , sourceDirectory , testsDirectory ]
 
-//  The versions of Gant in the Maven repository to build distribution version of Gant against.
+//  The versions of Groovy in the Maven repository to build distribution version of Gant against.
 //
-//  Introducing the Gant Ant Task written in Java means we have to use the joint compiler to compile Gant
-//  and this means we cannot build Gant against Groovy 1.0 since the joint compiler only arrived with 1.5.0.
-//  Opinion on the user list indicated that it seemed reasonable to drop support for Groovy 1.0.
-//
-//  It is assumed that the groovyc fork mode works, which means we cannot sensibly build against any version
-//  of Groovy prior to 1.5.2 -- since that is the version in which groovyc fork mode appeared.  Using a
-//  forked Java task is not an option because there is no --classpath option in the 1.5.0 and 1.5.1 versions
-//  of Groovyc and this is essential to get things to work correctly.  Gant can still be built and
-//  distributed against Groovy 1.5.0 and 1.5.1 but it has to be done the hard (manual) way.
-//
-//  Allow a mechanism for testing individual distribution entries as well as producing all of them.
+//  As at 2009-12-16 Groovy versions prior to 1.6.0 are not supported and so all issues regarding Gant and
+//  non-supported Groovy versions are no longer relevant.
 
 final distributionVersions = [ : ]
 if ( testSpecialDistributionVersion ) {
   distributionVersions.put ( 'groovy-' +  testSpecialDistributionVersion , [ groupId : 'org.codehaus.groovy' , artifactId : 'groovy-all' , version :  testSpecialDistributionVersion ] )
 }
 else {
-  [ groovy15Version , groovy16Version , groovy17Version ].each { version ->
+  [ groovy16Version , groovy17Version ].each { version ->
     distributionVersions.put ( 'groovy-' + version , [ groupId : 'org.codehaus.groovy' , artifactId : 'groovy-all' , version : version ] )
   }
   distributionVersions.put ( 'standalone' , [ groupId : 'org.codehaus.groovy' , artifactId : 'groovy-all' , version : groovyStandaloneVersion ] )

Modified: gant/trunk/build.gradle (10471 => 10472)

--- gant/trunk/build.gradle	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/build.gradle	2009-12-16 10:27:18 UTC (rev 10472)
@@ -16,23 +16,47 @@
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
-def groovyAntTaskTestVersionPropertyFile = new File ( groovyAntTaskTestVersionPropertyFileName )
-def osgify = true
+gantVersion = '1.9.0-SNAPSHOT'
 
- //  Organize the build using subprojects.  There is a subproject gant which is for the build using the
- //  locally installed Groovy and then there is one for each version of Groovy obtained from the Maven
- //  repository that is supported.  These functions ease doing the iteration over all the subprojects.  NB
- //  Gradle requires the directories for each of the subprojects to exist.  There is an assumption that each
- //  subproject has its own source, etc.  This build slightly perverts the general approach by using exactly
- //  the same source for each subproject, the only difference is the version of Groovy used for compilation.
+//  This should be a list of all the currently published versions of Groovy.  Addition to or deletion from
+//  the list of items here will need a consistent change throughout.
 
-def forEachArtifact ( Closure c ) {
-  for ( String s : [ '1.5' , '1.6' , '1.7' ] ) { c ( 'gant_groovy' + s ) }
+groovy16Version = '1.6.7'
+groovy17Version = '1.7-rc-2'
+
+//  This is the version to use for all self-contained builds -- this version of Groovy will be packaged with
+//  Gant.  It should be the latest widely available version of Groovy.
+
+groovyStandaloneVersion = groovy16Version
+
+//  Should always use the same versions of things as Groovy uses.  There perhaps ought to be a way of not
+//  specifying these by discovering which version Groovy uses and then using that. 
+
+junitVersion = '4.7'
+commonsCliVersion = '1.2'
+ivyVersion = '2.1.0'
+antVersion = '1.7.1'
+mavenAntTaskVersion = '2.0.10'
+bndVersion = '0.0.380'
+coberturaVersion = '1.9'
+
+def groovyAntTaskTestVersionPropertyFileContent = 'groovyAntTaskTestVersion =  '
+def groovyAntTaskTestVersionPropertyFile = new File ( 'groovyAntTaskTestVersion.properties' )
+
+//  Organize the build using subprojects.  There is a subproject gant which is for the build using the
+//  locally installed Groovy and then there is one for each version of Groovy obtained from the Maven
+//  repository that is supported.  These functions ease doing the iteration over all the subprojects.  NB
+//  Gradle requires the directories for each of the subprojects to exist.  There is an assumption that each
+//  subproject has its own source, etc.  This build slightly perverts the general approach by using exactly
+//  the same source for each subproject, the only difference is the version of Groovy used for compilation.
+
+def forEachDistributionVersion ( Closure c ) {
+  for ( String s : [ '1.6' , '1.7' ] ) { c ( 'gant_groovy' + s ) }
 }
   
 def forEachProject ( Closure c ) {
   c ( 'gant' )
-  forEachArtifact ( c )
+  forEachDistributionVersion ( c )
 }
 
 forEachProject { item ->  if ( ! ( new File ( item ) ).isDirectory ( ) ) { ant.mkdir ( dir : item ) } }
@@ -45,7 +69,7 @@
 
 subprojects {
   usePlugin ( 'groovy' )
-  if ( osgify ) { usePlugin ( 'osgi' ) }
+  usePlugin ( 'osgi' )
   sourceCompatibility = 5
   targetCompatibility = 5
   configurations {
@@ -61,34 +85,20 @@
   metaInf << fileTree ( dir : '..' ).matching { include 'LICENCE.txt' }
   def theVendor = 'The Codehaus'
   def theTitle = 'Gant: Scripting Ant tasks with Groovy.'
-  if ( osgify ) {
-    configure ( jar.osgi ) {
-      name = 'Gant'
-      instruction 'Bundle-Vendor' , theVendor
-      instruction 'Bundle-Description' , theTitle
-      instruction 'Bundle-DocURL' , 'http://gant.codehaus.org'
-      instruction 'Built-By' , System.properties.'user.name'
-      instruction 'Extension-Name' , artifact
-      instruction 'Specification-Title' , theTitle
-      instruction 'Specification-Version' , version
-      instruction 'Specification-Vendor' , theVendor
-      instruction 'Implementation-Title' , theTitle
-      instruction 'Implementation-Version' , version
-      instruction'Implementation-Vendor' , theVendor
-    }
+  configure ( jar.osgi ) {
+    name = 'Gant'
+    instruction 'Bundle-Vendor' , theVendor
+    instruction 'Bundle-Description' , theTitle
+    instruction 'Bundle-DocURL' , 'http://gant.codehaus.org'
+    instruction 'Built-By' , System.properties.'user.name'
+    instruction 'Extension-Name' , artifact
+    instruction 'Specification-Title' , theTitle
+    instruction 'Specification-Version' , version
+    instruction 'Specification-Vendor' , theVendor
+    instruction 'Implementation-Title' , theTitle
+    instruction 'Implementation-Version' , version
+    instruction'Implementation-Vendor' , theVendor
   }
-  else {
-    manifest.mainAttributes (
-                             'Built-By' : System.properties.'user.name' ,
-                             'Extension-Name' : artifact ,
-                             'Specification-Title' : theTitle ,
-                             'Specification-Version' : version ,
-                             'Specification-Vendor' : theVendor ,
-                             'Implementation-Title' : theTitle ,
-                             'Implementation-Version' : version , 
-                             'Implementation-Vendor' : theVendor
-                             )
-  }
   repositories {
     mavenCentral ( )
     mavenRepo ( urls : 'http://repository.codehaus.org/' )
@@ -152,7 +162,7 @@
     author = 'true'
     version = 'true'
     windowTitle = packageTitle
-    docTitle = packageTitle //  Groovy 1.5 version of GroovyDoc does not have support for docTitle attribute.
+    docTitle = packageTitle
     header = packageTitle
     footer = copyrightString
   }
@@ -182,7 +192,7 @@
   archivesBaseName = artifact
   dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
   compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
-  test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( 'groovyAntTaskTestVersion = ' + groovyVersion ) }
+  test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( groovyAntTaskTestVersionPropertyFileContent + groovyVersion ) }
   def  installDirectory = '/usr/share/gant'
   try { installDirectory = evaluate ( '"' + gant_installPath + '"' ) }
   catch ( MissingPropertyException mpe ) { /* Intentionally left blank. */ }
@@ -209,19 +219,23 @@
 
 ciBuildTasks = [ ]
 
-forEachArtifact { archivesBaseName ->
-  def groovyVersionNumber = getProperty ( archivesBaseName.replace ( artifact + '_' , '' ).replace ( '.' , '' ) + 'Version' )
+forEachDistributionVersion { archivesBaseName ->
+  def groovyVersion = getProperty ( archivesBaseName.replace ( artifact + '_' , '' ).replace ( '.' , '' ) + 'Version' )
   project ( archivesBaseName ) {
     usePlugin ( 'maven' )
-    dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersionNumber ) }
-    compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersionNumber + '\n' ) }
-    test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( 'groovyAntTaskTestVersion = ' + groovyVersionNumber ) }
+    dependencies { groovy ( 'org.codehaus.groovy:groovy-all:' + groovyVersion ) }
+    compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
+    test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( groovyAntTaskTestVersionPropertyFileContent + groovyVersion ) }
     uploadArchives {
       repositories.mavenDeployer {
         uniqueVersion = false
         configuration = configurations.deployJars
-        repository ( url : 'https://dav.codehaus.org/repository/gant' )
-        snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' )
+        repository ( url : 'https://dav.codehaus.org/repository/gant' ) {
+          authentication ( userName : gant_repoUserName , password : gant_repoPassword )
+        }
+        snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' ){
+            authentication ( userName: gant_repoUserName , password : gant_repoPassword )
+        }
       }
     }
   }
@@ -231,11 +245,11 @@
 task ciBuild ( description : 'Run just the builds that use Groovy from the Maven repository.  Used mainly on CI servers.' , dependsOn : ciBuildTasks )
 
 task wrapper ( type : Wrapper ) {
-    gradleVersion = '0.9'
+    gradleVersion = '0.9-20091118152522+1100'
     jarPath = 'wrapper'
 }
 
 task clobber ( description : 'Do a really detailed clean.' ) << {
   forEachProject { item -> ant.delete ( dir : item ) }
-  ant.delete { fileset ( dir : '.' , includes : 'texput.log,groovyAntTaskTestVersion.properties,**/*~' ) }
+  ant.delete { fileset ( dir : '.' , includes : 'texput.log,**/*~,' + groovyAntTaskTestVersionPropertyFile.name ) }
 }

Deleted: gant/trunk/gradle.properties (10471 => 10472)

--- gant/trunk/gradle.properties	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/gradle.properties	2009-12-16 10:27:18 UTC (rev 10472)
@@ -1,31 +0,0 @@
-gantVersion = 1.9.0-SNAPSHOT
-gantBundleVersion = 1.9.0-SNAPSHOT
-
-#  This should be a list of all the currently published versions of Groovy.  Addition to or deletion from
-#  the list of items here will need a consistent change in build.gant.
-
-groovy15Version = 1.5.8
-groovy16Version = 1.6.7
-groovy17Version = 1.7-rc-2
-
-#  This is the version to use for all self-contained builds -- this version of Groovy will be packaged with
-#  Gant.  It should be the latest widely available version of Groovy.
-
-groovyStandaloneVersion = 1.6.7
-
-#  Should always use the same versions of things as Groovy uses.  There perhaps ought to be a way of not
-#  specifying these but discovering which version Groovy uses and then using that. 
-
-junitVersion = 4.7
-commonsCliVersion = 1.2
-ivyVersion = 2.1.0
-antVersion = 1.7.1
-mavenAntTaskVersion = 2.0.10
-bndVersion = 0.0.380
-coberturaVersion = 1.9
-
-#  The Gant Ant task tests need to have the Groovy version and the easiest way to pass this information is
-#  as a global value, i.e via a file.  This is the name of the file to be used to hold a property called
-#  groovyAntTaskTestVersion.
-
-groovyAntTaskTestVersionPropertyFileName = groovyAntTaskTestVersion.properties

Modified: gant/trunk/settings.gradle (10471 => 10472)

--- gant/trunk/settings.gradle	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/settings.gradle	2009-12-16 10:27:18 UTC (rev 10472)
@@ -14,4 +14,4 @@
 //
 //  Author : Russel Winder <russel.winder@...>
 
-include 'gant' , 'gant_groovy1.5' , 'gant_groovy1.6' , 'gant_groovy1.7'
+include 'gant' , 'gant_groovy1.6' , 'gant_groovy1.7'

Modified: gant/trunk/src/test/groovy/gant/targets/tests/Clean_Test.groovy (10471 => 10472)

--- gant/trunk/src/test/groovy/gant/targets/tests/Clean_Test.groovy	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/src/test/groovy/gant/targets/tests/Clean_Test.groovy	2009-12-16 10:27:18 UTC (rev 10472)
@@ -30,7 +30,7 @@
 target ( ${targetName} : '' ) { println ( cleanDirectory ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[target]\n' : '["target"]\n' ) , output )
+    assertEquals ( resultString ( targetName , '[target]\n' ) , output )
     assertEquals ( '' , error )
   }
   void testCleanDirectoryList ( ) {
@@ -40,7 +40,7 @@
 target ( ${targetName} : '' ) { println ( cleanDirectory ) }
 """ 
     assertEquals ( 0 , processCmdLineTargets ( targetName ) ) 
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[[target_a, target_b]]\n' :  '[["target_a", "target_b"]]\n' ) , output )
+    assertEquals ( resultString ( targetName , '[[target_a, target_b]]\n' ) , output )
     assertEquals ( '' , error )
   }
   void testCleanPatternString ( ) {
@@ -50,7 +50,7 @@
 target ( ${targetName} : '' ) {println ( cleanPattern ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[**/*~]\n' : '["**/*~"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[**/*~]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testCleanPatternList ( ) {
@@ -60,7 +60,7 @@
 target ( ${targetName} : '' ) { println ( cleanPattern ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[[**/*~, **/*.bak]]\n' : '[["**/*~", "**/*.bak"]]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[[**/*~, **/*.bak]]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testClobberDirectoryString ( ) {
@@ -70,7 +70,7 @@
 target ( ${targetName} : '' ) { println ( clobberDirectory ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[target]\n' : '["target"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[target]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testClobberDirectoryList ( ) {
@@ -80,7 +80,7 @@
 target ( ${targetName} : '' ) { println ( clobberDirectory ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[[target_a, target_b]]\n' : '[["target_a", "target_b"]]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[[target_a, target_b]]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testClobberPatternString ( ) {
@@ -92,7 +92,7 @@
 }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[**/*~]\n' : '["**/*~"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[**/*~]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testClobberPatternList ( ) {
@@ -102,7 +102,7 @@
 target ( ${targetName} : '' ) { println ( clobberPattern ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[[**/*~, **/*.bak]]\n' : '[["**/*~", "**/*.bak"]]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[[**/*~, **/*.bak]]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testParameterizedInclude ( ) {
@@ -111,7 +111,7 @@
 target ( ${targetName} : '' ) { println ( cleanDirectory ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[target]\n' : '["target"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[target]\n' ) , output ) 
     assertEquals ( '' , error )
   }
 }

Modified: gant/trunk/src/test/groovy/gant/tools/tests/Execute_Test.groovy (10471 => 10472)

--- gant/trunk/src/test/groovy/gant/tools/tests/Execute_Test.groovy	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/src/test/groovy/gant/tools/tests/Execute_Test.groovy	2009-12-16 10:27:18 UTC (rev 10472)
@@ -35,7 +35,7 @@
   void testExecutableListOfString ( ) {
     //  Format these correctly and they are both input and expected value.
     final command = isWindows ? '["cmd", "/c", "echo", "1"]' : '["echo", "1"]'
-    final expected = ( groovyMinorVersion > 5 ) ? command.replaceAll ( '"' , '' ) : command
+    final expected = command.replaceAll ( '"' , '' )
     script = """includeTool << gant.tools.Execute
 target ( ${targetName} : '' ) { execute.executable ( ${command} ) }
 """

Modified: gant/trunk/src/test/groovy/gant/tools/tests/LaTeX_Test.groovy (10471 => 10472)

--- gant/trunk/src/test/groovy/gant/tools/tests/LaTeX_Test.groovy	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/src/test/groovy/gant/tools/tests/LaTeX_Test.groovy	2009-12-16 10:27:18 UTC (rev 10472)
@@ -48,70 +48,70 @@
     final targetName = 'addLaTeXOption'
     script = optionTestGantFile ( 'LaTeX' , 'latex' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-interaction=nonstopmode, -halt-on-error, -blah]\n' : '["-interaction=nonstopmode", "-halt-on-error", "-blah"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-interaction=nonstopmode, -halt-on-error, -blah]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddLaTeXOptionList ( ) {
     final targetName = 'addLaTeXOptionList'
     script = optionListTestGantFile ( 'LaTeX' , 'latex' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-interaction=nonstopmode, -halt-on-error, -blah, --flobadob]\n' : '["-interaction=nonstopmode", "-halt-on-error", "-blah", "--flobadob"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-interaction=nonstopmode, -halt-on-error, -blah, --flobadob]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddBibTeXOption ( ) {
     final targetName = 'addBibTeXOption'
     script = optionTestGantFile ( 'BibTeX' , 'bibtex' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah]\n' : '["-blah"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddBibTeXOptionList ( ) {
     final targetName = 'addBibTeXOptionList'
     script = optionListTestGantFile ( 'BibTeX' , 'bibtex' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah, --flobadob]\n' : '["-blah", "--flobadob"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah, --flobadob]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddMakeindexOption ( ) {
     final targetName = 'addMakeindexOption'
     script = optionTestGantFile ( 'Makeindex' , 'makeindex' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah]\n' : '["-blah"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddMakeindexOptionList ( ) {
     final targetName = 'addMakeindexOptionList'
     script = optionListTestGantFile ( 'Makeindex' , 'makeindex' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah, --flobadob]\n' : '["-blah", "--flobadob"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah, --flobadob]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddDvipsOption ( ) {
     final targetName = 'addDvipsOption'
     script = optionTestGantFile ( 'Dvips' , 'dvips' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah]\n' : '["-blah"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddDvipsOptionList ( ) {
     final targetName = 'addDvipsOptionList'
     script = optionListTestGantFile ( 'Dvips' , 'dvips' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah, --flobadob]\n' : '["-blah", "--flobadob"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah, --flobadob]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddPs2pdfOption ( ) {
     final targetName = 'addPs2pdfOption'
     script = optionTestGantFile ( 'Ps2pdf' , 'ps2pdf' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah]\n' : '["-blah"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testAddPs2pdfOptionList ( ) {
     final targetName = 'addPs2pdfOptionList'
     script = optionListTestGantFile ( 'Ps2pdf' , 'ps2pdf' )
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName , ( groovyMinorVersion > 5 ) ? '[-blah, --flobadob]\n' : '["-blah", "--flobadob"]\n' ) , output ) 
+    assertEquals ( resultString ( targetName , '[-blah, --flobadob]\n' ) , output ) 
     assertEquals ( '' , error )
   }
   void testEmptyFile ( ) {
@@ -126,10 +126,7 @@
       final filename = File.createTempFile ( 'gantLaTeXTest_' , extension , new File ( '.' ) )
       script = buildScript.replace ( 'TESTFILENAME' , filename.name.replaceAll ( extension , '' ) )
       assertEquals ( 0 , processCmdLineTargets ( 'pdf' ) )
-      assertTrue ( output.contains (
-                                    ( groovyMinorVersion > 5 )
-                                    ? '[execute] [pdflatex, -interaction=nonstopmode, -halt-on-error, gantLaTeXTest_'
-                                    : '[execute] ["pdflatex", "-interaction=nonstopmode", "-halt-on-error", "gantLaTeXTest_' ) )
+      assertTrue ( output.contains ( '[execute] [pdflatex, -interaction=nonstopmode, -halt-on-error, gantLaTeXTest_' ) )
       assertTrue ( output.contains ( '!  ==> Fatal error occurred, no output PDF file produced!' ) )
       assertEquals ( '' , error )
       assertEquals ( 0 , processCmdLineTargets ( 'clean' ) )
@@ -144,12 +141,7 @@
 target ( ${targetName} : "" ) { println ( laTeX.environment['latexOptions'] ) }
 """
     assertEquals ( 0 , processCmdLineTargets ( targetName ) )
-    assertEquals ( resultString ( targetName ,
-                                  ( groovyMinorVersion > 5 )
-                                  ? '[-interaction=nonstopmode, -halt-on-error, flobadob]\n'
-                                  : '["-interaction=nonstopmode", "-halt-on-error", "flobadob"]\n'
-                                  )
-                   , output )
+    assertEquals ( resultString ( targetName , '[-interaction=nonstopmode, -halt-on-error, flobadob]\n' ) , output )
     assertEquals ( '' , error )
   }
 }

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBinding_Test.groovy (10471 => 10472)

--- gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBinding_Test.groovy	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBinding_Test.groovy	2009-12-16 10:27:18 UTC (rev 10472)
@@ -151,16 +151,7 @@
     assertEquals ( '' , error )
   }
   void testPropertyAccessInsideCategory ( ) {
-    /*
-     *  This tests generates a StackOverflowError with Groovy 1.5.7. The problem is, we have no idea whether
-     *  the test is checking for a bug in Gant, or whether it is just making sure that we correctly
-     *  workaround a bug in DOMCategory :( We can re-enable this test once the StackOverflowError is fixed
-     *  in Groovy and we know that we're not just working around that DOMCategory issue.
-     *
-     *  See http://jira.codehaus.org/browse/GROOVY-3109
-     */
     final message = 'Hello World'
-    if ( groovyMinorVersion < 6 ) { return }
     script = """
 target ( ${targetName} : '' ) {
   use ( groovy.xml.dom.DOMCategory ) { println ( "${message}" ) }

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBuilder_Test.groovy (10471 => 10472)

--- gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBuilder_Test.groovy	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantBuilder_Test.groovy	2009-12-16 10:27:18 UTC (rev 10472)
@@ -36,9 +36,7 @@
     final targetName = 'hello'
     final sourceDirectory = '.'
     final destinationDirectory = '/tmp/tmp/tmp/tmp'
-    final expectedError = 'groovy.lang.MissingMethodException: No signature of method: standard_input.groovyc() is applicable for argument types: (java.util.LinkedHashMap) values: '
-    if ( groovyMinorVersion < 6 ) { expectedError += "{[\"srcdir\":\"${sourceDirectory}\", \"destdir\":\"${destinationDirectory}\"]}\n" }
-    else { expectedError += "[[srcdir:${sourceDirectory}, destdir:${destinationDirectory}]]\n" }
+    final expectedError = "groovy.lang.MissingMethodException: No signature of method: standard_input.groovyc() is applicable for argument types: (java.util.LinkedHashMap) values: [[srcdir:${sourceDirectory}, destdir:${destinationDirectory}]]\n"
     //
     //  This test may only be guaranteed to work if JUnit is operating in perTest fork mode since otherwise
     //  another test may have caused the Groovyc task to be loaded which leads to a 0 return value.

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy (10471 => 10472)

--- gant/trunk/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy	2009-12-16 10:27:18 UTC (rev 10472)
@@ -80,7 +80,7 @@
    //  This is a huge change of semantics, and wholly inappropriate for a bug fix release. :-(((
   private final targetsBuildScriptClass =  "includeTargets <<  groovyShell.evaluate ( '''${targetsScriptText} ; return ${targetsClassName}''' , '${targetsClassName}' )\n" + targetsBuildScriptBase
   private final targetsErrorBuildScriptClass =  "includeTargets <<  groovyShell.evaluate ( '''${targetsScriptText}''' , '${targetsClassName}' )\n" + targetsBuildScriptBase
-  private final resultErrorEvaluatingScript = 'Standard input, line 1 -- Error evaluating Gantfile: ' + ( ( ( groovyMinorVersion < 6 ) && ( groovyBugFixVersion < 8 ) ) ? 'null' : "Cannot get property 'class' on null object" ) + '\n'
+  private final resultErrorEvaluatingScript = "Standard input, line 1 -- Error evaluating Gantfile: Cannot get property 'class' on null object\n"
   private final String targetsBuildScriptFile
   private final targetsBuildScriptString =  "includeTargets <<  '''${targetsScriptText}'''\n" + targetsBuildScriptBase
   private final targetsBuildClassClass =  "includeTargets <<  groovyShell.evaluate ( '''${targetsClassText} ; return ${targetsClassName}''' )\n" + targetsBuildScriptBase
@@ -555,7 +555,7 @@
 """
     assertEquals ( -4 , processCmdLineTargets ( something ) )
     assertEquals ( '' , output )
-    assertEquals ( 'Standard input, line 2 -- Error evaluating Gantfile: No signature of method: org.codehaus.gant.IncludeTargets.multiply() is applicable for argument types: (java.lang.Class) values: ' + ( ( groovyMinorVersion < 6 ) ? '{class gant.targets.Clean}' : ( groovyMinorVersion < 7 ) ? '[class gant.targets.Clean]' : '[class gant.targets.Clean]\nPossible solutions: multiply(java.util.Map), multiply(java.util.Map)' ) + '\n' , error )
+    assertEquals ( 'Standard input, line 2 -- Error evaluating Gantfile: No signature of method: org.codehaus.gant.IncludeTargets.multiply() is applicable for argument types: (java.lang.Class) values: ' + ( ( groovyMinorVersion < 7 ) ? '[class gant.targets.Clean]' : '[class gant.targets.Clean]\nPossible solutions: multiply(java.util.Map), multiply(java.util.Map)' ) + '\n' , error )
   }
   void testErrorNullPower ( ) {
     script = """

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/tests/Targets_Test.groovy (10471 => 10472)

--- gant/trunk/src/test/groovy/org/codehaus/gant/tests/Targets_Test.groovy	2009-12-11 07:56:12 UTC (rev 10471)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/tests/Targets_Test.groovy	2009-12-16 10:27:18 UTC (rev 10472)
@@ -112,7 +112,7 @@
 target ( ${targetName} : '' ) { println ( home ) }
 setDefaultTarget ( ${targetName} )
 """
-  final expectedOutput = ( ( ( groovyMinorVersion < 6 ) && ( groovyBugFixVersion < 8 ) ) ? '' : 'Standard input, line 2 -- ' ) + 'Error evaluating Gantfile: No such property: home for class: standard_input\n'
+  final expectedOutput = 'Standard input, line 2 -- Error evaluating Gantfile: No such property: home for class: standard_input\n'
   void test_GANT_45_MessageBugDefaultTarget ( ) {
     script = testScript
     assertEquals ( -12 , processCmdLineTargets ( ) )

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

Supported Groovy versions

2009-12-16T00:37:30Z

To date whenever there has been a Gant release, versions have been
released compiled against Groovys 1.5.x, 1.6.x and 1.7.x. With the
release of Gant 1.9.0 -- which will happen with the release of Groovy
1.7.0 -- I am proposing not to make a release of Gant compiled against
Groovy 1.5.8, i.e. I propose to drop all support for Groovy 1.5.x.

Is this a reasonable position to take?

Thanks.

--
Russel.
=============================================================================
Dr Russel Winder Partner
xmpp: russel@...
Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder@...
London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder

signature.asc (204 bytes) Download Attachment

From forum: GANT -- User

Re: [groovy-dev] Re: [gant-dev] Windows batch file launch for Groovy and Gant

2009-12-13T03:50:44Z

On Thu, 2009-11-26 at 16:13 +0100, Jochen Theodorou wrote:
> Graeme Rocher schrieb:
> > Grails uses the same batch files and has similar issues on Windows
> > (help Windows batch experts!)
>
> I think they don't exist
>
> bye blackdrag
>

Clearly not. Alternatively, perhaps Joachim is doing such a great job
providing the Windows installer that no-one using Windows actually gives
a sh!t about the batch files for all the Groovy and related systems.

--
Russel.
=============================================================================
Dr Russel Winder Partner
xmpp: russel@...
Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder@...
London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder

signature.asc (204 bytes) Download Attachment

From forum: GANT -- Dev

Re: [groovy-dev] Re: [gant-dev] Windows batch file launch for Groovy and Gant

2009-12-13T03:50:44Z

signature.asc (204 bytes) Download Attachment

From forum: GANT -- User

[gant-scm] [10471] gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantTestCase.java: Deal with the issue of deprecation.

2009-12-10T23:56:12Z

[10471] gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantTestCase.java: Deal with the issue of deprecation.

Revision: 10471
Author: russel
Date: 2009-12-11 01:56:12 -0600 (Fri, 11 Dec 2009)

Log Message

Deal with the issue of deprecation.

Modified Paths

gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantTestCase.java

Diff

Modified: gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantTestCase.java (10470 => 10471)

--- gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantTestCase.java	2009-12-11 07:56:08 UTC (rev 10470)
+++ gant/trunk/src/test/groovy/org/codehaus/gant/tests/GantTestCase.java	2009-12-11 07:56:12 UTC (rev 10471)
@@ -22,14 +22,14 @@
 import java.io.ByteArrayOutputStream ;
 import java.io.PrintStream ;
 
+import java.lang.reflect.Method ;
+
 import groovy.util.GroovyTestCase ;
 
 import gant.Gant ;
 
 import org.codehaus.gant.GantState ;
 
-import org.codehaus.groovy.runtime.InvokerHelper ;
-
 /**
  *  A Gant test case: Adds the required input stream manipulation features to avoid replication of code.
  *  Also prepare a new instance of Gant for each test.
@@ -60,7 +60,32 @@
   public static final int groovyBugFixVersion ;
   public static final ReleaseType releaseType ;
   static {
-    final String[] version =  InvokerHelper.getVersion ( ).split ( "[.-]" ) ;
+    //
+    //  Originally we had:
+    //
+    //    final String[] version =  org.codehaus.groovy.runtime.InvokerHelper.getVersion ( ).split ( "[.-]" ) ;
+    //
+    //  but in Groovy 1.8 this method has been deprecated.  The method that must be called now is:
+    //
+    //    final String[] version =  groovy.lang.GroovySystem.getVersion ( ).split ( "[.-]" ) ;
+    //
+    //  which has actually been available since Groovy 1.6.  However, whilst the class
+    //  java.lang.GroovyStsrem exists in Groovy 1.5, the method does not in that version of Groovy.  We must
+    //  therefore use reflection to discover whether getVersion exists in the GroovySystem class and do the
+    //  right thing whatever situation pertains.
+    //
+    String[] version ;
+    try {
+      final Class<?> theClass = Class.forName ( "groovy.lang.GroovySystem" ) ;
+      final String methodName = "getVersion" ;
+      Method method ;
+      try { method = theClass.getMethod ( methodName ) ; }
+      catch ( final Exception e ) { method =  Class.forName ( "org.codehaus.groovy.runtime.InvokerHelper" ).getMethod ( methodName ) ; }
+      version = ( (String) ( method.invoke ( null ) ) ).split ( "[.-]" ) ;
+    }
+    catch ( final Exception e ) { throw new RuntimeException ( "Stuff", e ) ; }
+    //
+    //
     switch ( version.length ) {
      case 3 :
        groovyBugFixVersion =  Integer.parseInt ( version[2] ) ;

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10470] gant/trunk/build.gradle: Annotate regarding docTitle and GroovyDoc version.

2009-12-10T23:56:09Z

[10470] gant/trunk/build.gradle: Annotate regarding docTitle and GroovyDoc version.

Revision: 10470
Author: russel
Date: 2009-12-11 01:56:08 -0600 (Fri, 11 Dec 2009)

Log Message

Annotate regarding docTitle and GroovyDoc version.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10469 => 10470)

--- gant/trunk/build.gradle	2009-12-11 07:56:04 UTC (rev 10469)
+++ gant/trunk/build.gradle	2009-12-11 07:56:08 UTC (rev 10470)
@@ -141,7 +141,9 @@
     javadoc.options.docTitle = javadoc.title
   }
   groovydoc {
-    dependsOn ( 'classes' ) // Should not need this. :-(
+    //  javadoc task depends on classes task.  groovydoc is not dependent on classes task and seems not to
+    //  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
@@ -150,7 +152,7 @@
     author = 'true'
     version = 'true'
     windowTitle = packageTitle
-    docTitle = packageTitle
+    docTitle = packageTitle //  Groovy 1.5 version of GroovyDoc does not have support for docTitle attribute.
     header = packageTitle
     footer = copyrightString
   }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10469] gant/trunk: Put in the base groundwork to plan separating integration tests from unit tests.

2009-12-10T23:56:04Z

[10469] gant/trunk: Put in the base groundwork to plan separating integration tests from unit tests.

Revision: 10469
Author: russel
Date: 2009-12-11 01:56:04 -0600 (Fri, 11 Dec 2009)

Log Message

Put in the base groundwork to plan separating integration tests from unit tests.

Modified Paths

gant/trunk/build.gradle

Added Paths

gant/trunk/src/integTest/
gant/trunk/src/integTest/groovy/

Diff

Modified: gant/trunk/build.gradle (10468 => 10469)

--- gant/trunk/build.gradle	2009-12-09 20:23:45 UTC (rev 10468)
+++ gant/trunk/build.gradle	2009-12-11 07:56:04 UTC (rev 10469)
@@ -48,9 +48,15 @@
   if ( osgify ) { usePlugin ( 'osgi' ) }
   sourceCompatibility = 5
   targetCompatibility = 5
+  configurations {
+    deployJars
+ }
   sourceSets {
+    //  NB All the subprojects are actually using the same source code and this is in a different place so
+    //  the location of the source must be specified explicitly.
     main { groovy { srcDir '../src/main/groovy' } }
     test { groovy { srcDir '../src/test/groovy' } }
+    integTest { groovy { srcDir '../src/integTest/groovy' } }  
   }
   metaInf << fileTree ( dir : '..' ).matching { include 'LICENCE.txt' }
   def theVendor = 'The Codehaus'
@@ -83,7 +89,6 @@
                              'Implementation-Vendor' : theVendor
                              )
   }
-  configurations { deployJars }
   repositories {
     mavenCentral ( )
     mavenRepo ( urls : 'http://repository.codehaus.org/' )
@@ -113,6 +118,11 @@
     ant.delete { fileset ( dir : '.' , includes : '**/*~, texput.log' ) }
     ant.delete ( dir :  'target_forMavenTest' )
   }
+  task integTest {
+    dependsOn ( 'assemble' )
+  }
+  //task integTest ( type : AntTest , description : 'Run the integration tests.' ) {
+  //}
   def packageTitle = 'Gant ' + version
   def copyrightString = 'Copyright &#169; 2006&#8211;9  The Codehaus.  All Rights Reserved.'
   javadoc {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10468] gant/trunk/releaseNotes.txt: Update the release notes a bit.

2009-12-09T12:23:46Z

[10468] gant/trunk/releaseNotes.txt: Update the release notes a bit.

Revision: 10468
Author: russel
Date: 2009-12-09 14:23:45 -0600 (Wed, 09 Dec 2009)

Log Message

Update the release notes a bit.

Modified Paths

gant/trunk/releaseNotes.txt

Diff

Modified: gant/trunk/releaseNotes.txt (10467 => 10468)

--- gant/trunk/releaseNotes.txt	2009-12-09 17:37:02 UTC (rev 10467)
+++ gant/trunk/releaseNotes.txt	2009-12-09 20:23:45 UTC (rev 10468)
@@ -12,7 +12,12 @@
 Switched GantException from extending RuntimeException to extending org.apache.tools.ant.BuildException so
 as to allow better consistency with use of Gant from Ant.  cf. GANT-111.
 
+Switch from using Ant as a boostrap and Gant for other processing to using Gradle for all build issues
+(except distribution release as there is still a problem there).
 
+Updated to Groovy 1.7-rc-2 for Groovy 1.7.x and Groovy 1.6.7 for Groovy 1.6.x.
+
+
 1.8.1
 -----

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10467] gant/trunk/packaging/AntDebTask/build.gant: Amend the Deb builder in line with the start of the changeover to Gradle.

2009-12-09T09:37:02Z

[10467] gant/trunk/packaging/AntDebTask/build.gant: Amend the Deb builder in line with the start of the changeover to Gradle.

Revision: 10467
Author: russel
Date: 2009-12-09 11:37:02 -0600 (Wed, 09 Dec 2009)

Log Message

Amend the Deb builder in line with the start of the changeover to Gradle.

Modified Paths

gant/trunk/packaging/AntDebTask/build.gant

Diff

Modified: gant/trunk/packaging/AntDebTask/build.gant (10466 => 10467)

--- gant/trunk/packaging/AntDebTask/build.gant	2009-12-09 17:36:55 UTC (rev 10466)
+++ gant/trunk/packaging/AntDebTask/build.gant	2009-12-09 17:37:02 UTC (rev 10467)
@@ -30,8 +30,8 @@
 final rootDirectory = '..' + System.properties.'file.separator' + '..'
 final buildDirectory = rootDirectory + System.properties.'file.separator' + targetDirectoryName
 
-ant.property ( file : rootDirectory + System.properties.'file.separator' + 'local.build.properties' )
-ant.property ( file : rootDirectory + System.properties.'file.separator' + 'build.properties' )
+property ( file : rootDirectory + System.properties.'file.separator' + 'local.build.properties' )
+property ( file : rootDirectory + System.properties.'file.separator' + 'gradle.properties' )
 
 final packageName = 'gant-standalone'
 final section = 'devel'
@@ -74,7 +74,8 @@
 target ( debFiles : 'Create the deb file of the distribution.' ) {
   if ( ! ignoreBuildDistribution ) { execute.shell ( "cd ${rootDirectory} && gant -DskipTests=${skipTests} debDistribution" ) }
   mkdir ( dir : binDirectory )
-  copy ( tofile : binDirectory + '/gant' , file : 'gant.sh' ) {
+  //  Why is the ant. necessary here ???
+  ant.copy ( tofile : binDirectory + '/gant' , file : 'gant.sh' ) {
     filterset { filter ( token : 'GANT_VERSION' , value : gantVersion ) }
     filterset { filter ( token : 'GROOVYJAR' , value : 'groovy-all-' + groovyStandaloneVersion + '.jar' ) }
   }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10466] gant/trunk/build.gradle: Prepare the ground for trying to upload using Gradle.

2009-12-09T09:36:55Z

[10466] gant/trunk/build.gradle: Prepare the ground for trying to upload using Gradle.

Revision: 10466
Author: russel
Date: 2009-12-09 11:36:55 -0600 (Wed, 09 Dec 2009)

Log Message

Prepare the ground for trying to upload using Gradle.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10465 => 10466)

--- gant/trunk/build.gradle	2009-12-09 17:36:50 UTC (rev 10465)
+++ gant/trunk/build.gradle	2009-12-09 17:36:55 UTC (rev 10466)
@@ -83,6 +83,7 @@
                              'Implementation-Vendor' : theVendor
                              )
   }
+  configurations { deployJars }
   repositories {
     mavenCentral ( )
     mavenRepo ( urls : 'http://repository.codehaus.org/' )
@@ -94,6 +95,7 @@
              )
     testCompile ( 'junit:junit:' + junitVersion )
     testRuntime ( 'org.apache.ivy:ivy:' + ivyVersion )
+    deployJars ( 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2' )
   }
   compileGroovy.options.compilerArgs = ['-Xlint']
   test {
@@ -204,8 +206,8 @@
     test.doFirst { groovyAntTaskTestVersionPropertyFile.write ( 'groovyAntTaskTestVersion = ' + groovyVersionNumber ) }
     uploadArchives {
       repositories.mavenDeployer {
-        //uniqueVersion = false
-        //configuration = configurations.deployerJars
+        uniqueVersion = false
+        configuration = configurations.deployJars
         repository ( url : 'https://dav.codehaus.org/repository/gant' )
         snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant' )
       }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10465] gant/trunk/gradle.properties: Groovy 1.7-rc-2 was released.

2009-12-09T09:36:50Z

[10465] gant/trunk/gradle.properties: Groovy 1.7-rc-2 was released.

Revision: 10465
Author: russel
Date: 2009-12-09 11:36:50 -0600 (Wed, 09 Dec 2009)

Log Message

Groovy 1.7-rc-2 was released.

Modified Paths

gant/trunk/gradle.properties

Diff

Modified: gant/trunk/gradle.properties (10464 => 10465)

--- gant/trunk/gradle.properties	2009-12-09 17:36:40 UTC (rev 10464)
+++ gant/trunk/gradle.properties	2009-12-09 17:36:50 UTC (rev 10465)
@@ -6,7 +6,7 @@
 
 groovy15Version = 1.5.8
 groovy16Version = 1.6.7
-groovy17Version = 1.7-rc-1
+groovy17Version = 1.7-rc-2
 
 #  This is the version to use for all self-contained builds -- this version of Groovy will be packaged with
 #  Gant.  It should be the latest widely available version of Groovy.

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

[gant-scm] [10464] gant/trunk/build.gradle: Add the Codehaus repository to the search list for dependencies.

2009-12-09T09:36:40Z

[10464] gant/trunk/build.gradle: Add the Codehaus repository to the search list for dependencies.

Revision: 10464
Author: russel
Date: 2009-12-09 11:36:40 -0600 (Wed, 09 Dec 2009)

Log Message

Add the Codehaus repository to the search list for dependencies.

Modified Paths

gant/trunk/build.gradle

Diff

Modified: gant/trunk/build.gradle (10463 => 10464)

--- gant/trunk/build.gradle	2009-12-09 00:30:28 UTC (rev 10463)
+++ gant/trunk/build.gradle	2009-12-09 17:36:40 UTC (rev 10464)
@@ -83,7 +83,10 @@
                              'Implementation-Vendor' : theVendor
                              )
   }
-  repositories { mavenCentral ( ) }
+  repositories {
+    mavenCentral ( )
+    mavenRepo ( urls : 'http://repository.codehaus.org/' )
+  }
   dependencies {
     compile (
              'commons-cli:commons-cli:' + commonsCliVersion ,

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: GANT -- Scm

Gant 1.9.0-SNAPSHOT

2009-12-09T08:30:13Z

I have just uploaded Gant 1.9.0-SNAPSHOT artefacts to the Codehaus
snapshots repository and 1.9.0-SNAPSHOT distributions to the Codehaus
server.

gant_groovy1.5 is compiled against Groovy 1.5.8
gant_groovy1.6 is compiled against Groovy 1.6.7
gant_groovy1.7 is compiled against Groovy 1.7-rc-2

--
Russel.
=============================================================================
Dr Russel Winder Partner
xmpp: russel@...
Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder@...
London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder

signature.asc (204 bytes) Download Attachment

From forum: GANT -- User

[gant-scm] [jira] Assigned: (GANT-102) Allow global hooks to turn off Ant-like messages for all targets

2009-12-09T07:26:55Z

[ http://jira.codehaus.org/browse/GANT-102?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Russel Winder reassigned GANT-102:
----------------------------------

Assignee: Russel Winder

> Allow global hooks to turn off Ant-like messages for all targets
> ----------------------------------------------------------------
>
> Key: GANT-102
> URL: http://jira.codehaus.org/browse/GANT-102
> Project: Gant
> Issue Type: Improvement
> Affects Versions: 1.8.0
> Reporter: Bob Swift
> Assignee: Russel Winder
> Fix For: 1.10.0
>
>
> See [GANT-90|http://jira.codehaus.org/browse/GANT-90?focusedCommentId=193312&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#action_193312] item 2.
> The following test should not produce any per target output
> {code}
> globalPreHook = []
> globalPostHook = []
> target(test: 'my test') {
> }
> {code}

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

<hr/>
<p>
To unsubscribe from this list please visit:
</p>
<p>
<a href="http://xircles.codehaus.org/manage_email">http://xircles.codehaus.org/manage_email</a>

From forum: GANT -- Scm