Repository: flex-falcon Updated Branches: refs/heads/develop afdd66741 -> af9b79f81
allow override of playerglobal version in unit tests Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/af9b79f8 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/af9b79f8 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/af9b79f8 Branch: refs/heads/develop Commit: af9b79f8150351d703699d3935c182467a30f0d4 Parents: afdd667 Author: Alex Harui <[email protected]> Authored: Tue Apr 22 14:32:08 2014 -0700 Committer: Alex Harui <[email protected]> Committed: Tue Apr 22 14:32:08 2014 -0700 ---------------------------------------------------------------------- .../apache/flex/compiler/internal/test/AMDTestBase.java | 2 +- .../apache/flex/compiler/internal/test/ASTestBase.java | 2 +- .../flex/compiler/internal/test/FlexJSTestBase.java | 2 +- .../apache/flex/compiler/internal/test/MXMLTestBase.java | 2 +- .../feature-tests/mxml/tags/MXMLFeatureTestsBase.java | 2 +- .../src/org/apache/flex/utils/EnvProperties.java | 10 ++++++++++ .../compiler/internal/tree/mxml/MXMLNodeBaseTests.java | 2 +- 7 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9b79f8/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java index 60d80e5..3728b06 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java @@ -82,7 +82,7 @@ public abstract class AMDTestBase extends TestBase protected void addLibraries(List<File> libraries) { libraries.add(new File(FilenameNormalization.normalize(env.FPSDK - + "/11.1/playerglobal.swc"))); + + "/" + env.FPVER + "/playerglobal.swc"))); super.addLibraries(libraries); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9b79f8/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java index 8720512..68da1f8 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java @@ -54,7 +54,7 @@ public class ASTestBase extends TestBase protected void addLibraries(List<File> libraries) { libraries.add(new File(FilenameNormalization.normalize(env.FPSDK - + "/11.1/playerglobal.swc"))); + + "/" + env.FPVER + "/playerglobal.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK + "/frameworks/libs/framework.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9b79f8/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java index a8c945f..3fdf797 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java @@ -53,7 +53,7 @@ public class FlexJSTestBase extends TestBase protected void addLibraries(List<File> libraries) { libraries.add(new File(FilenameNormalization.normalize(env.FPSDK - + "/11.1/playerglobal.swc"))); + + "/" + env.FPVER + "/playerglobal.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK + "/frameworks/libs/framework.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9b79f8/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java index 2aa964c..5a62d03 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java @@ -51,7 +51,7 @@ public class MXMLTestBase extends TestBase protected void addLibraries(List<File> libraries) { libraries.add(new File(FilenameNormalization.normalize(env.FPSDK - + "/11.1/playerglobal.swc"))); + + "/" + env.FPVER + "/playerglobal.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK + "/frameworks/libs/framework.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9b79f8/compiler.tests/feature-tests/mxml/tags/MXMLFeatureTestsBase.java ---------------------------------------------------------------------- diff --git a/compiler.tests/feature-tests/mxml/tags/MXMLFeatureTestsBase.java b/compiler.tests/feature-tests/mxml/tags/MXMLFeatureTestsBase.java index 33a347e..a4b610a 100644 --- a/compiler.tests/feature-tests/mxml/tags/MXMLFeatureTestsBase.java +++ b/compiler.tests/feature-tests/mxml/tags/MXMLFeatureTestsBase.java @@ -45,7 +45,7 @@ public class MXMLFeatureTestsBase { private static EnvProperties env = EnvProperties.initiate(); - private static final String PLAYERGLOBAL_SWC = FilenameNormalization.normalize(env.FPSDK + "\\11.1\\playerglobal.swc"); + private static final String PLAYERGLOBAL_SWC = FilenameNormalization.normalize(env.FPSDK + "\\" + env.FPVER + "\\playerglobal.swc"); private static final String FRAMEWORK_SWC = FilenameNormalization.normalize(env.SDK + "\\frameworks\\libs\\framework.swc"); private static final String FRAMEWORK_RB_SWC = FilenameNormalization.normalize(env.SDK + "\\frameworks\\locale\\en_US\\framework_rb.swc"); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9b79f8/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 1fa58a4..062732e 100644 --- a/compiler.tests/src/org/apache/flex/utils/EnvProperties.java +++ b/compiler.tests/src/org/apache/flex/utils/EnvProperties.java @@ -60,6 +60,11 @@ public class EnvProperties { */ public String FDBG; + /** + * PLAYERGLOBAL_VERSION + */ + public String FPVER; + private static EnvProperties env; @@ -92,6 +97,11 @@ public class EnvProperties { FPSDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk/frameworks/libs/player"); System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK); + FPVER = p.getProperty("PLAYERGLOBAL_VERSION", System.getenv("PLAYERGLOBAL_VERSION")); + if (FPVER == null) + FPVER = "11.1"; + System.out.println("environment property - PLAYERGLOBAL_VERSION = " + FPVER); + TLF = p.getProperty("TLF_HOME", System.getenv("TLF_HOME")); System.out.println("environment property - TLF_HOME = " + TLF); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9b79f8/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java ---------------------------------------------------------------------- diff --git a/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java b/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java index 3a82b9c..06293f4 100644 --- a/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java +++ b/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java @@ -118,7 +118,7 @@ public class MXMLNodeBaseTests // Compile the code against playerglobal.swc. List<File> libraries = new ArrayList<File>(); - libraries.add(new File(FilenameNormalization.normalize(env.FPSDK + "\\11.1\\playerglobal.swc"))); + libraries.add(new File(FilenameNormalization.normalize(env.FPSDK + "\\" + env.FPVER + "\\playerglobal.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK + "\\frameworks\\libs\\framework.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK + "\\frameworks\\libs\\rpc.swc"))); libraries.add(new File(FilenameNormalization.normalize(env.SDK + "\\frameworks\\libs\\spark.swc")));
