Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-lischke committed Nov 8, 2013
2 parents 4d84c99 + 0accbea commit 4f5178f
Show file tree
Hide file tree
Showing 290 changed files with 24,190 additions and 3,140 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,13 @@ nb-configuration.xml

# Python runtime files
*.py[co]

# ANTLR C# target build folders
/runtime/CSharp3/Sources/Antlr3.Runtime/bin/
/runtime/CSharp3/Sources/Antlr3.Runtime/obj/
/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/bin/
/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/obj/
/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/bin/
/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/obj/
/runtime/CSharp3/Sources/Antlr3.Runtime.Test/bin/
/runtime/CSharp3/Sources/Antlr3.Runtime.Test/obj/
495 changes: 4 additions & 491 deletions BUILD.txt

Large diffs are not rendered by default.

59 changes: 31 additions & 28 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ANTLR v3.4
July 18, 2011
ANTLR v3.5
January 4, 2013

Terence Parr, parrt at cs usfca edu
ANTLR project lead and supreme dictator for life
Expand All @@ -13,8 +13,8 @@ recognizers, interpreters, compilers, and translators from grammatical
descriptions containing actions in a variety of target
languages. ANTLR provides excellent support for tree construction,
tree walking, translation, error recovery, and error reporting. I've
been working on parser generators for 20 years and on this particular
version of ANTLR for 7 years.
been working on parser generators for 25 years and on this particular
version of ANTLR for 9 years.

You should use v3 in conjunction with ANTLRWorks:

Expand Down Expand Up @@ -74,17 +74,12 @@ EXAMPLES

ANTLR v3 sample grammars:

http://www.antlr.org/download/examples-v3.tar.gz
https://github.com/antlr/examples-v3

Examples from Language Implementation Patterns:

http://www.pragprog.com/titles/tpdsl/source_code

Also check out Mantra Programming Language for a prototype (work in
progress) using v3:

http://www.linguamantra.org/

----------------------------------------------------------------------

What is ANTLR?
Expand Down Expand Up @@ -113,27 +108,35 @@ See migration guide:

How do I install this damn thing?

Just untar antlr-3.4.tar.gz and you'll get:

antlr-3.4/BUILD.txt
antlr-3.4/antlr3-maven-plugin
antlr-3.4/antlrjar.xml
antlr-3.4/antlrsources.xml
antlr-3.4/gunit
antlr-3.4/gunit-maven-plugin
antlr-3.4/pom.xml
antlr-3.4/runtime
antlr-3.4/tool
antlr-3.4/lib

This is the source and java binaries. You could grab the
antlr-3.4-complete.jar file from the website, but it's in lib dir.
You will have grabbed either of these:

http://antlr.org/download/antlr-3.5-complete-no-st3.jar
http://antlr.org/download/antlr-3.5-complete.jar

It has all of the jars you need combined into one. Then you need to
add antlr-3.4-complete.jar to your CLASSPATH or add
to arg list; e.g., on unix:
add antlr-3.5-complete.jar to your CLASSPATH or add to arg list; e.g., on unix:

$ java -cp "/usr/local/lib/antlr-3.5-complete.jar:$CLASSPATH" org.antlr.Tool Test.g

$ java -cp "/usr/local/lib/antlr-3.4-complete.jar:$CLASSPATH" org.antlr.Tool Test.g
Source + java binaries: Just untar antlr-3.5.tar.gz and you'll get:

antlr-3.5/BUILD.txt
antlr-3.5/antlr3-maven-plugin
antlr-3.5/antlrjar.xml
antlr-3.5/antlrsources.xml
antlr-3.5/gunit
antlr-3.5/gunit-maven-plugin
antlr-3.5/pom.xml
antlr-3.5/runtime
antlr-3.5/tool
antlr-3.5/lib

Please see the FAQ

http://www.antlr.org/wiki/display/ANTLR3/ANTLR+v3+FAQ

-------------------------

How can I contribute to ANTLR v3?

http://www.antlr.org/wiki/pages/viewpage.action?pageId=33947666
Empty file added antlr-complete/antlr.config
Empty file.
137 changes: 137 additions & 0 deletions antlr-complete/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>antlr-complete</artifactId>
<packaging>jar</packaging>

<name>ANTLR 3 Complete</name>
<description>Complete distribution for ANTLR 3</description>

<!--
Inherit from the ANTLR master pom, which tells us what
version we are and allows us to inherit dependencies
and so on.
-->
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr-master</artifactId>
<version>3.5.2-SNAPSHOT</version>
</parent>

<url>http://antlr.org/</url>

<!--
The complete distribution includes the following modules and their dependencies:
ANTLR 3 Tool
ANTLR 3 Runtime
gUnit for ANTLR 3
StringTemplate 4 (dependency of code generator in the ANTLR 3 Tool)
StringTemplate 3 (dependency of grammars with output=template)
ANTLR 2.7.7 (dependency of template parser in StringTemplate 3)
-->
<dependencies>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>gunit</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

</dependencies>

<build>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<configuration>
<minimizeJar>false</minimizeJar>
<createSourcesJar>true</createSourcesJar>
<filters>
<filter>
<artifact>org.antlr:antlr-complete</artifact>
<includes>
<include>META-INF/**</include>
</includes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.antlr.Tool</mainClass>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<id>complete-no-st3</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>no-st3</shadedClassifierName>
<filters>
<filter>
<artifact>antlr:antlr</artifact>
<excludes>
<exclude>**</exclude>
</excludes>
</filter>
<filter>
<artifact>org.antlr:stringtemplate</artifact>
<excludes>
<exclude>**</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>

<execution>
<id>complete</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<includeDependencySources>true</includeDependencySources>
</configuration>
</plugin>
</plugins>

</build>

</project>
1 change: 0 additions & 1 deletion antlr.config
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
fred=99
62 changes: 7 additions & 55 deletions antlr3-maven-archetype/pom.xml
Original file line number Diff line number Diff line change
@@ -1,60 +1,26 @@
<?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">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">


<modelVersion>4.0.0</modelVersion>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-archetype</artifactId>
<version>3.4.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>ANTLR3 Maven Archetype</name>
<name>ANTLR 3 Maven Archetype</name>
<description>ANTLR 3 Maven Archetype</description>


<!--
Inherit from the ANTLR master pom, which tells us what
version we are and allows us to inherit dependencies
and so on.
Unfortunately, because of a bug in the archetype plugin
we cannot use the parent pom because it causes the
artifactId in the generated pom to be set to antlr3-maven-archetype
We will reinstate this parent usage when that is fixed.
-->
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr-master</artifactId>
<version>3.3-SNAPSHOT</version>
<version>3.5.2-SNAPSHOT</version>
</parent>
-->
<!--
REMOVE THIS ONCE ARCHETYPE PLUGIN BUG MENTIONED ABOVE IS FIXED AND
THE PARENT POM REFERENCE IS REINSTATED
Define where the ANTLR releated jars are deployed both for
the main ANTLR repository, which syncs with the maven main
repository, and the snapshot repository, which can be
used by developers that need the latest development version of
something, but is used here to show maven where to deploy
snapshots and releases.
-->
<distributionManagement>

<repository>
<id>antlr-repo</id>
<name>ANTLR Testing repository</name>
<url>scpexe://antlr.org/home/mavensync/antlr-repo</url>
</repository>

<snapshotRepository>
<id>antlr-snapshot</id>
<name>ANTLR Testing Snapshot Repository</name>
<url>scpexe://antlr.org/home/mavensync/antlr-snapshot</url>
</snapshotRepository>

</distributionManagement>

<build>

Expand All @@ -63,7 +29,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.0-alpha-4</version>
<version>2.2</version>
</extension>

</extensions>
Expand All @@ -72,24 +38,10 @@

<plugin>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.0-alpha-4</version>
<version>2.2</version>
<extensions>true</extensions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>

</build>
Expand Down
Empty file.
Loading

0 comments on commit 4f5178f

Please sign in to comment.