flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [3/6] git commit: [flex-falcon] [refs/heads/develop] - include externs in SWC
Date Wed, 09 Dec 2015 21:47:37 GMT
include externs in SWC


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

Branch: refs/heads/develop
Commit: a3f2b1f8b283d57c224596205767d7e8c879c60b
Parents: de5ac6e
Author: Alex Harui <aharui@apache.org>
Authored: Tue Dec 8 15:29:10 2015 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Dec 8 15:29:10 2015 -0800

----------------------------------------------------------------------
 build.xml                           | 7 +++++++
 externs/createjs/compile-config.xml | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a3f2b1f8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e000d25..582709d 100644
--- a/build.xml
+++ b/build.xml
@@ -720,6 +720,13 @@
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
+            <arg value="-js-root=${basedir}/externs/createjs/out/externs" />
+            <arg value="-load-config=${basedir}/externs/createjs/createjs-compile-config.xml"
/>
+        </java>
+        <java jar="${basedir}/compiler.jx/lib/externc.jar" fork="true"
+            failonerror="false">
+            <arg value="+flexlib=externs" />
+            <arg value="-debug" />
             <arg value="-load-config=${basedir}/externs/createjs/createjs-compile-config.xml"
/>
         </java>
         <java jar="${basedir}/compiler/generated/dist/sdk/lib/falcon-compc.jar" fork="true"

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a3f2b1f8/externs/createjs/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/compile-config.xml b/externs/createjs/compile-config.xml
index e4b55f6..ffcf29b 100644
--- a/externs/createjs/compile-config.xml
+++ b/externs/createjs/compile-config.xml
@@ -77,11 +77,11 @@
          -->
     </include-sources>
 
-    <!--
     <include-file>
-        <name>defaults.css</name>
-        <path>defaults.css</path>
+        <name>externs/*</name>
+        <path>out/externs/*</path>
     </include-file>
+    <!--
     <include-file>
         <name>assets/ErrorIndicator.png</name>
         <path>assets/ErrorIndicator.png</path>


Mime
View raw message