You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/06/27 14:57:15 UTC

[1/3] git commit: [flex-falcon] [refs/heads/develop] - don't run tests that require Flex SDK if SDK is not present

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 916b2b2c8 -> 8a37541fe


don't run tests that require Flex SDK if SDK is not present


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

Branch: refs/heads/develop
Commit: 8a37541fe0c6047388659192292ab4be5c1e0280
Parents: fa7f32a
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 27 07:56:56 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 27 07:57:06 2016 -0700

----------------------------------------------------------------------
 compiler/src/test/build.xml                     | 20 +++++++++++++-------
 .../src/test/java/as/ASFeatureTestsBase.java    |  3 ++-
 2 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8a37541f/compiler/src/test/build.xml
----------------------------------------------------------------------
diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml
index 8698577..63c8be1 100644
--- a/compiler/src/test/build.xml
+++ b/compiler/src/test/build.xml
@@ -304,20 +304,23 @@
             <batchtest todir="${compiler}/target/junit-reports">
                 <fileset dir="${compiler}/target/test-classes">
                     <include name="**/*Tests.class"/>
+                    <exclude name="f/**"/>
                     <exclude name="mxml/tags/**"/>
                     <exclude name="properties/**"/>
-                    <exclude name="**/MXMLDesignLayerNodeTests.class"/>
-                    <exclude name="**/MXMLHTTPServiceNodeTests.class"/>
-                    <exclude name="**/MXMLModelNodeTests.class"/>
-                    <exclude name="**/MXMLRemoteObjectNodeTests.class"/>
-                    <exclude name="**/MXMLStateNodeTests.class"/>
-                    <exclude name="**/MXMLWebServiceNodeTests.class"/>
                     <exclude name="**/MXMLComponentTagTests.class"/>
                     <exclude name="**/MXMLHTTPServiceTagTests.class"/>
                     <exclude name="**/MXMLModelTagTests.class"/>
+                    <exclude name="**/MXMLRemoteObjectNodeTests.class"/>
+                    <exclude name="**/MXMLWebServiceNodeTests.class"/>
+                    <exclude name="**/MXMLProperty*.class"/>
+                    <exclude name="**/MXMLDesignLayerNodeTests.class"/>
+                    <exclude name="**/MXMLHTTPServiceNodeTests.class"/>
+                    <exclude name="**/MXMLModelNodeTests.class"/>
                     <exclude name="**/MXMLRemoteObjectTagTests.class"/>
+                    <exclude name="**/MXMLStateNodeTests.class"/>
+                    <exclude name="**/MXMLVectorNodeTests.class"/>
                     <exclude name="**/MXMLWebServiceTagTests.class"/>
-                    <exclude name="**/MXMLProperty*.class"/>
+                    
                 </fileset>
             </batchtest>
             <formatter type="xml"/>
@@ -340,6 +343,7 @@
             </classpath>
             <batchtest todir="${compiler}/target/junit-reports">
                 <fileset dir="${compiler}/target/test-classes">
+                    <include name="f/**"/>
                     <include name="**/MXMLComponentTagTests.class"/>
                     <include name="**/MXMLHTTPServiceTagTests.class"/>
                     <include name="**/MXMLModelTagTests.class"/>
@@ -352,7 +356,9 @@
                     <include name="**/MXMLModelNodeTests.class"/>
                     <include name="**/MXMLRemoteObjectNodeTests.class"/>
                     <include name="**/MXMLStateNodeTests.class"/>
+                    <include name="**/MXMLVectorNodeTests.class"/>
                     <include name="**/MXMLWebServiceNodeTests.class"/>
+                    
                 </fileset>
             </batchtest>
             <formatter type="xml"/>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8a37541f/compiler/src/test/java/as/ASFeatureTestsBase.java
----------------------------------------------------------------------
diff --git a/compiler/src/test/java/as/ASFeatureTestsBase.java b/compiler/src/test/java/as/ASFeatureTestsBase.java
index 0ff167a..4accbec 100644
--- a/compiler/src/test/java/as/ASFeatureTestsBase.java
+++ b/compiler/src/test/java/as/ASFeatureTestsBase.java
@@ -99,7 +99,8 @@ public class ASFeatureTestsBase
 			String libraryPath = "-library-path=" + StringUtils.join(swcs.toArray(new String[swcs.size()]), ",");
 			args.add(libraryPath);
 		}
-		args.add("-namespace=" + NAMESPACE_2009 + "," + testAdapter.getFlexManifestPath("mxml-2009"));
+		if (withFramework || withRPC || withSpark)
+		    args.add("-namespace=" + NAMESPACE_2009 + "," + testAdapter.getFlexManifestPath("mxml-2009"));
 		if (otherOptions != null)
 		{
 			Collections.addAll(args, otherOptions);


[3/3] git commit: [flex-falcon] [refs/heads/develop] - update list of deps

Posted by ah...@apache.org.
update list of deps


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

Branch: refs/heads/develop
Commit: 876802c02c8f4bec879088653715c3606b1020b7
Parents: 916b2b2
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 27 07:55:16 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 27 07:57:06 2016 -0700

----------------------------------------------------------------------
 README | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/876802c0/README
----------------------------------------------------------------------
diff --git a/README b/README
index 028c65b..c00d73e 100644
--- a/README
+++ b/README
@@ -198,6 +198,8 @@ Software Dependencies
         commons-cli - https://repo1.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2-bin.tar.gz
         commons-io - https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.tar.gz
         commons-lang - https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.tar.gz
+        commons-lang3 - https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar
+        commons-compress - https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.10/commons-compress-1.10.jar
         guava - https://repo1.maven.org/maven2/com/google/guava/guava/17.0/guava-17.0.jar
         jburg - https://repo1.maven.org/maven2/net/sourceforge/jburg/jburg/1.10.2/jburg-1.10.2.jar
         jflex - http://jflex.de/jflex-1.6.0.tar.gz


[2/3] git commit: [flex-falcon] [refs/heads/develop] - clean up rat and packaging

Posted by ah...@apache.org.
clean up rat and packaging


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

Branch: refs/heads/develop
Commit: fa7f32ab91e6f3c03b66220c49c10429b05d4cf4
Parents: 876802c
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 27 07:56:03 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 27 07:57:06 2016 -0700

----------------------------------------------------------------------
 build.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fa7f32ab/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e1acaec..36b923f 100644
--- a/build.xml
+++ b/build.xml
@@ -403,8 +403,8 @@
                 <include name="**"/>
                 <exclude name="**/target/.plxarc" />
                 <exclude name="**/target/failsafe-reports/**" />
-                <exclude name="**/target/.plxarc" />
                 <exclude name="**/target/generated-sources/**" />
+                <exclude name="**/target/temp/externs/externs.zip" />
                 <exclude name="**/target/downloads/*.zip" />
                 <exclude name="**/target/downloads/EaselJS*/**" />
                 <exclude name="**/target/downloads/TweenJS*/**" />
@@ -556,6 +556,9 @@
         <copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
             <fileset dir="${basedir}/externs">
                 <include name="**/**"/>
+                <exclude name="**/externs.zip" />
+                <exclude name="**/target/.plxarc" />
+                <exclude name="**/target/failsafe-reports/**" />
                 <exclude name="**/*.swc"/>
                 <exclude name="**/*.as"/>
                 <exclude name="createjs/target/**"/>