Add builnumber plugin to buildrequires
- Tab/space cleanup
This commit is contained in:
parent
98ebb07af3
commit
b099f74686
133
antlr-pom.patch
133
antlr-pom.patch
|
@ -1,133 +0,0 @@
|
||||||
diff -up ./gunit/pom.xml.pomfix ./gunit/pom.xml
|
|
||||||
--- ./gunit/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
|
|
||||||
+++ ./gunit/pom.xml 2010-10-12 17:05:12.000000000 -0400
|
|
||||||
@@ -142,16 +142,6 @@
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
- <plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>findbugs-maven-plugin</artifactId>
|
|
||||||
- <configuration>
|
|
||||||
- <findbugsXmlOutput>true</findbugsXmlOutput>
|
|
||||||
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
|
|
||||||
- <xmlOutput>true</xmlOutput>
|
|
||||||
- </configuration>
|
|
||||||
- </plugin>
|
|
||||||
-
|
|
||||||
</plugins>
|
|
||||||
|
|
||||||
<extensions>
|
|
||||||
diff -up ./pom.xml.pomfix ./pom.xml
|
|
||||||
--- ./pom.xml.pomfix 2009-09-23 14:46:18.000000000 -0400
|
|
||||||
+++ ./pom.xml 2010-10-12 17:05:12.770549001 -0400
|
|
||||||
@@ -146,25 +146,6 @@
|
|
||||||
|
|
||||||
<plugins>
|
|
||||||
|
|
||||||
- <plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>buildnumber-maven-plugin</artifactId>
|
|
||||||
- <configuration>
|
|
||||||
- <format>{0,date,MMM dd, yyyy} {0,time,kk:mm:ss}</format>
|
|
||||||
- <items>
|
|
||||||
- <item>timestamp</item>
|
|
||||||
- </items>
|
|
||||||
- </configuration>
|
|
||||||
- <executions>
|
|
||||||
- <execution>
|
|
||||||
- <phase>validate</phase>
|
|
||||||
- <goals>
|
|
||||||
- <goal>create</goal>
|
|
||||||
- </goals>
|
|
||||||
- </execution>
|
|
||||||
- </executions>
|
|
||||||
- </plugin>
|
|
||||||
-
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
@@ -179,16 +160,6 @@
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>findbugs-maven-plugin</artifactId>
|
|
||||||
- <configuration>
|
|
||||||
- <findbugsXmlOutput>true</findbugsXmlOutput>
|
|
||||||
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
|
|
||||||
- <xmlOutput>true</xmlOutput>
|
|
||||||
- </configuration>
|
|
||||||
- </plugin>
|
|
||||||
-
|
|
||||||
- <plugin>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
|
|
||||||
diff -up ./runtime/Java/pom.xml.pomfix ./runtime/Java/pom.xml
|
|
||||||
--- ./runtime/Java/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
|
|
||||||
+++ ./runtime/Java/pom.xml 2010-10-12 17:05:12.000000000 -0400
|
|
||||||
@@ -105,14 +105,38 @@
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>findbugs-maven-plugin</artifactId>
|
|
||||||
+ <artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
- <findbugsXmlOutput>true</findbugsXmlOutput>
|
|
||||||
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
|
|
||||||
- <xmlOutput>true</xmlOutput>
|
|
||||||
+ <archive>
|
|
||||||
+ <manifestFile>target/osgi/MANIFEST.MF</manifestFile>
|
|
||||||
+ </archive>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
+ <plugin>
|
|
||||||
+ <groupId>org.apache.felix</groupId>
|
|
||||||
+ <artifactId>maven-bundle-plugin</artifactId>
|
|
||||||
+ <configuration>
|
|
||||||
+ <excludeDependencies>true</excludeDependencies>
|
|
||||||
+ <manifestLocation>target/osgi</manifestLocation>
|
|
||||||
+ <instructions>
|
|
||||||
+ <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
|
|
||||||
+ <_nouses>true</_nouses>
|
|
||||||
+ <Bundle-Vendor>antlr.org</Bundle-Vendor>
|
|
||||||
+ <Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName>
|
|
||||||
+ <Export-Package>org.antlr.*;version=${project.version}</Export-Package>
|
|
||||||
+ <Import-Package></Import-Package>
|
|
||||||
+ </instructions>
|
|
||||||
+ </configuration>
|
|
||||||
+ <executions>
|
|
||||||
+ <execution>
|
|
||||||
+ <id>bundle-manifest</id>
|
|
||||||
+ <phase>process-classes</phase>
|
|
||||||
+ <goals>
|
|
||||||
+ <goal>manifest</goal>
|
|
||||||
+ </goals>
|
|
||||||
+ </execution>
|
|
||||||
+ </executions>
|
|
||||||
+ </plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
diff -up ./tool/pom.xml.pomfix ./tool/pom.xml
|
|
||||||
--- ./tool/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
|
|
||||||
+++ ./tool/pom.xml 2010-10-12 17:05:12.000000000 -0400
|
|
||||||
@@ -59,7 +59,7 @@
|
|
||||||
|
|
||||||
<groupId>org.antlr</groupId>
|
|
||||||
<artifactId>antlr3-maven-plugin</artifactId>
|
|
||||||
- <version>3.1.3-1</version>
|
|
||||||
+ <version>3.2</version>
|
|
||||||
<configuration>
|
|
||||||
<libDirectory>target/generated-sources/antlr/org/antlr/grammar/v3</libDirectory>
|
|
||||||
</configuration>
|
|
||||||
@@ -77,6 +77,7 @@
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>antlr-maven-plugin</artifactId>
|
|
||||||
+ <version>2.1</version>
|
|
||||||
<configuration>
|
|
||||||
<sourceDirectory>src/main/antlr2/org/antlr/grammar/v2</sourceDirectory>
|
|
||||||
<grammars>antlr.g codegen.g, antlr.print.g, assign.types.g, buildnfa.g, define.g</grammars>
|
|
|
@ -1,37 +0,0 @@
|
||||||
--- antlr_python_runtime-3.1.2/antlr3/recognizers.py.orig 2010-05-01 13:30:01.000000000 +0200
|
|
||||||
+++ antlr_python_runtime-3.1.2/antlr3/recognizers.py 2010-05-01 13:36:00.000000000 +0200
|
|
||||||
@@ -164,24 +164,20 @@
|
|
||||||
self._state = state
|
|
||||||
|
|
||||||
if self.antlr_version > runtime_version:
|
|
||||||
- raise RuntimeError(
|
|
||||||
- "ANTLR version mismatch: "
|
|
||||||
- "The recognizer has been generated by V%s, but this runtime "
|
|
||||||
- "is V%s. Please use the V%s runtime or higher."
|
|
||||||
- % (self.antlr_version_str,
|
|
||||||
- runtime_version_str,
|
|
||||||
- self.antlr_version_str))
|
|
||||||
+ print >> sys.stderr, """
|
|
||||||
+ WARNING: ANTLR version mismatch:
|
|
||||||
+ The recognizer has been generated by V%s, but this runtime
|
|
||||||
+ is V%s, this may not work correctly. Please use the V%s runtime or higher.""" % (
|
|
||||||
+ self.antlr_version_str, runtime_version_str, self.antlr_version_str)
|
|
||||||
elif (self.antlr_version < (3, 1, 0, 0) and
|
|
||||||
self.antlr_version != runtime_version):
|
|
||||||
# FIXME: make the runtime compatible with 3.0.1 codegen
|
|
||||||
# and remove this block.
|
|
||||||
- raise RuntimeError(
|
|
||||||
- "ANTLR version mismatch: "
|
|
||||||
- "The recognizer has been generated by V%s, but this runtime "
|
|
||||||
- "is V%s. Please use the V%s runtime."
|
|
||||||
- % (self.antlr_version_str,
|
|
||||||
- runtime_version_str,
|
|
||||||
- self.antlr_version_str))
|
|
||||||
+ print >> sys.stderr, """
|
|
||||||
+ WARNING ANTLR version mismatch:
|
|
||||||
+ The recognizer has been generated by V%s, but this runtime
|
|
||||||
+ is V%s, this may not work correctly. Please use the V%s runtime.""" % (
|
|
||||||
+ self.antlr_version_str, runtime_version_str, self.antlr_version_str)
|
|
||||||
|
|
||||||
# this one only exists to shut up pylint :(
|
|
||||||
def setInput(self, input):
|
|
15
antlr3.spec
15
antlr3.spec
|
@ -9,7 +9,7 @@
|
||||||
Summary: ANother Tool for Language Recognition
|
Summary: ANother Tool for Language Recognition
|
||||||
Name: antlr3
|
Name: antlr3
|
||||||
Version: %{antlr_version}
|
Version: %{antlr_version}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
URL: http://www.antlr.org/
|
URL: http://www.antlr.org/
|
||||||
Source0: http://www.antlr.org/download/antlr-%{antlr_version}.tar.gz
|
Source0: http://www.antlr.org/download/antlr-%{antlr_version}.tar.gz
|
||||||
Source1: http://www.antlr.org/download/C/libantlr3c-%{antlr_version}.tar.gz
|
Source1: http://www.antlr.org/download/C/libantlr3c-%{antlr_version}.tar.gz
|
||||||
|
@ -21,10 +21,6 @@ Source6: settings.xml
|
||||||
Source7: http://www.antlr.org/download/antlr-%{antlr_version}.jar
|
Source7: http://www.antlr.org/download/antlr-%{antlr_version}.jar
|
||||||
Source8: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/antlr/antlr3-maven-plugin/%{antlr_version}/antlr3-maven-plugin-%{antlr_version}.jar
|
Source8: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/antlr/antlr3-maven-plugin/%{antlr_version}/antlr3-maven-plugin-%{antlr_version}.jar
|
||||||
%endif
|
%endif
|
||||||
# No buildnumber and findbugs:
|
|
||||||
Patch0: antlr-pom.patch
|
|
||||||
# Python version mismatch patch, to be possibly upstreamed:
|
|
||||||
Patch1: antlr-python-3.1.2-version.patch
|
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
BuildRequires: java-devel >= 1:1.6.0
|
BuildRequires: java-devel >= 1:1.6.0
|
||||||
|
@ -36,6 +32,7 @@ BuildRequires: maven-plugin-bundle
|
||||||
BuildRequires: maven-assembly-plugin
|
BuildRequires: maven-assembly-plugin
|
||||||
BuildRequires: maven-shared-reporting-impl
|
BuildRequires: maven-shared-reporting-impl
|
||||||
BuildRequires: maven-surefire-provider-junit4
|
BuildRequires: maven-surefire-provider-junit4
|
||||||
|
BuildRequires: buildnumber-maven-plugin
|
||||||
BuildRequires: junit4
|
BuildRequires: junit4
|
||||||
BuildRequires: tomcat6-servlet-2.5-api
|
BuildRequires: tomcat6-servlet-2.5-api
|
||||||
BuildRequires: tomcat6
|
BuildRequires: tomcat6
|
||||||
|
@ -226,11 +223,11 @@ install -pm 644 antlr3-maven-plugin/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-
|
||||||
install -pm 644 gunit-maven-plugin/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-maven-gunit-plugin.pom
|
install -pm 644 gunit-maven-plugin/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-maven-gunit-plugin.pom
|
||||||
|
|
||||||
# install jars
|
# install jars
|
||||||
install -m 644 runtime/Java/target/antlr-runtime-3.2.jar \
|
install -m 644 runtime/Java/target/antlr-runtime-%{version}.jar \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/java/antlr3-runtime.jar
|
$RPM_BUILD_ROOT%{_datadir}/java/antlr3-runtime.jar
|
||||||
%add_maven_depmap JPP-antlr3-runtime.pom antlr3-runtime.jar
|
%add_maven_depmap JPP-antlr3-runtime.pom antlr3-runtime.jar
|
||||||
|
|
||||||
install -m 644 tool/target/antlr-3.2.jar \
|
install -m 644 tool/target/antlr-%{version}.jar \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/java/antlr3.jar
|
$RPM_BUILD_ROOT%{_datadir}/java/antlr3.jar
|
||||||
%add_maven_depmap JPP-antlr3.pom antlr3.jar
|
%add_maven_depmap JPP-antlr3.pom antlr3.jar
|
||||||
|
|
||||||
|
@ -311,6 +308,10 @@ popd
|
||||||
%{_datadir}/antlr/
|
%{_datadir}/antlr/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 16 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.4-2
|
||||||
|
- Add builnumber plugin to buildrequires
|
||||||
|
- Tab/space cleanup
|
||||||
|
|
||||||
* Mon Jan 23 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.4-1
|
* Mon Jan 23 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.4-1
|
||||||
- Update antlr version to 3.4
|
- Update antlr version to 3.4
|
||||||
- Move to maven3 build, update macros etc
|
- Move to maven3 build, update macros etc
|
||||||
|
|
Loading…
Reference in New Issue