Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0DAB710669 for ; Mon, 25 Nov 2013 06:59:11 +0000 (UTC) Received: (qmail 45484 invoked by uid 500); 25 Nov 2013 06:59:08 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 45457 invoked by uid 500); 25 Nov 2013 06:59:07 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 45427 invoked by uid 99); 25 Nov 2013 06:58:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Nov 2013 06:58:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 99796904B25; Mon, 25 Nov 2013 06:58:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Mon, 25 Nov 2013 06:58:59 -0000 Message-Id: <94bcbb00d4224a449d1b4098d2fa596b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: [flex-falcon] [refs/heads/develop] - add -external-sdk-lib option so we can handle externs in jquery and createjs 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 Authored: Thu Nov 21 12:50:48 2013 -0800 Committer: Alex Harui 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 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 externalJSLib = new ArrayList(); + + public List getExternalJSLib() + { + return externalJSLib; + } + + @Config(allowMultiple = true) + @Mapping("external-js-lib") + @InfiniteArguments + public void setExternalJSLib(ConfigurationValue cv, List value) + throws ConfigurationException + { + externalJSLib.addAll(value); + } + + // // 'strict-publish' //