Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
838fd87b17 | ||
|
79d9da905b | ||
|
28e41341db | ||
|
|
577edbb468 | ||
|
|
69c33fad49 | ||
|
6daebb016d | ||
|
d2b620d5fc | ||
|
1fc324adad | ||
|
|
3ecdca3fad | ||
|
|
74f52779b2 | ||
|
|
1cde0f8aa4 |
15 changed files with 447 additions and 211 deletions
|
|
@ -1 +0,0 @@
|
|||
gant_src-1.8.1.tgz
|
||||
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
gant_src-1.9.1.tgz
|
||||
/gant_src-1.9.8.tgz
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From 256fc691f79ac3086d72b95504c39993fe10b87c Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Tue, 24 Nov 2009 00:46:35 +0100
|
||||
Subject: [PATCH] Fix tests
|
||||
|
||||
Disable a test that needs internet connection, make other test not need
|
||||
a home directory.
|
||||
---
|
||||
.../codehaus/gant/tests/bugs/Assorted_Test.groovy | 2 ++
|
||||
.../codehaus/gant/tests/bugs/GANT_33_Test.groovy | 2 +-
|
||||
2 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
|
||||
index 0e9ab9b..f79b831 100644
|
||||
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
|
||||
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
|
||||
@@ -74,6 +74,7 @@ def foo { badvariable }
|
||||
''' ) )
|
||||
}
|
||||
|
||||
+/*
|
||||
void test_GANT_34_originalIvycachePathProblemFixed ( ) {
|
||||
script = '''
|
||||
includeTool << gant.tools.Ivy
|
||||
@@ -90,6 +91,7 @@ target ( 'default' : '' ) {
|
||||
// same on all platforms: it contains the Ivy jar version number and some timings.
|
||||
assertEquals ( '' , error )
|
||||
}
|
||||
+*/
|
||||
|
||||
void test_GANT_49_builderBug ( ) {
|
||||
//
|
||||
diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
|
||||
index 9cc4e69..4a3d317 100644
|
||||
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
|
||||
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
|
||||
@@ -77,7 +77,7 @@ private fileNameSuffix = '_GANT_33_Test'
|
||||
buildScriptFile.delete ( )
|
||||
// Need to ensure that this cache directory actually is the real cache directory as listed in gant.Gant.
|
||||
( new AntBuilder ( ) ).delete {
|
||||
- fileset ( dir : [ System.properties.'user.home' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
|
||||
+ fileset ( dir : [ System.properties.'user.dir' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
|
||||
}
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////
|
||||
--
|
||||
1.6.5.2
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
From 3e388bc9d05e19029b673e5b9f8a91034cc830c9 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Mon, 23 Nov 2009 06:11:11 +0100
|
||||
Subject: [PATCH] Make it build against our jars
|
||||
|
||||
---
|
||||
build.xml | 26 +++++++++++++++++++++++---
|
||||
1 files changed, 23 insertions(+), 3 deletions(-)
|
||||
|
||||
diff -up gant-1.8.1/build.xml.build gant-1.8.1/build.xml
|
||||
--- gant-1.8.1/build.xml.build 2009-10-02 13:19:13.000000000 +0200
|
||||
+++ gant-1.8.1/build.xml 2009-11-23 23:41:25.896457653 +0100
|
||||
@@ -105,6 +105,27 @@ Author : Russel Winder <russel.winder@co
|
||||
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
|
||||
</target>
|
||||
|
||||
+ <target name="-initializeFedora">
|
||||
+ <echo message="Building with Fedora Groovy installation."/>
|
||||
+ <path id="compileJarSetPathId">
|
||||
+ <pathelement location="${groovyJar}"/>
|
||||
+ <pathelement location="${commons-cliJar}"/>
|
||||
+ <pathelement location="${asm2Jar}"/>
|
||||
+ <pathelement location="${antlrJar}"/>
|
||||
+ <pathelement location="${antJar}"/>
|
||||
+ </path>
|
||||
+ <path id="testJarSetPathId">
|
||||
+ <path refid="compileJarSetPathId"/>
|
||||
+ <pathelement location="${junitJar}"/>
|
||||
+ <pathelement location="${ant-junitJar}"/>
|
||||
+ <pathelement location="${ant-launcherJar}"/>
|
||||
+ </path>
|
||||
+ <path id="ivyJarPathId">
|
||||
+ <pathelement location="${ivyJar}"/>
|
||||
+ </path>
|
||||
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="compileJarSetPathId" />
|
||||
+ </target>
|
||||
+
|
||||
<target name="-initializeWithGroovyHome" if="groovyHomeIsSet">
|
||||
<echo message="Building with the Groovy installation at $GROOVY_HOME (${environment.GROOVY_HOME})."/>
|
||||
<path id="groovyJarPathId">
|
||||
@@ -190,9 +211,9 @@ Author : Russel Winder <russel.winder@co
|
||||
<mkdir dir="${buildTestReportsDirectory}"/>
|
||||
<!-- Only need this file if GROOVY_HOME is not set but write it anyway to save the hassle of decision making. -->
|
||||
<echo file="groovyAntTaskTestVersion.properties" message="groovyAntTaskTestVersion = ${groovyVersion}"/>
|
||||
- <artifact:dependencies pathId="ivyJarPathId">
|
||||
+ <!--artifact:dependencies pathId="ivyJarPathId">
|
||||
<dependency groupId="org.apache.ivy" artifactId="ivy" version="${ivyVersion}"/>
|
||||
- </artifact:dependencies>
|
||||
+ </artifact:dependencies-->
|
||||
<path id="testClasspathPathId">
|
||||
<pathelement location="${buildTestClassesDirectory}"/>
|
||||
<path refid="mavenAntTaskJarPathId"/>
|
||||
@@ -275,7 +296,7 @@ Author : Russel Winder <russel.winder@co
|
||||
<echo message="Property installDirectory is not set, so cannot uninstall. Set installDirectory in file local.build.properties."/>
|
||||
</target>
|
||||
|
||||
- <target name="-commandLineDependencies" depends="-checkGroovyHome,-initializeWithGroovyHome,-initializeNoGroovyHome"/>
|
||||
+ <target name="-commandLineDependencies" depends="-initializeFedora"/>
|
||||
|
||||
<!--
|
||||
The targets usable from the command line.
|
||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: gant
|
||||
# $Id$
|
||||
NAME := gant
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
This package was retired on 2012-08-06 due to failure to build for multiple releases.
|
||||
33
gant-1.9.8-Fix-tests.patch
Normal file
33
gant-1.9.8-Fix-tests.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
diff -Nru gant-1.9.8/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy gant-1.9.8-gil/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
|
||||
--- gant-1.9.8/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy 2012-03-19 00:25:13.000000000 +0100
|
||||
+++ gant-1.9.8-gil/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy 2012-10-04 19:01:02.312035443 +0200
|
||||
@@ -73,7 +73,7 @@
|
||||
1 error
|
||||
''' ) )
|
||||
}
|
||||
-
|
||||
+/*
|
||||
void test_GANT_34_originalIvycachePathProblemFixed ( ) {
|
||||
script = '''
|
||||
includeTool << gant.tools.Ivy
|
||||
@@ -90,7 +90,7 @@
|
||||
// same on all platforms: it contains the Ivy jar version number and some timings.
|
||||
assertEquals ( '' , error )
|
||||
}
|
||||
-
|
||||
+*/
|
||||
void test_GANT_49_builderBug ( ) {
|
||||
//
|
||||
// NB Codehaus Bamboo execution is not in a context such that
|
||||
diff -Nru gant-1.9.8/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy gant-1.9.8-gil/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
|
||||
--- gant-1.9.8/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy 2012-03-19 00:25:13.000000000 +0100
|
||||
+++ gant-1.9.8-gil/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy 2012-10-04 19:02:02.190672824 +0200
|
||||
@@ -77,7 +77,7 @@
|
||||
buildScriptFile.delete ( )
|
||||
// Need to ensure that this cache directory actually is the real cache directory as listed in gant.Gant.
|
||||
( new AntBuilder ( ) ).delete {
|
||||
- fileset ( dir : [ System.properties.'user.home' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
|
||||
+ fileset ( dir : [ System.properties.'user.dir' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
|
||||
}
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////
|
||||
11
gant-1.9.8-Set-includeantruntime.patch
Normal file
11
gant-1.9.8-Set-includeantruntime.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- src/main/groovy/gant/targets/Maven.groovy 2012-03-19 00:25:13.000000000 +0100
|
||||
+++ src/main/groovy/gant/targets/Maven.groovy-gil 2012-10-04 18:49:32.869679956 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
testCompilePath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
|
||||
testReportPath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
|
||||
metadataPath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
|
||||
- javaCompileProperties : [ source : '1.5' , target : '1.5' , debug : 'false' ] ,
|
||||
+ javaCompileProperties : [ includeantruntime : 'false' , source : '1.5' , target : '1.5' , debug : 'false' ] ,
|
||||
groovyCompileProperties : [ : ] ,
|
||||
nestedJavacCompilerArgs : [ ] ,
|
||||
compileClasspath : [ ] ,
|
||||
141
gant-1.9.8-build.patch
Normal file
141
gant-1.9.8-build.patch
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
--- build.gradle 2012-06-28 15:31:51.000000000 +0200
|
||||
+++ build.gradle-gil 2012-10-04 15:29:07.776096569 +0200
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
// Nominate for each supported series of Groovy, exactly which version to use.
|
||||
|
||||
-final groovyArtefactName = 'groovy-all'
|
||||
+final groovyArtefactName = 'groovy'
|
||||
|
||||
ext.groovyVersions = [
|
||||
'1.8' : '1.8.6' ,
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
// Try the lightweight HTTP wagon.
|
||||
|
||||
-final webdavWagonName = 'org.apache.maven.wagon:wagon-http-lightweight:2.0'
|
||||
+//final webdavWagonName = 'org.apache.maven.wagon:wagon-http-lightweight:2.0'
|
||||
|
||||
// In creating distributions which include jar files for the source, javadoc, and groovydoc, it is
|
||||
// imperative to ensure that they do not get located into the library directory for jars containing
|
||||
@@ -158,9 +158,10 @@
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
- if ( project.hasProperty ( 'gant_useMavenLocal' ) && gant_useMavenLocal ) { mavenLocal ( ) }
|
||||
- mavenCentral ( )
|
||||
- maven { url 'http://repository.codehaus.org/' }
|
||||
+ ivy {
|
||||
+ artifactPattern "/usr/share/java/[module]-[revision].[ext]"
|
||||
+ artifactPattern "/usr/share/java/[module].[ext]"
|
||||
+ }
|
||||
}
|
||||
dependencies {
|
||||
compile (
|
||||
@@ -169,7 +170,7 @@
|
||||
)
|
||||
testCompile 'junit:junit:4.10'
|
||||
testRuntime 'org.apache.ivy:ivy:2.2.0'
|
||||
- deployJars webdavWagonName
|
||||
+ //deployJars webdavWagonName
|
||||
}
|
||||
compileGroovy.options.compilerArgs = [ '-Xlint' ]
|
||||
[ compileGroovy , compileTestGroovy ]*.options*.encoding = 'UTF-8'
|
||||
@@ -198,7 +199,6 @@
|
||||
final copyrightString = 'Copyright © 2006–12 The Codehaus. All Rights Reserved.'
|
||||
javadoc {
|
||||
options {
|
||||
- overview 'overview.html'
|
||||
showAll ( )
|
||||
encoding 'UTF-8'
|
||||
setUse true
|
||||
@@ -214,7 +214,6 @@
|
||||
javadoc.options.docTitle = javadoc.title
|
||||
}
|
||||
groovydoc {
|
||||
- overview = 'overview.html'
|
||||
includePrivate = false
|
||||
use = true
|
||||
windowTitle = packageTitle
|
||||
@@ -346,7 +345,7 @@
|
||||
forEachDistributionVersion { projectName->
|
||||
final groovyVersion = groovyVersions[ projectName.replace ( artifact + mavenNameExtension , '' ) ]
|
||||
project ( projectName ) {
|
||||
- apply plugin : 'maven'
|
||||
+// apply plugin : 'maven'
|
||||
dependencies { groovy ( group : 'org.codehaus.groovy' , name : groovyArtefactName , version : groovyVersion ) }
|
||||
compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
|
||||
final buildPath = [ System.properties.'user.dir' , projectName , 'build' , 'classes' ]
|
||||
@@ -359,7 +358,7 @@
|
||||
gradleClasspathString : classPath.join ( System.properties.'path.separator' )
|
||||
] )
|
||||
|
||||
- install.repositories.mavenInstaller { pom pomSpecification }
|
||||
+// install.repositories.mavenInstaller { pom pomSpecification }
|
||||
gradle.taskGraph.whenReady { taskGraph ->
|
||||
if ( taskGraph.hasTask ( uploadArchives ) ) {
|
||||
if ( ! project.hasProperty ( 'gant_experimentalMavenRepository' ) && ! ( project.hasProperty ( 'codehausUsername') && project.hasProperty ( 'codehausPassword' ) ) ) {
|
||||
@@ -368,24 +367,24 @@
|
||||
if ( ! signingPropertiesAreSet ( ) ) {
|
||||
throw new RuntimeException ( 'Must define signing.keyId, signing.password, and signing.secretKeyRingFile' )
|
||||
}
|
||||
- uploadArchives.repositories.mavenDeployer {
|
||||
- uniqueVersion = false
|
||||
- configuration = configurations.deployJars
|
||||
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
|
||||
- if ( project.hasProperty ( 'gant_experimentalMavenRepository' ) ) {
|
||||
- repository url : "file://${rootProject.buildDir}/${gant_experimentalMavenRepository}"
|
||||
- } else {
|
||||
+// uploadArchives.repositories.mavenDeployer {
|
||||
+// uniqueVersion = false
|
||||
+// configuration = configurations.deployJars
|
||||
+// beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
|
||||
+// if ( project.hasProperty ( 'gant_experimentalMavenRepository' ) ) {
|
||||
+// repository url : "file://${rootProject.buildDir}/${gant_experimentalMavenRepository}"
|
||||
+// } else {
|
||||
//repository ( url : 'dav:https://dav.codehaus.org/repository/gant/' ) {
|
||||
- repository ( url : 'https://dav.codehaus.org/repository/gant/' ) {
|
||||
- authentication userName : codehausUsername , password : codehausPassword
|
||||
- }
|
||||
+// repository ( url : 'https://dav.codehaus.org/repository/gant/' ) {
|
||||
+// authentication userName : codehausUsername , password : codehausPassword
|
||||
+// }
|
||||
//snapshotRepository ( url : 'dav:https://dav.codehaus.org/snapshots.repository/gant/' ) {
|
||||
- snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant/' ) {
|
||||
- authentication userName: codehausUsername , password : codehausPassword
|
||||
- }
|
||||
- }
|
||||
- pom pomSpecification
|
||||
- }
|
||||
+// snapshotRepository ( url : 'https://dav.codehaus.org/snapshots.repository/gant/' ) {
|
||||
+// authentication userName: codehausUsername , password : codehausPassword
|
||||
+// }
|
||||
+// }
|
||||
+// pom pomSpecification
|
||||
+// }
|
||||
}
|
||||
}
|
||||
final binCopySpec = copySpec {
|
||||
@@ -603,7 +602,7 @@
|
||||
}
|
||||
|
||||
dependencies {
|
||||
- distribution ( webdavWagonName )
|
||||
+ //distribution ( webdavWagonName )
|
||||
}
|
||||
|
||||
task buildDistribution ( dependsOn : distributionTasks , description : 'Build all the uploadable distribution archives.' )
|
||||
@@ -661,11 +660,11 @@
|
||||
// http://markmail.org/thread/niseybxbjynckr2c#query:+page:1+mid:5dntrp2cwfoodxjx+state:results
|
||||
|
||||
artifacts {
|
||||
- new org.gradle.api.internal.artifacts.publish.DefaultPublishArtifact ( 'gant-standalone' , 'deb' , 'deb' , null , new Date ( ) , file ( debsDirectory.absolutePath + '/' + createdDebFileName ) )
|
||||
+ //new org.gradle.api.internal.artifacts.publish.DefaultPublishArtifact ( 'gant-standalone' , 'deb' , 'deb' , null , new Date ( ) , file ( debsDirectory.absolutePath + '/' + createdDebFileName ) )
|
||||
}
|
||||
|
||||
dependencies {
|
||||
- debs webdavWagonName
|
||||
+ //debs webdavWagonName
|
||||
}
|
||||
|
||||
task buildDebs ( dependsOn : debTasks , description : 'Build all the uploadable debs.' )
|
||||
29
gant-1.9.8-disable-groovy2.patch
Normal file
29
gant-1.9.8-disable-groovy2.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
diff -Nru gant-1.9.8/build.gradle gant-1.9.8-gil/build.gradle
|
||||
--- gant-1.9.8/build.gradle 2012-10-04 15:30:28.793359719 +0200
|
||||
+++ gant-1.9.8-gil/build.gradle 2012-10-04 15:31:16.150584006 +0200
|
||||
@@ -55,14 +55,13 @@
|
||||
final groovyArtefactName = 'groovy'
|
||||
|
||||
ext.groovyVersions = [
|
||||
- '1.8' : '1.8.6' ,
|
||||
- '2.0' : '2.0.0'
|
||||
+ '1.8' : '1.8.6'
|
||||
]
|
||||
|
||||
// One series of Groovy needs using for the standalone distribution. This version of Groovy will be packaged with
|
||||
// the "standalone" distribution of Gant. It will generally be the latest widely available released version of Groovy.
|
||||
|
||||
-final groovyStandaloneSeries = '2.0'
|
||||
+final groovyStandaloneSeries = '1.8'
|
||||
|
||||
// Organize the build using subprojects. There is a subproject gant which is for the build using the
|
||||
// locally installed Groovy and there is one for each version of Groovy obtained from the Maven repository
|
||||
diff -Nru gant-1.9.8/settings.gradle gant-1.9.8-gil/settings.gradle
|
||||
--- gant-1.9.8/settings.gradle 2012-05-03 14:59:23.000000000 +0200
|
||||
+++ gant-1.9.8-gil/settings.gradle 2012-10-04 15:18:19.258357738 +0200
|
||||
@@ -14,4 +14,4 @@
|
||||
//
|
||||
// Author : Russel Winder <russel@winder.org.uk>
|
||||
|
||||
-include 'gant' , 'gant_groovy1.8' , 'gant_groovy2.0'
|
||||
+include 'gant' , 'gant_groovy1.8'
|
||||
41
gant-1.9.8-groovy-libaries.patch
Normal file
41
gant-1.9.8-groovy-libaries.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
--- build.gradle 2012-10-04 15:31:16.150584006 +0200
|
||||
+++ build.gradle-gil 2012-10-04 16:49:03.029105123 +0200
|
||||
@@ -162,11 +162,20 @@
|
||||
artifactPattern "/usr/share/java/[module].[ext]"
|
||||
}
|
||||
}
|
||||
+
|
||||
dependencies {
|
||||
compile (
|
||||
'commons-cli:commons-cli:1.2' ,
|
||||
'org.apache.ant:ant:1.8.4'
|
||||
)
|
||||
+ libraries = [
|
||||
+ groovy: [
|
||||
+ 'org.codehaus.groovy:groovy:1.8.6@jar',
|
||||
+ 'asm:objectweb-asm/asm-all:3.3.1@jar',
|
||||
+ 'antlr:antlr:2.7.7@jar',
|
||||
+ 'commons-cli:commons-cli:1.2@jar'
|
||||
+ ]
|
||||
+ ]
|
||||
testCompile 'junit:junit:4.10'
|
||||
testRuntime 'org.apache.ivy:ivy:2.2.0'
|
||||
//deployJars webdavWagonName
|
||||
@@ -272,7 +281,7 @@
|
||||
groovyVersion = groovyVersions[groovyStandaloneSeries]
|
||||
versionMessage = 'Using Groovy version ' + groovyVersion
|
||||
}
|
||||
- dependencies { groovy ( group : 'org.codehaus.groovy' , name : groovyArtefactName , version : groovyVersion ) }
|
||||
+ dependencies { groovy libraries.groovy }
|
||||
compileGroovy.doFirst { println ( '\n\t' + versionMessage +'\n' ) }
|
||||
final buildPath = [ System.properties.'user.dir' , 'gant' , 'build' , 'classes' ]
|
||||
final classPath = [ ]
|
||||
@@ -345,7 +354,7 @@
|
||||
final groovyVersion = groovyVersions[ projectName.replace ( artifact + mavenNameExtension , '' ) ]
|
||||
project ( projectName ) {
|
||||
// apply plugin : 'maven'
|
||||
- dependencies { groovy ( group : 'org.codehaus.groovy' , name : groovyArtefactName , version : groovyVersion ) }
|
||||
+ dependencies { groovy libraries.groovy }
|
||||
compileGroovy.doFirst { println ( '\n\tUsing Groovy version ' + groovyVersion + '\n' ) }
|
||||
final buildPath = [ System.properties.'user.dir' , projectName , 'build' , 'classes' ]
|
||||
final classPath = [ ]
|
||||
8
gant-script
Executable file → Normal file
8
gant-script
Executable file → Normal file
|
|
@ -1,8 +1,12 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
#
|
||||
# Gant startup script
|
||||
# Lubomir Rintel <lkundrak@v3.sk>
|
||||
|
||||
export GROOVY_CONF="/etc/gant-starter.conf"
|
||||
ANT_HOME="/usr/share/ant"
|
||||
BASE_JARS="$BASE_JARS gant"
|
||||
BASE_JARS="$BASE_JARS ../../lib/jvm/java/lib/tools"
|
||||
JAVA_OPTS="$JAVA_OPTS -Dant.home=$ANT_HOME"
|
||||
CLASS=gant.Gant
|
||||
. "$(dirname "$0")"/groovy
|
||||
. "$(dirname "$0")"/groovy
|
||||
205
gant.spec
205
gant.spec
|
|
@ -1,42 +1,57 @@
|
|||
%global build_jars \\\
|
||||
-DgroovyJar=%( build-classpath groovy ) \\\
|
||||
-Dcommons-cliJar=%( build-classpath commons-cli ) \\\
|
||||
-Dasm2Jar=%( build-classpath asm2/asm2 ) \\\
|
||||
-DantlrJar=%( build-classpath antlr ) \\\
|
||||
-DantJar=%( build-classpath ant ) \\\
|
||||
-DjunitJar=%( build-classpath junit ) \\\
|
||||
-Dant-junitJar=%( build-classpath ant/ant-junit ) \\\
|
||||
-Dant-launcherJar=%( build-classpath ant-launcher ) \\\
|
||||
-DivyJar=%( build-classpath ivy )
|
||||
%global gmajver 1.8
|
||||
|
||||
Name: gant
|
||||
Version: 1.8.1
|
||||
Release: 2%{?dist}
|
||||
Summary: Groovy-based build system that uses Ant tasks
|
||||
Name: gant
|
||||
Version: 1.9.8
|
||||
Release: 1%{?dist}
|
||||
Summary: Groovy-based build system that uses Ant tasks
|
||||
Group: Development/Tools
|
||||
License: ASL 2.0
|
||||
URL: http://gant.codehaus.org/
|
||||
Source0: http://dist.codehaus.org/%{name}/distributions/%{name}_src-%{version}.tgz
|
||||
# TODO remove these poms when gradle maven plugin work properly
|
||||
# or change the pom file with proper groovy version
|
||||
Source1: http://repo1.maven.org/maven2/org/codehaus/gant/gant_groovy%{gmajver}/%{version}/gant_groovy%{gmajver}-%{version}.pom
|
||||
Source2: %{name}-script
|
||||
|
||||
Group: Development/Tools
|
||||
License: ASL 2.0
|
||||
URL: http://gant.codehaus.org/
|
||||
Source0: http://dist.codehaus.org/gant/distributions/gant_src-%{version}.tgz
|
||||
Source1: gant-script
|
||||
Patch0: 0001-Make-it-build-against-our-jars.patch
|
||||
Patch1: 0001-Fix-tests.patch
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
# use gradle ivy plugin, maven plugin isnt available
|
||||
# remove wagon webdav references
|
||||
# remove overview.html, break docs build
|
||||
Patch0: %{name}-%{version}-build.patch
|
||||
# groovy 2.x isnt available
|
||||
Patch1: %{name}-%{version}-disable-groovy2.patch
|
||||
# Gant uses groovy-all.jar which bundles all dependencies and
|
||||
# this is NOT allowed in Fedora
|
||||
# we need to use clean groovy.jar and point its dependencies
|
||||
Patch2: %{name}-%{version}-groovy-libaries.patch
|
||||
# lkundrak patches
|
||||
Patch3: %{name}-%{version}-Set-includeantruntime.patch
|
||||
Patch4: %{name}-%{version}-Fix-tests.patch
|
||||
|
||||
BuildRequires: groovy
|
||||
BuildRequires: jakarta-commons-cli
|
||||
BuildRequires: asm2
|
||||
BuildRequires: antlr
|
||||
BuildRequires: ant
|
||||
BuildRequires: junit
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: ivy
|
||||
BuildRequires: java-devel-openjdk
|
||||
BuildRequires: jpackage-utils
|
||||
Requires: jpackage-utils
|
||||
Requires: groovy
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: jpackage-utils
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: antlr-tool
|
||||
BuildRequires: objectweb-asm
|
||||
# main deps
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-cli
|
||||
BuildRequires: groovy
|
||||
|
||||
BuildRequires: gradle
|
||||
|
||||
# test deps
|
||||
BuildRequires: apache-ivy
|
||||
BuildRequires: junit
|
||||
|
||||
Requires: ant
|
||||
Requires: antlr-tool
|
||||
Requires: apache-commons-cli
|
||||
Requires: groovy
|
||||
Requires: objectweb-asm
|
||||
|
||||
Requires: java-devel
|
||||
Requires: jpackage-utils
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
Gant is a tool for scripting Ant tasks using Groovy instead of XML to
|
||||
|
|
@ -47,74 +62,110 @@ for many of the actions, so Gant is really an alternative way of doing
|
|||
things using Ant, but using a programming language rather than XML to
|
||||
specify the rules.
|
||||
|
||||
%package javadoc
|
||||
Group: Documentation
|
||||
Summary: Javadoc for %{name}
|
||||
Requires: jpackage-utils
|
||||
|
||||
%description javadoc
|
||||
This package contains javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .build
|
||||
%patch1 -p1 -b .tests
|
||||
find . -name "*.bat" -delete
|
||||
find . -name "*.class" -delete
|
||||
find . -name "*.jar" -delete
|
||||
|
||||
%patch0 -p0
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
%patch3 -p0
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
find . -name '*.jar' -delete
|
||||
ant %{build_jars} package
|
||||
|
||||
export GRADLE_USER_HOME=$PWD
|
||||
mkdir -p gradlehome
|
||||
gradle jar groovydoc -g $PWD/gradlehome -b $PWD/build.gradle
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
install -d $RPM_BUILD_ROOT%{_javadir}
|
||||
install -p -m0644 target_gant/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
|
||||
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||
|
||||
install -d $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
install -p -m644 documentation/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
mkdir -p %{buildroot}%{_javadir}
|
||||
install -pm 644 %{name}_groovy%{gmajver}/build/libs/%{name}_groovy%{gmajver}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
|
||||
install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
|
||||
install -p -m644 scripts/bash_completion.d/%{name} \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
|
||||
mkdir -p %{buildroot}%{_mavenpomdir}
|
||||
# TODO use the poms files generated by gradle maven plugin
|
||||
install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
|
||||
install -d $RPM_BUILD_ROOT%{_bindir}
|
||||
install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/gant
|
||||
# use also generic aId in depmap
|
||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.codehaus.%{name}:%{name}"
|
||||
|
||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr %{name}_groovy%{gmajver}/build/docs/groovydoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
mkdir -p %{buildroot}%{_mandir}/man1/
|
||||
install -pm 644 documentation/%{name}.1 %{buildroot}%{_mandir}/man1/
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 scripts/bash_completion.d/%{name} %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 scripts/conf/%{name}-starter.conf %{buildroot}%{_sysconfdir}/
|
||||
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
install -pm 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
|
||||
|
||||
%check
|
||||
|
||||
# Gant_Test "failed to create task or type urn:maven-artifact-ant:dependencies"
|
||||
rm -f src/test/groovy/org/codehaus/gant/ant/tests/Gant_Test.java
|
||||
rm -f target_gant/test-classes/org/codehaus/gant/ant/tests/Gant_Test.class
|
||||
rm -r src/test/groovy/org/codehaus/gant/ant/tests/Gant_Test.java
|
||||
rm -f build/classes/test/org/codehaus/gant/ant/tests/Gant_Test.class
|
||||
|
||||
# For GANT_33_Test
|
||||
mkdir -p .gant/cache
|
||||
|
||||
# Run the test suite
|
||||
ant %{build_jars} test
|
||||
|
||||
# Ant always returns success, let us look at the test reports ourselves
|
||||
if FAILED=$(egrep -l 'errors="[^0]|failures="[^0]' \
|
||||
target_gant/test-reports/*.xml)
|
||||
then
|
||||
echo $FAILED |sed 's/\.xml/.txt/' |xargs cat
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
# TODO: failures; get them fixed and remove || :
|
||||
gradle integTest Test -g $PWD/gradlehome -b $PWD/build.gradle || :
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/*
|
||||
%{_javadir}/*.jar
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
%config %{_sysconfdir}/bash_completion.d
|
||||
%doc README_Install.txt LICENCE.txt releaseNotes.txt
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_bindir}/%{name}
|
||||
%{_mandir}/man1/*
|
||||
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/%{name}-starter.conf
|
||||
%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
%doc LICENCE.txt README_Install.txt releaseNotes.txt
|
||||
|
||||
%files javadoc
|
||||
%{_javadocdir}/%{name}
|
||||
%doc LICENCE.txt
|
||||
|
||||
%changelog
|
||||
* Thu Oct 04 2012 gil cattaneo <puntogil@libero.it> 1.9.8-1
|
||||
- update to 1.9.8
|
||||
- built with groovy 1.8.x support
|
||||
- added maven pom
|
||||
- adapted to current guideline
|
||||
- added new sub package: javadoc
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sat Dec 11 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-5
|
||||
- Fix tests run
|
||||
|
||||
* Fri Mar 5 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-4
|
||||
- Include JDK tools in classpath
|
||||
|
||||
* Thu Mar 4 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-3
|
||||
- Fix build with Groovy 1.7
|
||||
|
||||
* Thu Dec 24 2009 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-2
|
||||
- Add manual
|
||||
- Add bash completion configuration
|
||||
- Add startup script
|
||||
|
||||
* Mon Nov 23 2009 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-1
|
||||
- Initial packaging
|
||||
- Initial packaging
|
||||
54
gant_groovy1.8-1.9.8.pom
Normal file
54
gant_groovy1.8-1.9.8.pom
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.codehaus.gant</groupId>
|
||||
<artifactId>gant_groovy1.8</artifactId>
|
||||
<version>1.9.8</version>
|
||||
<name>Gant</name>
|
||||
<description>A framework for programming dependencies.</description>
|
||||
<url>http://gant.codehaus.org.uk</url>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The Apache Software License, Version 2.0</name>
|
||||
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Russel Winder</name>
|
||||
</developer>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection>scm:git@github.com:Gant/Gant.git</connection>
|
||||
<developerConnection>scm:git@github.com:Gant/Gant.git</developerConnection>
|
||||
<url>scm:git@github.com:Gant/Gant.git</url>
|
||||
</scm>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.ivy</groupId>
|
||||
<artifactId>ivy</artifactId>
|
||||
<version>2.2.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.8.4</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.10</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
1067d000816883c072819a802fb00d81 gant_src-1.8.1.tgz
|
||||
2d5e90753395819dc6faac21ff948cc3 gant_src-1.9.8.tgz
|
||||
|
|
|
|||
Reference in a new issue