From 0d101f484110d58ca9570cd102fa05ebdbbe9d76 Mon Sep 17 00:00:00 2001
From: Charlie Root <root@mandriva.org>
Date: Fri, 9 Nov 2012 18:35:00 +0000
Subject: [PATCH] SILENT: ABF Import

---
 .abf.yml                         |   6 ++
 .gitignore                       |   5 ++
 antlr-pom.patch                  | 149 +++++++++++++++++++++++++++++++
 antlr-python-3.1.2-version.patch |  37 ++++++++
 4 files changed, 197 insertions(+)
 create mode 100644 .abf.yml
 create mode 100644 .gitignore
 create mode 100644 antlr-pom.patch
 create mode 100644 antlr-python-3.1.2-version.patch

diff --git a/.abf.yml b/.abf.yml
new file mode 100644
index 0000000..579b0a3
--- /dev/null
+++ b/.abf.yml
@@ -0,0 +1,6 @@
+sources:
+  "antlr3:"	4e02f3b099d80fd2630f599bb5b6a42381ec3913
+  "antlr-3.2.tar.gz:"	4cd20a66a2ac19710d0617d9d69e321a9fa7152b
+  "antlr-javascript-runtime-3.1.zip:"	c7827e3f5315f7688fbbd04e22863213802ac627
+  "antlr_python_runtime-3.1.2.tar.gz:"	c57d4a03f80d157e9c0c1c8cd3038171900a364c
+  "libantlr3c-3.2.tar.gz:"	89bfa4fbed8af7e089bff065a1ac8834a8deb493
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1f899e4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+antlr3
+antlr-3.2.tar.gz
+antlr-javascript-runtime-3.1.zip
+antlr_python_runtime-3.1.2.tar.gz
+libantlr3c-3.2.tar.gz
diff --git a/antlr-pom.patch b/antlr-pom.patch
new file mode 100644
index 0000000..c9ba6d9
--- /dev/null
+++ b/antlr-pom.patch
@@ -0,0 +1,149 @@
+diff -up ./gunit-maven-plugin/pom.xml.pomfix ./gunit-maven-plugin/pom.xml
+--- ./gunit-maven-plugin/pom.xml.pomfix	2010-10-12 17:09:19.304549001 -0400
++++ ./gunit-maven-plugin/pom.xml	2010-10-12 17:09:52.489549017 -0400
+@@ -163,6 +163,12 @@
+         </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-compiler-api</artifactId>
+             <version>1.5.3</version>
+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>
diff --git a/antlr-python-3.1.2-version.patch b/antlr-python-3.1.2-version.patch
new file mode 100644
index 0000000..ee9800c
--- /dev/null
+++ b/antlr-python-3.1.2-version.patch
@@ -0,0 +1,37 @@
+--- 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):