Updated Branches: refs/heads/develop 635ef7bf2 -> 4bac1cfff
add -external-sdk-lib option so we can handle externs in jquery and createjs Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/45c6be99 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/45c6be99 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/45c6be99 Branch: refs/heads/develop Commit: 45c6be9988ced20d8ad9678f95580c412405509e Parents: 635ef7b Author: Alex Harui <aha...@apache.org> Authored: Thu Nov 21 12:50:48 2013 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Thu Nov 21 12:50:48 2013 -0800 ---------------------------------------------------------------------- .../mxml/flexjs/MXMLFlexJSPublisher.java | 5 +++++ .../driver/js/goog/JSGoogConfiguration.java | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/45c6be99/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java index 7807f1e..b101eaf 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; @@ -203,6 +204,10 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements optionList.add("--create_source_map=" + projectReleaseJSFilePath + ".map"); optionList.add("--source_map_format=" + SourceMap.Format.V3); + + List<String> externs = ((JSGoogConfiguration)configuration).getExternalJSLib(); + for (String extern : externs) + optionList.add("--externs=" + extern); String[] options = (String[]) optionList.toArray(new String[0]); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/45c6be99/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 621f38e..81ed93d 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 @@ -147,6 +147,26 @@ public class JSGoogConfiguration extends JSConfiguration } // + // 'external-js-lib' + // + + private List<String> externalJSLib = new ArrayList<String>(); + + public List<String> getExternalJSLib() + { + return externalJSLib; + } + + @Config(allowMultiple = true) + @Mapping("external-js-lib") + @InfiniteArguments + public void setExternalJSLib(ConfigurationValue cv, List<String> value) + throws ConfigurationException + { + externalJSLib.addAll(value); + } + + // // 'strict-publish' //
