You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/04/22 15:02:21 UTC

git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - - Made the externs build again after merging in the latest changes.

Repository: flex-falcon
Updated Branches:
  refs/heads/feature/maven-migration-test 6bd222bd2 -> 28f5f13c9


- Made the externs build again after merging in the latest changes.


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/28f5f13c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/28f5f13c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/28f5f13c

Branch: refs/heads/feature/maven-migration-test
Commit: 28f5f13c94d9e55b4c5745610109aff64e11ce42
Parents: 6bd222b
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Apr 22 15:02:03 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Apr 22 15:02:03 2016 +0200

----------------------------------------------------------------------
 externs/jquery/pom.xml                        | 22 ++++++++++++++++++
 externs/js/src/main/config/externc-config.xml | 26 ----------------------
 2 files changed, 22 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28f5f13c/externs/jquery/pom.xml
----------------------------------------------------------------------
diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml
index a137557..c37b94b 100644
--- a/externs/jquery/pom.xml
+++ b/externs/jquery/pom.xml
@@ -61,6 +61,28 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.flex.flexjs.compiler</groupId>
+                <artifactId>compiler-build-tools</artifactId>
+                <version>0.6.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>pre-jquery-dollar-global</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>pre-process-sources</goal>
+                        </goals>
+                        <configuration>
+                            <operations>
+                                <replace-regexp-operation><match>(\* @const\s+)([\*\s/]+var \$)</match><replace>$1* @type {jQuery}\n$2</replace></replace-regexp-operation>
+                            </operations>
+                            <includes>
+                                <include>jquery-1.9.js</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.flex.flexjs.compiler</groupId>
                 <artifactId>flexjs-maven-plugin</artifactId>
                 <version>0.6.0-SNAPSHOT</version>
                 <extensions>true</extensions>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28f5f13c/externs/js/src/main/config/externc-config.xml
----------------------------------------------------------------------
diff --git a/externs/js/src/main/config/externc-config.xml b/externs/js/src/main/config/externc-config.xml
index 8ce6c29..498cd27 100644
--- a/externs/js/src/main/config/externc-config.xml
+++ b/externs/js/src/main/config/externc-config.xml
@@ -138,32 +138,6 @@
         <class>String</class>
         <name>valueOf</name>
     </exclude>
-    <exclude><class>FontFaceSet</class><name>delete</name></exclude>
-
-    <exclude><class>CSSStyleDeclaration</class><name>cssText</name></exclude>
-    <exclude><class>CSSStyleRule</class><name>style</name></exclude>
-    <exclude><class>CSSFontFaceRule</class><name>style</name></exclude>
-    <exclude><class>CSSPageRule</class><name>style</name></exclude>
-
-    <exclude><class>Generator</class><name>throw</name></exclude>
-    <exclude><class>Generator</class><name>return</name></exclude>
-    <exclude><class>HTMLMenuItemElement</class><name>default</name></exclude>
-    <exclude><class>MessageEvent</class><name>data</name></exclude><!-- TODO returns T -->
-    <exclude><class>MessageEvent</class><name>initMessageEventNS</name></exclude> <!-- TODO param T -->
-    <exclude><class>MessageEvent</class><name>initMessageEvent</name></exclude> <!-- TODO param T -->
-    <exclude><class>MessageEvent</class><name>default</name></exclude>
-    <exclude><class>Object</class><name>is</name></exclude>
-    <exclude><class>Promise</class><name>catch</name></exclude>
-
-    <exclude><class>IDBCursor</class><name>continue</name></exclude>
-    <exclude><class>IDBCursor</class><name>delete</name></exclude>
-    <exclude><class>IDBObjectStore</class><name>delete</name></exclude>
-
-    <!-- TODO method treated like field -->
-    <field-exclude><class>Iterator</class><field>next</field></field-exclude>
-    <exclude><class>Generator</class><name>next</name></exclude>
-    <exclude><class>LinkStyle</class><name>sheet</name></exclude>
-
     <!-- SVG -->
     <exclude><class>SVGStylable</class><name>className</name></exclude>
     <exclude><class>SVGStylable</class><name>style</name></exclude>