flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From josebarra...@apache.org
Subject [01/17] git commit: [flex-falcon] [refs/heads/maven] - modified: compiler.tests/functional-tests/f/SDKSWCTests.java Removed obsolete comment from test. modified: compiler/src/org/apache/flex/compiler/config/Configurator.java
Date Sun, 23 Mar 2014 13:09:35 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/maven 00703ca19 -> 8b718a776 (forced update)


	modified:   compiler.tests/functional-tests/f/SDKSWCTests.java
                    Removed obsolete comment from test.
	modified:   compiler/src/org/apache/flex/compiler/config/Configurator.java
                    Only remove the theme setting from DefaultsConfigurator if flexlib or
application.home is not specified. This fixes compiling sparkskins on AIR.


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

Branch: refs/heads/maven
Commit: 697db6f875c15cf3d675142c7a8d64f33f933ed2
Parents: 9fdf5bf
Author: dloverin <darrell.loverin@gmail.com>
Authored: Sat Mar 8 10:37:32 2014 -0500
Committer: dloverin <darrell.loverin@gmail.com>
Committed: Sat Mar 8 10:57:19 2014 -0500

----------------------------------------------------------------------
 compiler.tests/functional-tests/f/SDKSWCTests.java             | 2 +-
 compiler/src/org/apache/flex/compiler/config/Configurator.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/697db6f8/compiler.tests/functional-tests/f/SDKSWCTests.java
----------------------------------------------------------------------
diff --git a/compiler.tests/functional-tests/f/SDKSWCTests.java b/compiler.tests/functional-tests/f/SDKSWCTests.java
index 7cd2a8d..56b0bef 100644
--- a/compiler.tests/functional-tests/f/SDKSWCTests.java
+++ b/compiler.tests/functional-tests/f/SDKSWCTests.java
@@ -332,7 +332,7 @@ public class SDKSWCTests
 	}
 	
 	@Test
-    public void sparkSWC() // FAILS -> FLEX-33307
+    public void sparkSWC()
     {
         extraArgs = new String[]
         {

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/697db6f8/compiler/src/org/apache/flex/compiler/config/Configurator.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/config/Configurator.java b/compiler/src/org/apache/flex/compiler/config/Configurator.java
index 3ce223f..30543e7 100644
--- a/compiler/src/org/apache/flex/compiler/config/Configurator.java
+++ b/compiler/src/org/apache/flex/compiler/config/Configurator.java
@@ -1026,9 +1026,9 @@ public class Configurator implements ICompilerSettings, IConfigurator,
ICompiler
             System.getProperty("application.home") == null)
         {
             cfgbuf.clearVar("load-config", null, -1);
+            cfgbuf.clearVar("compiler.theme", null, -1);
         }
         
-        cfgbuf.clearVar("compiler.theme", null, -1);
     }
 
     /**


Mime
View raw message