From 75ab18688e58c4ece427bdd6b7601ad195defba3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:22:55 +0000 Subject: [PATCH 1/5] Initialize branch F-13 for gant --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From ac6216d641a71669f31859aaf12cf532a77966df Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 4 Mar 2010 08:45:06 +0000 Subject: [PATCH 2/5] Fix ftbfs --- gant-1.8.1-groovy7.patch | 16 ++++++++++++++++ gant.spec | 11 ++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 gant-1.8.1-groovy7.patch diff --git a/gant-1.8.1-groovy7.patch b/gant-1.8.1-groovy7.patch new file mode 100644 index 0000000..545b96c --- /dev/null +++ b/gant-1.8.1-groovy7.patch @@ -0,0 +1,16 @@ +Fix up a test so that it passes with groovy 1.7.0. + +Lubomir Rintel + +diff -urp gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy +--- gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy 2009-10-02 13:19:23.000000000 +0200 ++++ gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy 2010-03-04 09:37:50.040561684 +0100 +@@ -555,7 +555,7 @@ target ( ${something} : '' ) { } + """ + 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}' : '[class gant.targets.Clean]' ) + '\n' , error ) ++ assertTrue ( error ==~ /^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: .class gant.targets.Clean.*/ ) + } + void testErrorNullPower ( ) { + script = """ diff --git a/gant.spec b/gant.spec index 0a931a2..bffec36 100644 --- a/gant.spec +++ b/gant.spec @@ -1,7 +1,7 @@ %global build_jars \\\ -DgroovyJar=%( build-classpath groovy ) \\\ -Dcommons-cliJar=%( build-classpath commons-cli ) \\\ - -Dasm2Jar=%( build-classpath asm2/asm2 ) \\\ + -Dasm2Jar=%( build-classpath objectweb-asm/asm ) \\\ -DantlrJar=%( build-classpath antlr ) \\\ -DantJar=%( build-classpath ant ) \\\ -DjunitJar=%( build-classpath junit ) \\\ @@ -11,7 +11,7 @@ Name: gant Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Groovy-based build system that uses Ant tasks Group: Development/Tools @@ -21,11 +21,12 @@ Source0: http://dist.codehaus.org/gant/distributions/gant_src-%{version}. Source1: gant-script Patch0: 0001-Make-it-build-against-our-jars.patch Patch1: 0001-Fix-tests.patch +Patch2: gant-1.8.1-groovy7.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: groovy BuildRequires: jakarta-commons-cli -BuildRequires: asm2 +BuildRequires: objectweb-asm BuildRequires: antlr BuildRequires: ant BuildRequires: junit @@ -52,6 +53,7 @@ specify the rules. %setup -q %patch0 -p1 -b .build %patch1 -p1 -b .tests +%patch2 -p1 -b .groovy7 %build @@ -111,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 4 2010 Lubomir Rintel - 1.8.1-3 +- Fix build with Groovy 1.7 + * Thu Dec 24 2009 Lubomir Rintel - 1.8.1-2 - Add manual - Add bash completion configuration From 6598154912c00a6018edb17223de616bb9286c4d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 4 Mar 2010 09:11:24 +0000 Subject: [PATCH 3/5] Fix build --- gant-1.8.1-groovy7.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gant-1.8.1-groovy7.patch b/gant-1.8.1-groovy7.patch index 545b96c..65bc24c 100644 --- a/gant-1.8.1-groovy7.patch +++ b/gant-1.8.1-groovy7.patch @@ -1,7 +1,5 @@ Fix up a test so that it passes with groovy 1.7.0. -Lubomir Rintel - diff -urp gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy --- gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy 2009-10-02 13:19:23.000000000 +0200 +++ gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy 2010-03-04 09:37:50.040561684 +0100 @@ -10,7 +8,7 @@ diff -urp gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy 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}' : '[class gant.targets.Clean]' ) + '\n' , error ) -+ assertTrue ( error ==~ /^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: .class gant.targets.Clean.*/ ) ++ 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 = """ From bcb7f6f9c38fe253a8a2d13ca502d8b99c6d93b5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 5 Mar 2010 06:48:39 +0000 Subject: [PATCH 4/5] Include tools in classpath --- gant-script | 1 + gant.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gant-script b/gant-script index 6161102..ad63012 100755 --- a/gant-script +++ b/gant-script @@ -4,5 +4,6 @@ # Lubomir Rintel BASE_JARS="$BASE_JARS gant" +BASE_JARS="$BASE_JARS ../../lib/jvm/java/lib/tools" CLASS=gant.Gant . "$(dirname "$0")"/groovy diff --git a/gant.spec b/gant.spec index bffec36..fbc5f32 100644 --- a/gant.spec +++ b/gant.spec @@ -11,7 +11,7 @@ Name: gant Version: 1.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Groovy-based build system that uses Ant tasks Group: Development/Tools @@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 5 2010 Lubomir Rintel - 1.8.1-4 +- Include JDK tools in classpath + * Thu Mar 4 2010 Lubomir Rintel - 1.8.1-3 - Fix build with Groovy 1.7 From b327691e7dc10d1e1c6a43ecc26a23fde9ba9c64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:02:30 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b2ecfe8..0000000 --- a/Makefile +++ /dev/null @@ -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) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13