[antlr-maven-plugin/f14/master] initial commit

Tom Callaway spot at fedoraproject.org
Wed Oct 13 15:35:17 UTC 2010


commit 330f2a075feaf520e9d5ab743d2ccb75b4e0ca90
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Oct 13 11:34:59 2010 -0400

    initial commit

 antlr-maven-plugin.spec                    |  135 ++++++++++++++++++++++++++++
 maven-antlr-plugin-2.1-artifact.patch      |   15 +++
 maven-antlr-plugin-2.1-modello-issue.patch |   12 +++
 maven-antlr-plugin-2.1-sinkfix.patch       |   34 +++++++
 sources                                    |    1 +
 5 files changed, 197 insertions(+), 0 deletions(-)
---
diff --git a/antlr-maven-plugin.spec b/antlr-maven-plugin.spec
new file mode 100644
index 0000000..e0f7bd4
--- /dev/null
+++ b/antlr-maven-plugin.spec
@@ -0,0 +1,135 @@
+%global svndate		20101012
+%global	svnver		12849
+%global svnstring	%{svndate}svn%{svnver}
+
+Name:			antlr-maven-plugin
+Version:		2.1
+Release:		3.%{svnstring}%{?dist}
+Summary:		Maven plugin that generates files based on grammar file(s)
+License:		ASL 2.0
+URL:			http://mojo.codehaus.org/antlr-maven-plugin/
+Group:			Development/Libraries
+# No source tarball known.
+# Checked out from SVN
+# svn export https://svn.codehaus.org/mojo/tags/antlr-maven-plugin-2.1 antlr-maven-plugin
+# tar cfj antlr-maven-plugin-20101012svn12849.tar.bz2 antlr-maven-plugin
+Source0:		%{name}-%{svnstring}.tar.bz2
+# Modern modello expects to see <models></models>, even if there is only one. 
+Patch0:			maven-antlr-plugin-2.1-modello-issue.patch
+# Add maven-artifact to the pom.xml, we need it to build
+Patch1:			maven-antlr-plugin-2.1-artifact.patch
+# siteRenderer.createSink doesn't exist anymore
+Patch2:			maven-antlr-plugin-2.1-sinkfix.patch
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:		noarch
+BuildRequires:		java-devel
+BuildRequires:		jpackage-utils
+BuildRequires:		antlr
+BuildRequires:		maven2
+BuildRequires:		maven2-plugin-compiler
+BuildRequires:		maven2-plugin-install
+BuildRequires:		maven2-plugin-jar
+BuildRequires:		maven2-plugin-javadoc
+BuildRequires:		maven2-plugin-resources
+BuildRequires:		maven2-plugin-surefire
+BuildRequires:		maven-antrun-plugin
+BuildRequires:		maven-clean-plugin
+BuildRequires:		maven-invoker-plugin
+BuildRequires:		maven-plugin-plugin
+BuildRequires:		maven-release-plugin
+BuildRequires:		maven-site-plugin
+BuildRequires:		maven-source-plugin
+BuildRequires:		maven-plugin-bundle
+Requires:		antlr
+Requires:		jpackage-utils
+Requires:		java >= 1:1.6.0
+Requires(post):		jpackage-utils
+Requires(postun):	jpackage-utils
+Provides:		maven2-plugin-antlr = %{version}-%{release}
+Obsoletes:		maven2-plugin-antlr <= 2.0.8
+
+%description
+The Antlr Plugin has two goals:
+- antlr:generate Generates file(s) to a target directory based on grammar 
+  file(s).
+- antlr:html Generates Antlr report for grammar file(s).
+
+%package javadoc
+Summary:		Javadocs for %{name}
+Group:			Documentation
+Requires:		jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n %{name}
+%patch0 -p1 -b .modello
+%patch1 -p1 -b .artifact
+%patch2 -p1 -b .sink
+
+# remove all binary bits
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+# Tests seem unhappy, skipping them.
+mvn-jpp -Dmaven.test.skip=true \
+-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+install javadoc:javadoc
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_javadir}
+
+cp -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+pushd %{buildroot}%{_javadir}
+ln -s %{name}-%{version}.jar %{name}.jar
+popd
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/ %{buildroot}%{_javadocdir}/%{name}
+
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+%add_to_maven_depmap org.codehaus.mojo %{name} %{version} JPP %{name}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%clean
+rm -rf %{buildroot}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}*.jar
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+
+%changelog
+* Wed Oct 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-3.20101012svn12849
+- fix provides/obsoletes to replace old (dead) package
+- don't own mavendepmapfragdir, just the files inside it
+- don't set buildarch on javadoc (entire package is noarch already)
+
+* Wed Oct 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-2.20101012svn12849
+- add post/postun
+- fix pom filename
+- svn export
+- comment patchset
+- provides for maven-antlr-plugin
+- drop unnecessary symlinks
+- use maven macros
+
+* Tue Oct 12 2010 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1.20101012svn12849
+- initial package
diff --git a/maven-antlr-plugin-2.1-artifact.patch b/maven-antlr-plugin-2.1-artifact.patch
new file mode 100644
index 0000000..76c998f
--- /dev/null
+++ b/maven-antlr-plugin-2.1-artifact.patch
@@ -0,0 +1,15 @@
+diff -up antlr-maven-plugin/pom.xml.BAD antlr-maven-plugin/pom.xml
+--- antlr-maven-plugin/pom.xml.BAD	2010-10-12 12:49:41.836549272 -0400
++++ antlr-maven-plugin/pom.xml	2010-10-12 12:50:33.572549058 -0400
+@@ -88,6 +88,11 @@
+       </exclusions>
+     </dependency>
+     <dependency>
++      <groupId>org.apache.maven</groupId>
++      <artifactId>maven-artifact</artifactId>
++      <version>2.2.1</version>
++    </dependency>
++    <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-i18n</artifactId>
+       <version>1.0-beta-6</version>
diff --git a/maven-antlr-plugin-2.1-modello-issue.patch b/maven-antlr-plugin-2.1-modello-issue.patch
new file mode 100644
index 0000000..c41d2e4
--- /dev/null
+++ b/maven-antlr-plugin-2.1-modello-issue.patch
@@ -0,0 +1,12 @@
+diff -up antlr-maven-plugin/pom.xml.BAD antlr-maven-plugin/pom.xml
+--- antlr-maven-plugin/pom.xml.BAD	2010-10-12 12:32:35.534549053 -0400
++++ antlr-maven-plugin/pom.xml	2010-10-12 12:32:44.522548993 -0400
+@@ -151,7 +151,7 @@
+         </executions>
+         <configuration>
+           <version>1.0.0</version>
+-          <model>src/main/mdo/antlrOptions.mdo</model>
++          <models><model>src/main/mdo/antlrOptions.mdo</model></models>
+         </configuration>
+       </plugin>
+       <plugin>
diff --git a/maven-antlr-plugin-2.1-sinkfix.patch b/maven-antlr-plugin-2.1-sinkfix.patch
new file mode 100644
index 0000000..3ad5787
--- /dev/null
+++ b/maven-antlr-plugin-2.1-sinkfix.patch
@@ -0,0 +1,34 @@
+diff -up antlr-maven-plugin/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java.BAD antlr-maven-plugin/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
+--- antlr-maven-plugin/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java.BAD	2010-10-12 13:14:45.228549104 -0400
++++ antlr-maven-plugin/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java	2010-10-12 13:16:26.605549002 -0400
+@@ -25,6 +25,7 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Locale;
+ 
++import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+@@ -218,20 +219,11 @@ public class AntlrHtmlReport
+     {
+         try
+         {
+-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
++            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
++            SiteRendererSink sink = new SiteRendererSink( context );
+ 
+             generate( sink, Locale.getDefault() );
+         }
+-        catch ( RendererException e )
+-        {
+-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+-                + " report generation.", e );
+-        }
+-        catch ( IOException e )
+-        {
+-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+-                + " report generation.", e );
+-        }
+         catch ( MavenReportException e )
+         {
+             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
diff --git a/sources b/sources
index e69de29..d4f5882 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d7bdfc5dac7e1aa9ecad5c86afa7a9ad  antlr-maven-plugin-20101012svn12849.tar.bz2


More information about the scm-commits mailing list