flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [06/10] git commit: [flex-asjs] [refs/heads/dual] - fix up js swcs with css files
Date Wed, 01 Mar 2017 21:09:54 GMT
fix up js swcs with css files


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

Branch: refs/heads/dual
Commit: 577a2d8e2047959b920d3811d9a7f9f2c6946b0a
Parents: c822828
Author: Alex Harui <aharui@apache.org>
Authored: Wed Mar 1 13:07:31 2017 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Mar 1 13:07:31 2017 -0800

----------------------------------------------------------------------
 .../BasicJS/src/main/config/compile-js-config.xml      |  4 +++-
 .../ChartsJS/src/main/config/compile-js-config.xml     |  4 +++-
 .../CreateJSJS/src/main/config/compile-js-config.xml   |  4 +++-
 .../ExpressJS/src/main/config/compile-js-config.xml    |  4 +++-
 .../FlatJS/src/main/config/compile-js-config.xml       |  4 +++-
 .../src/main/config/compile-js-config.xml              |  4 +++-
 frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml   | 13 +++++++++++++
 .../GoogleMapsJS/src/main/config/compile-js-config.xml |  5 +++++
 .../GraphicsJS/src/main/config/compile-js-config.xml   |  4 +++-
 .../HTML5JS/src/main/config/compile-js-config.xml      |  5 +++++
 .../HTMLJS/src/main/config/compile-js-config.xml       |  4 +++-
 .../JQueryJS/src/main/config/compile-js-config.xml     |  4 +++-
 .../MobileJS/src/main/config/compile-js-config.xml     |  4 +++-
 .../StorageJS/src/main/config/compile-js-config.xml    |  4 +++-
 14 files changed, 56 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
index ec61db4..15c4654 100644
--- a/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
@@ -78,8 +78,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/Basic/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
index d1910d7..c89837e 100644
--- a/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
@@ -73,8 +73,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/Charts/src/main/resources/defaults.css</path>
     </include-file>
-    
+        
     <include-classes>
         <class>ChartsClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
index 2b0afee..5c65717 100644
--- a/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
@@ -68,8 +68,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/CreateJS/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
index 2384af8..9cabc17 100644
--- a/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
@@ -75,8 +75,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/Express/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
index f32da89..be699ce 100644
--- a/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
@@ -72,8 +72,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/Flat/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-classes>
         <class>FlatClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml
index 26bee6f..6582dab 100644
--- a/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml
@@ -72,8 +72,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/FontAwesome/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-classes>
         <class>FAClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
index eecd361..a5d8cc0 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
@@ -53,6 +53,19 @@
         <echo message="Cross-compiling ${target.name}"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
         <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+        <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
+            <jvmarg value="-Xmx384m" />
+            <jvmarg value="-Dsun.io.useCanonCaches=false" />
+            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
+            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <arg value="+flexlib=${FLEX_HOME}/frameworks" />
+            <arg value="-compiler.strict-xml=true" />
+            <arg value="-compiler.targets=SWF,JSFlex" />
+            <arg value="-output=${basedir}/target/${target.name}" />
+            <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+            <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml"
/>
+        </java>
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}"
/>
     </target>
     
     <target name="copy-js" >

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
index 29918c6..c4fb8a9 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
@@ -75,6 +75,11 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
 
+    <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/GoogleMaps/src/main/resources/defaults.css</path>
+    </include-file>
+
     <include-classes>
         <class>GoogleStubClasses</class>
         <class>GoogleMapsClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
index dfc63c9..e4020d5 100644
--- a/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
@@ -71,8 +71,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/Graphics/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
index bd03b28..3878ea2 100644
--- a/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
@@ -71,6 +71,11 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
 
+    <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/HTML5/src/main/resources/defaults.css</path>
+    </include-file>
+
     <include-classes>
         <class>HTML5Classes</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
index bf01ba5..dcf7f6e 100644
--- a/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
@@ -75,8 +75,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/HTML/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
index ad38abb..8eda1ac 100644
--- a/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
@@ -75,8 +75,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/JQuery/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
index 7785ce9..493d762 100644
--- a/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
@@ -82,8 +82,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/Mobile/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/577a2d8e/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
index 7a3296c..ed39c2c 100644
--- a/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
@@ -75,8 +75,10 @@
     </compiler>
     
     <include-file>
+        <name>defaults.css</name>
+        <path>../../../../../../../projects/Storage/src/main/resources/defaults.css</path>
     </include-file>
-
+    
     <include-sources>
     </include-sources>
     


Mime
View raw message