[jboss-svn-commits] JBL Code SVN: r36370 - in labs/jbossrules/trunk: drools-compiler and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Dec 11 11:32:28 EST 2010
Author: tirelli
Date: 2010-12-11 11:32:27 -0500 (Sat, 11 Dec 2010)
New Revision: 36370
Modified:
labs/jbossrules/trunk/drools-compiler/pom.xml
labs/jbossrules/trunk/pom.xml
Log:
Fixing grammar generation in poms
Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml 2010-12-11 14:22:36 UTC (rev 36369)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml 2010-12-11 16:32:27 UTC (rev 36370)
@@ -34,18 +34,19 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ </dependency>
+ <dependency>
+ <!-- antlr also depends on the old antlr 2.7.7 jar -->
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
<artifactId>gunit</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
@@ -126,14 +127,6 @@
<phase>generate-sources</phase>
<configuration>
<tasks>
- <path id="base.classpath">
- <pathelement path="${user.home}/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <pathelement path="${user.home}/.m2/repository/org/antlr/antlr/3.2/antlr-3.2.jar"/>
- <pathelement path="${user.home}/.m2/repository/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/>
- <pathelement path="${user.home}/.m2/repository/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
- </path>
- <property name="antlr_classpath" refid="maven.compile.classpath"/>
- <property name="antlr_classpath" refid="maven.compile.classpath"/>
<condition property="antlr.debugParser" value="-Xconversiontimeout 32000 -debug" else="">
<isset property="debugParser"/>
</condition>
@@ -143,25 +136,25 @@
<echo message="Generating Antlr Parser (${antlr.debugParser})"/>
<java classname="org.antlr.Tool" fork="true">
<jvmarg line="-Xmx750M -Xincgc"/>
- <arg line="${antlr.debugParser} -lib src/main/resources/org/drools/lang -o src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DRL.g"/>
- <classpath refid="base.classpath"/>
+ <arg line="${antlr.debugParser} -lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DRL.g"/>
+ <classpath refid="maven.compile.classpath"/>
</java>
<echo message="Generating Antlr Walker (${antlr.debugWalker})"/>
<java classname="org.antlr.Tool" fork="true">
<jvmarg line="-Xmx750M -Xincgc"/>
- <arg line="${antlr.debugWalker} -lib src/main/resources/org/drools/lang -o src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DescrBuilderTree.g"/>
- <classpath refid="base.classpath"/>
+ <arg line="${antlr.debugWalker} -lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DescrBuilderTree.g"/>
+ <classpath refid="maven.compile.classpath"/>
</java>
<echo message="Generating Antlr Legacy Parser/Walker for DRL 5.x"/>
<java classname="org.antlr.Tool" fork="true">
<jvmarg line="-Xmx750M -Xincgc"/>
- <arg line="-lib src/main/resources/org/drools/lang -o src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DRL5x.g"/>
- <classpath refid="base.classpath"/>
+ <arg line="-lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DRL5x.g"/>
+ <classpath refid="maven.compile.classpath"/>
</java>
<java classname="org.antlr.Tool" fork="true">
<jvmarg line="-Xmx750M -Xincgc"/>
- <arg line="-lib src/main/resources/org/drools/lang -o src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DescrBuilderTree5x.g"/>
- <classpath refid="base.classpath"/>
+ <arg line="-lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DescrBuilderTree5x.g"/>
+ <classpath refid="maven.compile.classpath"/>
</java>
<move todir="src/main/java/org/drools/lang/">
<fileset dir="src/main/resources/org/drools/lang">
@@ -170,8 +163,8 @@
</move>
<echo message="Generating Antlr Tree2TestDRL.g"/>
<java classname="org.antlr.Tool" fork="true">
- <arg line="-lib src/main/resources/org/drools/lang -o src/main/resources/org/drools/lang src/main/resources/org/drools/lang/Tree2TestDRL.g"/>
- <classpath refid="base.classpath"/>
+ <arg line="-lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/Tree2TestDRL.g"/>
+ <classpath refid="maven.compile.classpath"/>
</java>
<move todir="src/test/java/org/drools/lang/">
<fileset dir="src/main/resources/org/drools/lang">
@@ -180,8 +173,8 @@
</move>
<echo message="Generating Antlr DSLMap.g and DSLMapWalker.g"/>
<java classname="org.antlr.Tool" fork="true">
- <arg line="-lib src/main/resources/org/drools/lang/dsl -o src/main/resources/org/drools/lang/dsl src/main/resources/org/drools/lang/dsl/DSLMap.g src/main/resources/org/drools/lang/dsl/DSLMapWalker.g"/>
- <classpath refid="base.classpath"/>
+ <arg line="-lib src/main/resources/org/drools/lang/dsl src/main/resources/org/drools/lang/dsl/DSLMap.g src/main/resources/org/drools/lang/dsl/DSLMapWalker.g"/>
+ <classpath refid="maven.compile.classpath"/>
</java>
<move todir="src/main/java/org/drools/lang/dsl/">
<fileset dir="src/main/resources/org/drools/lang/dsl">
@@ -190,8 +183,8 @@
</move>
<echo message="Generating Antlr Java.g"/>
<java classname="org.antlr.Tool" fork="true">
- <arg line="-lib src/main/resources/org/drools/semantics/java/parser -o src/main/resources/org/drools/semantics/java/parser src/main/resources/org/drools/semantics/java/parser/Java.g"/>
- <classpath refid="base.classpath"/>
+ <arg line="-lib src/main/resources/org/drools/semantics/java/parser src/main/resources/org/drools/semantics/java/parser/Java.g"/>
+ <classpath refid="maven.compile.classpath"/>
</java>
<move todir="src/main/java/org/drools/rule/builder/dialect/java/parser">
<fileset dir="src/main/resources/org/drools/semantics/java/parser">
@@ -199,8 +192,11 @@
</fileset>
</move>
<delete>
+ <fileset dir=".">
+ <include name="*.tokens"/>
+ </fileset>
<fileset dir="src/main/resources/org/drools/lang">
- <include name="**/*.tokens"/>
+ <include name="*.tokens"/>
<include name="DRL__.g"/>
<include name="dsl/DSLMap__.g"/>
<include name="__Test__.java"/>
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-12-11 14:22:36 UTC (rev 36369)
+++ labs/jbossrules/trunk/pom.xml 2010-12-11 16:32:27 UTC (rev 36370)
@@ -1036,6 +1036,7 @@
<groupId>org.antlr</groupId>
<artifactId>gunit</artifactId>
<version>3.2</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.antlr</groupId>
@@ -1047,23 +1048,27 @@
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.7</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.2</version>
+ <scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>org.antlr</groupId>
- <artifactId>stringtemplate</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <version>3.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>3.5.1</version>
More information about the jboss-svn-commits
mailing list