Repository: flex-falcon Updated Branches: refs/heads/develop f709e5fd2 -> 7a1726e79
try to fix air projects Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7a1726e7 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7a1726e7 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7a1726e7 Branch: refs/heads/develop Commit: 7a1726e79bd90d9be51b54eb92b5c96bd7835172 Parents: f709e5f Author: Alex Harui <aha...@apache.org> Authored: Fri May 9 07:58:54 2014 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Fri May 9 07:58:54 2014 -0700 ---------------------------------------------------------------------- .../src/flex2/tools/oem/Application.java | 3 ++- .../src/flex2/tools/oem/internal/OEMUtil.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7a1726e7/flex-compiler-oem/src/flex2/tools/oem/Application.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/Application.java b/flex-compiler-oem/src/flex2/tools/oem/Application.java index a39e92b..c0a7884 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/Application.java +++ b/flex-compiler-oem/src/flex2/tools/oem/Application.java @@ -622,7 +622,8 @@ public class Application implements Builder //Map licenseMap = OEMUtil.getLicenseMap(tempOEMConfiguration.configuration); mxmlc = new MXMLC(); - int returnValue = mxmlc.mainCompileOnly(constructCommandLine2(tempOEMConfiguration.configuration), null); + //int returnValue = mxmlc.mainCompileOnly(constructCommandLine2(tempOEMConfiguration.configuration), null); + int returnValue = mxmlc.mainCompileOnly(constructCommandLine(oemConfiguration), null); if (returnValue == 0) returnValue = OK; else http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7a1726e7/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java index 09c3037..f339c5a 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java +++ b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java @@ -25,10 +25,12 @@ import java.util.Map; import java.util.Set; import flex2.compiler.common.CompilerConfiguration; +import flex2.compiler.common.ConfigurationPathResolver; import flex2.compiler.common.DefaultsConfigurator; import flex2.compiler.config.CommandLineConfigurator; import flex2.compiler.config.ConfigurationBuffer; import flex2.compiler.config.ConfigurationException; +import flex2.compiler.config.ConfigurationValue; import flex2.compiler.config.FileConfigurator; import flex2.compiler.config.SystemPropertyConfigurator; import flex2.compiler.util.CompilerControl; @@ -187,6 +189,8 @@ public class OEMUtil private static ApplicationCompilerConfiguration processMXMLCConfiguration(org.apache.flex.compiler.config.Configuration config) { ApplicationCompilerConfiguration acc = new ApplicationCompilerConfiguration(); + ConfigurationPathResolver resolver = new ConfigurationPathResolver(); + acc.setConfigPathResolver(resolver); acc.setBackgroundColor(config.getDefaultBackgroundColor()); acc.setDebug(config.debug()); acc.setFrameRate(config.getDefaultFrameRate()); @@ -197,6 +201,18 @@ public class OEMUtil acc.setScriptTimeLimit(config.getScriptTimeLimit()); CompilerConfiguration cc = acc.getCompilerConfiguration(); cc.setAccessible(config.getCompilerAccessible()); + List<String> externalLibraries = config.getCompilerExternalLibraryPath(); + String[] extlibs = new String[externalLibraries.size()]; + externalLibraries.toArray(extlibs); + try + { + cc.cfgExternalLibraryPath(null, extlibs); + } + catch (ConfigurationException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } return acc; }
