You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ca...@apache.org on 2014/02/28 10:39:35 UTC

[1/3] git commit: [flex-falcon] [refs/heads/maven] - added jflex and antler maven plugin generation

Repository: flex-falcon
Updated Branches:
  refs/heads/maven [created] 9896dd816


added jflex and antler maven plugin generation


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c28c3e92
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c28c3e92
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c28c3e92

Branch: refs/heads/maven
Commit: c28c3e922d8a8812fe1309abcf5fc27df640eb6d
Parents: d300c89
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Jul 17 21:59:29 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Jul 17 21:59:48 2013 +0200

----------------------------------------------------------------------
 compiler/pom.xml | 125 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 123 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c28c3e92/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 3aa8061..2180fb4 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -15,23 +15,144 @@
     <name>Falcon Compiler</name>
     <description>Falcon Flex main compiler</description>
 
-    <packaging>jar</packaging>
+    <properties>
+        <javac.debug>true</javac.debug>
+        <javac.deprecation>false</javac.deprecation>
+    </properties>
+
+    <packaging>pom</packaging>
 
-    <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
     <build>
+        <sourceDirectory>src</sourceDirectory>
         <plugins>
+            <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
             <plugin>
                 <groupId>de.jflex</groupId>
                 <artifactId>maven-jflex-plugin</artifactId>
                 <version>1.4.3</version>
+                <configuration>
+                    <outputDirectory>target/generated/src</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>raw.as.tokenizer</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <lexDefinitions>
+                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+                            </lexDefinitions>
+                            <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>raw.asdoc.tokenizer</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <lexDefinitions>
+                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+                            </lexDefinitions>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>raw.mxml.tokenizer</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <lexDefinitions>
+                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+                            </lexDefinitions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- ANTLR -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>antlr-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+                    <outputDirectory>target/generated/src</outputDirectory>
+                </configuration>
                 <executions>
                     <execution>
+                        <id>as.parser</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <grammars>parsing/as/ASParser.g</grammars>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>metadata.parser</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <grammars>parsing/as/MetadataParser.g</grammars>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>css.lexer.and.parser</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <grammars>css/CSS.g</grammars>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>css.tree</id>
                         <goals>
                             <goal>generate</goal>
                         </goals>
+                        <configuration>
+                            <grammars>css/CSSTree.g</grammars>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>apt-maven-plugin</artifactId>
+                <version>1.0-alpha-5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <includea>
+                                <include>generated/src/org/apache/flex/compiler/internal/parsing/as/ASParser.java</include>
+                            </includes>
+                            <factory>@SuppressWarnings("unused")</factory>
+
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <!-- The AnnotateClass tool is used to add @SupressWarnings annotations to Java code produced by ANTLR and JBurg -->
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <debug>${javac.debug}</debug>
+                    <showDeprecation>${javac.deprecation}</showDeprecation>
+                    <compilerArgument>-Xlint:all,-path,-fallthrough</compilerArgument>
+                    <source>tools/AnnotateClass</source>
+                    <generatedSourcesDirectory>generated/classes</generatedSourcesDirectory>
+                </configuration>
+                <goals>
+                    <goal>compile</goal>
+                </goals>
+            </plugin>-->
         </plugins>
     </build>
 


[3/3] git commit: [flex-falcon] [refs/heads/maven] - [#4099] changes unstables (need deep revision)

Posted by ca...@apache.org.
[#4099] changes unstables (need deep revision)


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9896dd81
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9896dd81
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9896dd81

Branch: refs/heads/maven
Commit: 9896dd816eb2d470564aae8b7af450f0817dcbb2
Parents: c28c3e9
Author: Carlos Rovira <ca...@apache.org>
Authored: Fri Dec 27 22:57:54 2013 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Fri Dec 27 22:57:54 2013 +0100

----------------------------------------------------------------------
 compiler/pom.xml | 78 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 66 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9896dd81/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 2180fb4..3ecc4f0 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -25,13 +25,14 @@
     <build>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
-            <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
+            <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html -->
             <plugin>
                 <groupId>de.jflex</groupId>
                 <artifactId>maven-jflex-plugin</artifactId>
                 <version>1.4.3</version>
                 <configuration>
                     <outputDirectory>target/generated/src</outputDirectory>
+                    <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.default</skeleton>
                 </configuration>
                 <executions>
                     <execution>
@@ -41,7 +42,8 @@
                         </goals>
                         <configuration>
                             <lexDefinitions>
-                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
+                                </lexDefinition>
                             </lexDefinitions>
                             <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
                         </configuration>
@@ -53,7 +55,8 @@
                         </goals>
                         <configuration>
                             <lexDefinitions>
-                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
+                                </lexDefinition>
                             </lexDefinitions>
                         </configuration>
                     </execution>
@@ -64,7 +67,8 @@
                         </goals>
                         <configuration>
                             <lexDefinitions>
-                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+                                <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex
+                                </lexDefinition>
                             </lexDefinitions>
                         </configuration>
                     </execution>
@@ -80,6 +84,7 @@
                     <outputDirectory>target/generated/src</outputDirectory>
                 </configuration>
                 <executions>
+                    <!-- Generating ASParser and ASTokenTypes -->
                     <execution>
                         <id>as.parser</id>
                         <goals>
@@ -88,37 +93,86 @@
                         <configuration>
                             <grammars>parsing/as/ASParser.g</grammars>
                         </configuration>
+                        <!-- TODO ASParser.java annotate tool @SuppressWarnings("unused") -->
+                        <!-- TODO ASTokenTypes.java annotate tool @SuppressWarnings("unused") -->
                     </execution>
+                    <!-- Generating MetadataParser and MetadataTokenTypes -->
                     <execution>
                         <id>metadata.parser</id>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <grammars>parsing/as/MetadataParser.g</grammars>
+                            <sourceDirectory>src/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
+                            <grammars>MetadataParser.g</grammars>
+                            <!--<includes>ImportMetadataTokenTypes.txt</includes>-->
                         </configuration>
+                        <!-- TODO MetadataParser.java annotate tool @SuppressWarnings("all") -->
+                        <!-- TODO MetadataTokenTypes.java annotate tool @SuppressWarnings("unused") -->
                     </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.apache.flex.compiler.tools.AnnotateClass</mainClass>
+
+                            <!--<argument>-classpath</argument>
+                            <classpath>
+                                <dependency>commons-io:commons-io</dependency>
+                                <dependency>commons-lang:commons-lang</dependency>
+                            </classpath>
+                            <executable>maven</executable>
+                            <workingDirectory>/tmp</workingDirectory>-->
+
+
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--- See more at: http://www.vineetmanohar.com/2009/11/3-ways-to-run-java-main-from-maven/#sthash.iBz2SwMh.dpuf-->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>antlr3-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+                    <outputDirectory>target/generated/src</outputDirectory>
+                </configuration>
+                <executions>
+                    <!-- Generating CSSLexer and CSSParser -->
                     <execution>
                         <id>css.lexer.and.parser</id>
                         <goals>
-                            <goal>generate</goal>
+                            <goal>antlr</goal>
                         </goals>
                         <configuration>
-                            <grammars>css/CSS.g</grammars>
+                            <sourceDirectory>css/CSS.g</sourceDirectory>
                         </configuration>
+                        <!-- TODO CSSLexer.java annotate tool @SuppressWarnings("unused") -->
+                        <!-- TODO CSSParser.java annotate tool @SuppressWarnings("unused") -->
                     </execution>
+                    <!-- Generating CSSTree -->
                     <execution>
                         <id>css.tree</id>
                         <goals>
-                            <goal>generate</goal>
+                            <goal>antlr</goal>
                         </goals>
                         <configuration>
-                            <grammars>css/CSSTree.g</grammars>
+                            <sourceDirectory>css/CSSTree.g</sourceDirectory>
                         </configuration>
+                        <!-- TODO CSSTree.java annotate tool @SuppressWarnings({"rawtypes", "unchecked", "unused"} -->
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>apt-maven-plugin</artifactId>
                 <version>1.0-alpha-5</version>
@@ -128,7 +182,7 @@
                             <goal>process</goal>
                         </goals>
                         <configuration>
-                            <includea>
+                            <includes>
                                 <include>generated/src/org/apache/flex/compiler/internal/parsing/as/ASParser.java</include>
                             </includes>
                             <factory>@SuppressWarnings("unused")</factory>
@@ -136,7 +190,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
             <!-- The AnnotateClass tool is used to add @SupressWarnings annotations to Java code produced by ANTLR and JBurg -->
             <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>


[2/3] git commit: [flex-falcon] [refs/heads/maven] - first two poms for mavenizing flex falcon project and main compiler. Both build successful. Note that JBurg dependency is not available in public repository

Posted by ca...@apache.org.
first two poms for mavenizing flex falcon project and main compiler. Both build successful. Note that JBurg dependency is not available in public repository


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d300c89d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d300c89d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d300c89d

Branch: refs/heads/maven
Commit: d300c89deaed8e39df2a5e23805b51aca7da6300
Parents: 974cbfe
Author: Carlos Rovira <ca...@apache.org>
Authored: Sun Jul 14 23:50:10 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Jul 17 21:59:48 2013 +0200

----------------------------------------------------------------------
 .gitignore       |  3 +-
 compiler/pom.xml | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml          | 21 ++++++++++++++
 3 files changed, 100 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d300c89d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index cd28c5d..22e4eb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@
 #OS junk files
 [Tt]humbs.db
 *.DS_Store
-/jenkins/
\ No newline at end of file
+/jenkins/
+target/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d300c89d/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
new file mode 100644
index 0000000..3aa8061
--- /dev/null
+++ b/compiler/pom.xml
@@ -0,0 +1,77 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>falcon</artifactId>
+        <groupId>org.apache.flex</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>compiler</artifactId>
+    <name>Falcon Compiler</name>
+    <description>Falcon Flex main compiler</description>
+
+    <packaging>jar</packaging>
+
+    <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>de.jflex</groupId>
+                <artifactId>maven-jflex-plugin</artifactId>
+                <version>1.4.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- antlr - http://www.antlr.org/download/antlr-3.3-complete.jar -->
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr-runtime</artifactId>
+            <version>3.3</version>
+        </dependency>
+        <!-- commons-cli - http://archive.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz -->
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <!-- commons-io - http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1-bin.tar.gz -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <!-- guava - http://guava-libraries.googlecode.com/files/guava-r08.zip -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>r08</version>
+        </dependency>
+        <!-- JBurg - http://downloads.sourceforge.net/project/jburg/jburg-1.10.1.tar.gz (warning! this is not avaialbe publicly, I'm using a private maven repo for this one-->
+        <dependency>
+            <groupId>net.sourceforge</groupId>
+            <artifactId>jburg</artifactId>
+            <version>1.10.1</version>
+        </dependency>
+        <!-- lzma-sdk - http://downloads.sourceforge.net/project/sevenzip/LZMA%20SDK/lzma920.tar.bz2  -->
+        <dependency>
+            <groupId>com.github.jponge</groupId>
+            <artifactId>lzma-java</artifactId>
+            <version>1.2</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d300c89d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..eb992e6
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,21 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.flex</groupId>
+    <artifactId>falcon</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <name>Falcon</name>
+    <description>Flex Java Compiler Modules</description>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>compiler</module>
+    </modules>
+    
+</project>
\ No newline at end of file