You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/09/13 13:26:52 UTC
[2/2] git commit: [flex-falcon] [refs/heads/develop] - Enabled
compilation of the TLF SWC
Enabled compilation of the TLF SWC
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6fa471c5
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6fa471c5
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6fa471c5
Branch: refs/heads/develop
Commit: 6fa471c5cd9dd4164d4e10ff88b12b3f9efd4122
Parents: 79c68f6
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Sep 13 13:25:07 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Sep 13 13:25:07 2013 +0200
----------------------------------------------------------------------
.../functional-tests/f/SDKSWCTests.java | 22 ++++++++++++++++++--
.../org/apache/flex/utils/EnvProperties.java | 21 ++++++++++++-------
compiler.tests/template-unittest.properties | 5 +++++
3 files changed, 38 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6fa471c5/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 b47ed18..6240415 100644
--- a/compiler.tests/functional-tests/f/SDKSWCTests.java
+++ b/compiler.tests/functional-tests/f/SDKSWCTests.java
@@ -49,6 +49,8 @@ public class SDKSWCTests
{
private static EnvProperties env = EnvProperties.initiate();
+ private static final String TEXTLAYOUT_NAME = "textLayout";
+
private String[] extraArgs = new String[]{};
private void compileSWC(String projectName)
@@ -72,7 +74,16 @@ public class SDKSWCTests
{
}
- String configFile = env.SDK + "/frameworks/projects/" + projectName + "/compile-config.xml";
+ String configFile;
+ if (projectName.equals(TEXTLAYOUT_NAME))
+ {
+ configFile = env.TLF + "/compile-config.xml";
+ }
+ else
+ {
+ configFile = env.SDK + "/frameworks/projects/" + projectName + "/compile-config.xml";
+ }
+
String[] baseArgs = new String[]
{
"-load-config+=" + configFile,
@@ -323,7 +334,14 @@ public class SDKSWCTests
@Test
public void textLayoutSWC()
{
- compileSWC("textLayout");
+ extraArgs = new String[]
+ {
+ "+source.dir=./textlayout",
+ "-define=CONFIG::debug,false",
+ "-define=CONFIG::release,true"
+ };
+
+ compileSWC(TEXTLAYOUT_NAME);
}
@Test
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6fa471c5/compiler.tests/src/org/apache/flex/utils/EnvProperties.java
----------------------------------------------------------------------
diff --git a/compiler.tests/src/org/apache/flex/utils/EnvProperties.java b/compiler.tests/src/org/apache/flex/utils/EnvProperties.java
index c64f719..1fa58a4 100644
--- a/compiler.tests/src/org/apache/flex/utils/EnvProperties.java
+++ b/compiler.tests/src/org/apache/flex/utils/EnvProperties.java
@@ -25,8 +25,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
-import org.apache.flex.utils.FilenameNormalization;
-
/**
* EnvProperties checks in following order for a value.
@@ -37,11 +35,16 @@ import org.apache.flex.utils.FilenameNormalization;
*/
public class EnvProperties {
- /**
- * FLEX_HOME
- */
- public String SDK;
-
+ /**
+ * FLEX_HOME
+ */
+ public String SDK;
+
+ /**
+ * TLF_HOME
+ */
+ public String TLF;
+
/**
* PLAYERGLOBAL_HOME
*/
@@ -88,7 +91,9 @@ public class EnvProperties {
if(FPSDK == null)
FPSDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk/frameworks/libs/player");
System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK);
-
+
+ TLF = p.getProperty("TLF_HOME", System.getenv("TLF_HOME"));
+ System.out.println("environment property - TLF_HOME = " + TLF);
AIRSDK = p.getProperty("AIR_HOME", System.getenv("AIR_HOME"));
System.out.println("environment property - AIR_HOME = " + AIRSDK);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6fa471c5/compiler.tests/template-unittest.properties
----------------------------------------------------------------------
diff --git a/compiler.tests/template-unittest.properties b/compiler.tests/template-unittest.properties
index 87bb1cf..1b5fa11 100644
--- a/compiler.tests/template-unittest.properties
+++ b/compiler.tests/template-unittest.properties
@@ -6,6 +6,11 @@
#
FLEX_HOME=
+# Example (Windows) TLF_HOME=C:\\dev\\apache-flex\\tlf
+# (Mac Os X)
+#
+TLF_HOME=
+
# Example (Windows) AIR_HOME=C:\\dev\\air-sdk-3.4
# (Mac Os X)
#