Added default values for 'sdk-js-lib' and 'closure-lib' config settings, such that when the compiler is part of the FlexJS SDK, there is no need to explicitly set these paths.
Signed-off-by: Erik de Bruin <e...@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/79391efc Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/79391efc Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/79391efc Branch: refs/heads/maven Commit: 79391efcd20f158ae20e90486fca327862540800 Parents: c3557a5 Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Fri Nov 29 13:47:11 2013 +0100 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Fri Nov 29 13:47:11 2013 +0100 ---------------------------------------------------------------------- .../internal/driver/js/goog/JSGoogConfiguration.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79391efc/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java index 81ed93d..897e409 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java @@ -52,10 +52,13 @@ public class JSGoogConfiguration extends JSConfiguration // 'closure-lib' // - private String closureLib; + private String closureLib = ""; public String getClosureLib() { + if (closureLib.equals("")) + closureLib = "./js/lib/google/closure-library"; + return closureLib; } @@ -64,7 +67,8 @@ public class JSGoogConfiguration extends JSConfiguration public void setClosureLib(ConfigurationValue cv, String value) throws ConfigurationException { - closureLib = value; + if (value != null) + closureLib = value; } // @@ -134,6 +138,9 @@ public class JSGoogConfiguration extends JSConfiguration public List<String> getSDKJSLib() { + if (sdkJSLib.size() == 0) + sdkJSLib.add("./frameworks/js/FlexJS/src"); + return sdkJSLib; }
