flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [11/11] git commit: [flex-falcon] [refs/heads/feature/maven-migration] - - Added the animal-sniffer plugin to ensure API compatibility with JDK 1.6 - Added some cleanup commands
Date Sun, 27 Mar 2016 14:13:25 GMT
- Added the animal-sniffer plugin to ensure API compatibility with JDK 1.6
- Added some cleanup commands


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

Branch: refs/heads/feature/maven-migration
Commit: 0c1b60efaa0fa4b5ea93a326f0445564858d9053
Parents: 36182c9
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Sun Mar 27 16:13:07 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Sun Mar 27 16:13:07 2016 +0200

----------------------------------------------------------------------
 compiler.jx/pom.xml | 11 +++++------
 migrate-to-maven.sh | 51 ++++++++++++++++++++++++++++++++++++++++++------
 pom.xml             | 47 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0c1b60ef/compiler.jx/pom.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/pom.xml b/compiler.jx/pom.xml
index cb08e4f..e9e10a4 100644
--- a/compiler.jx/pom.xml
+++ b/compiler.jx/pom.xml
@@ -66,17 +66,16 @@
                         <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**/Test*.java</exclude>
                     </includes>
                     <excludes>
-                        <!-- Tests with errors -->
+                        <!-- Use externs -->
                         <exclude>**/TestExternChrome.java</exclude>
                         <exclude>**/TestExternJasmine.java</exclude>
+                        <exclude>**/TestExternJQuery.java</exclude>
+                        <exclude>**/TestExternES3.java</exclude>
                         <exclude>**/TestExternalsJSCompile.java</exclude>
-                        <exclude>**/TestFlexJSFile.java</exclude>
                         <exclude>**/TestFlexJSProject.java</exclude>
-
-                        <!-- Failing tests -->
-                        <exclude>**/TestExternES3.java</exclude>
-                        <exclude>**/TestFlexJSClass.java</exclude>
+                        <exclude>**/TestFlexJSMXMLApplication.java</exclude>
                         <exclude>**/TestFlexJSEmiter.java</exclude>
+                        <exclude>**/TestFlexJSClass.java</exclude>
                         <exclude>**/TestFlexJSExpressions.java</exclude>
                     </excludes>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0c1b60ef/migrate-to-maven.sh
----------------------------------------------------------------------
diff --git a/migrate-to-maven.sh b/migrate-to-maven.sh
index bb41a85..73258aa 100755
--- a/migrate-to-maven.sh
+++ b/migrate-to-maven.sh
@@ -35,6 +35,11 @@ git mv compiler/src/org/apache/flex/compiler/internal/as/codegen/IASNodeAdapter.
 # Convert the compiler project itself
 mkdir -p compiler/src/main/java
 mkdir -p compiler/src/main/resources
+# Move the scripts
+mkdir -p compiler/src/assembly/scripts
+git mv compiler/commandline/* compiler/src/assembly/scripts
+rm -r compiler/commandline
+
 mkdir -p compiler/src/main/jflex/org/apache/flex/compiler/internal/parsing/as
 git mv compiler/src/org/apache/flex/compiler/internal/parsing/as/*.lex compiler/src/main/jflex/org/apache/flex/compiler/internal/parsing/as
 git mv compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.* compiler/src/main/jflex/org/apache/flex/compiler/internal/parsing/as
@@ -73,19 +78,37 @@ git mv compiler.tests/feature-tests/as compiler/src/test/java
 git mv compiler.tests/feature-tests/mxml compiler/src/test/java
 git mv compiler.tests/feature-tests/properties compiler/src/test/java
 git mv compiler.tests/functional-tests/f compiler/src/test/java
+
 # Clean up
-git rm -r generated
-git rm -r lib
-git rm -r results
-git rm -r temp
-git rm -r tools
-git rm -r utils
+rm -r compiler/.settings
+rm -r compiler/lib
+git rm -r compiler/results
+git rm -r compiler/temp
+git rm -r compiler/tools
+rm -r compiler/utils
+rm compiler/.classpath
+rm compiler/.project
+git rm compiler/build.xml
+git rm compiler/downloads.xml
+git rm compiler/flexTasks.tasks
+git rm compiler.tests
+
+#############################################
+## Remove the compiler.js module
+#############################################
+
+git rm compiler.js
 
 #############################################
 ## Convert the compiler.jx module
 #############################################
 mkdir -p compiler.jx/src/main/java
 mkdir -p compiler.jx/src/main/resources
+# Move the scripts
+mkdir -p compiler.jx/src/assembly/scripts
+git mv compiler.jx/bin/* compiler.jx/src/assembly/scripts
+rm compiler.jx/bin
+
 git mv compiler.jx/src/META-INF compiler.jx/src/main/resources
 git mv compiler.jx/src/com compiler.jx/src/main/java
 git mv compiler.jx/src/org compiler.jx/src/main/java
@@ -98,6 +121,17 @@ git rm -r compiler.jx.tests/src/org compiler.jx/src/test/java/org/apache/flex/ut
 mkdir -p compiler.jx/src/test/resources
 git mv compiler.jx.tests/test-files/* compiler.jx/src/test/resources
 
+# Clean up
+rm -r compiler.jx/in
+rm -r compiler.jx/lib
+git rm -r compiler.jx/templ
+rm compiler.jx/.classpath
+rm compiler.jx/.project
+git rm -r compiler.jx/build.xml
+git rm -r compiler.jx/downloads.xml
+git rm -r compiler.jx/local-template.properties
+git rm -r compiler.jx.tests
+
 #############################################
 ## Convert the externs
 #############################################
@@ -138,3 +172,8 @@ mkdir -p externs/node/src/main/javascript
 git mv externs/node/externs/* externs/node/src/main/javascript
 rm -r externs/node/externs
 
+# clean up
+git rm -r generated
+git rm -r installer.properties
+rm -r swfutils
+git rm -r utils

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0c1b60ef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f6e6b90..36739bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,6 +212,7 @@
                 </configuration>
             </plugin>
 
+            <!-- Make the failsafe execute all integration-tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -236,6 +237,52 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+
+            <!-- Plugin to detect problems with JDK incompatibilities -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.15</version>
+                <executions>
+                    <execution>
+                        <id>check-jdk-1.6</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <signature>
+                        <groupId>org.codehaus.mojo.signature</groupId>
+                        <artifactId>java16</artifactId>
+                        <version>1.1</version>
+                    </signature>
+                </configuration>
+            </plugin>
+
+            <!-- Configure the assembly -->
+            <!--plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>assemble-sources-releases</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/assembly/binary-distribution-zip.xml</descriptor>
+                        <descriptor>src/assembly/binary-distribution-gz.xml</descriptor>
+                        <descriptor>src/assembly/source-distribution-zip.xml</descriptor>
+                        <descriptor>src/assembly/source-distribution-gz.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin-->
         </plugins>
     </build>
 


Mime
View raw message