You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/03/01 21:09:56 UTC
[08/10] git commit: [flex-asjs] [refs/heads/dual] - fix up config
files for dual mode
fix up config files for dual mode
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6a4be59f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6a4be59f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6a4be59f
Branch: refs/heads/dual
Commit: 6a4be59fcfa643b4e101becab81dd83b059062d5
Parents: abcc8ff
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:08:45 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:08:45 2017 -0800
----------------------------------------------------------------------
frameworks/air-config-template.xml | 29 ++++++++++++++++++++++++++++
frameworks/air-config.xml | 29 ++++++++++++++++++++++++++++
frameworks/createjs-config-template.xml | 6 ++++++
frameworks/createjs-config.xml | 6 ++++++
frameworks/flex-config-template.xml | 27 ++++++++++++++++++++++++++
frameworks/flex-config.xml | 27 ++++++++++++++++++++++++++
frameworks/jquery-config-template.xml | 5 +++++
frameworks/jquery-config.xml | 5 +++++
frameworks/js-config-template.xml | 5 +++++
frameworks/js-config.xml | 5 +++++
frameworks/node-config-template.xml | 5 +++++
frameworks/node-config.xml | 5 +++++
12 files changed, 154 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/air-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/air-config-template.xml b/frameworks/air-config-template.xml
index 7388a3f..e8f2cf5 100644
--- a/frameworks/air-config-template.xml
+++ b/frameworks/air-config-template.xml
@@ -27,6 +27,15 @@
<swf-version>@swfversion@</swf-version>
<compiler>
+
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>SWF</target>
+ <target>JSFlex</target>
+ </targets>
+
+ <define><name>COMPILE::SWF</name><value>AUTO</value></define>
+ <define><name>COMPILE::JS</name><value>AUTO</value></define>
<!-- Turn on generation of accessible SWFs. -->
<accessible>true</accessible>
@@ -63,6 +72,12 @@
<path-element>{airHome}/frameworks/libs/air/airglobal.swc</path-element>
</external-library-path>
+ <!-- List of SWC files or directories to compile against but to omit from -->
+ <!-- linking. -->
+ <js-external-library-path>
+ <path-element>../js/libs/js.swc</path-element>
+ </js-external-library-path>
+
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
<!-- the compiler during mxml translation and are helpful with understanding and -->
<!-- debugging Flex applications. -->
@@ -81,6 +96,11 @@
<path-element>{airHome}/frameworks/libs/air</path-element>
</library-path>
+ <!-- List of SWC files or directories that contain SWC files. -->
+ <js-library-path>
+ <path-element>js/FlexJS/libs</path-element>
+ </js-library-path>
+
<allow-subclass-overrides>true</allow-subclass-overrides>
<mxml>
<children-as-data>true</children-as-data>
@@ -94,6 +114,9 @@
<binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
+ <binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
@@ -113,6 +136,12 @@
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>projects/Basic/src/main/resources/basic-manifest.xml</manifest>
+
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+
<manifest>projects/Charts/src/main/resources/basic-manifest.xml</manifest>
</namespace>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/air-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/air-config.xml b/frameworks/air-config.xml
index 44fcfa4..ee55640 100644
--- a/frameworks/air-config.xml
+++ b/frameworks/air-config.xml
@@ -27,6 +27,15 @@
<swf-version>14</swf-version>
<compiler>
+
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>SWF</target>
+ <target>JSFlex</target>
+ </targets>
+
+ <define><name>COMPILE::SWF</name><value>AUTO</value></define>
+ <define><name>COMPILE::JS</name><value>AUTO</value></define>
<!-- Turn on generation of accessible SWFs. -->
<accessible>true</accessible>
@@ -63,6 +72,12 @@
<path-element>{airHome}/frameworks/libs/air/airglobal.swc</path-element>
</external-library-path>
+ <!-- List of SWC files or directories to compile against but to omit from -->
+ <!-- linking. -->
+ <js-external-library-path>
+ <path-element>../js/libs/js.swc</path-element>
+ </js-external-library-path>
+
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
<!-- the compiler during mxml translation and are helpful with understanding and -->
<!-- debugging Flex applications. -->
@@ -81,6 +96,11 @@
<path-element>{airHome}/frameworks/libs/air</path-element>
</library-path>
+ <!-- List of SWC files or directories that contain SWC files. -->
+ <js-library-path>
+ <path-element>js/FlexJS/libs</path-element>
+ </js-library-path>
+
<allow-subclass-overrides>true</allow-subclass-overrides>
<mxml>
<children-as-data>true</children-as-data>
@@ -94,6 +114,9 @@
<binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
+ <binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
@@ -113,6 +136,12 @@
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>projects/Basic/src/main/resources/basic-manifest.xml</manifest>
+
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+
<manifest>projects/Charts/src/main/resources/basic-manifest.xml</manifest>
</namespace>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/createjs-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/createjs-config-template.xml b/frameworks/createjs-config-template.xml
index 0d0a958..49a8980 100644
--- a/frameworks/createjs-config-template.xml
+++ b/frameworks/createjs-config-template.xml
@@ -29,6 +29,11 @@
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JS</target>
+ </targets>
+
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
<!--
@@ -89,6 +94,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/createjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/createjs-config.xml b/frameworks/createjs-config.xml
index 9b734ef..cf0eaf5 100644
--- a/frameworks/createjs-config.xml
+++ b/frameworks/createjs-config.xml
@@ -29,6 +29,11 @@
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JS</target>
+ </targets>
+
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
<!--
@@ -89,6 +94,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/flex-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/flex-config-template.xml b/frameworks/flex-config-template.xml
index a0d20df..18f041e 100644
--- a/frameworks/flex-config-template.xml
+++ b/frameworks/flex-config-template.xml
@@ -29,6 +29,15 @@
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>SWF</target>
+ <target>JSFlex</target>
+ </targets>
+
+ <define><name>COMPILE::SWF</name><value>AUTO</value></define>
+ <define><name>COMPILE::JS</name><value>AUTO</value></define>
+
<!-- Turn on generation of accessible SWFs. -->
<accessible>true</accessible>
@@ -64,6 +73,12 @@
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
</external-library-path>
+ <!-- List of SWC files or directories to compile against but to omit from -->
+ <!-- linking. -->
+ <js-external-library-path>
+ <path-element>../js/libs/js.swc</path-element>
+ </js-external-library-path>
+
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
<!-- the compiler during mxml translation and are helpful with understanding and -->
<!-- debugging Flex applications. -->
@@ -82,6 +97,11 @@
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
+ <!-- List of SWC files or directories that contain SWC files. -->
+ <js-library-path>
+ <path-element>js/FlexJS/libs</path-element>
+ </js-library-path>
+
<allow-subclass-overrides>true</allow-subclass-overrides>
<mxml>
<children-as-data>true</children-as-data>
@@ -97,6 +117,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
@@ -116,6 +137,12 @@
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>projects/Basic/src/main/resources/basic-manifest.xml</manifest>
+
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+
<manifest>projects/Charts/src/main/resources/basic-manifest.xml</manifest>
</namespace>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/flex-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml
index 1810028..677284f 100644
--- a/frameworks/flex-config.xml
+++ b/frameworks/flex-config.xml
@@ -29,6 +29,15 @@
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>SWF</target>
+ <target>JSFlex</target>
+ </targets>
+
+ <define><name>COMPILE::SWF</name><value>AUTO</value></define>
+ <define><name>COMPILE::JS</name><value>AUTO</value></define>
+
<!-- Turn on generation of accessible SWFs. -->
<accessible>true</accessible>
@@ -64,6 +73,12 @@
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
</external-library-path>
+ <!-- List of SWC files or directories to compile against but to omit from -->
+ <!-- linking. -->
+ <js-external-library-path>
+ <path-element>../js/libs/js.swc</path-element>
+ </js-external-library-path>
+
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
<!-- the compiler during mxml translation and are helpful with understanding and -->
<!-- debugging Flex applications. -->
@@ -82,6 +97,11 @@
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
+ <!-- List of SWC files or directories that contain SWC files. -->
+ <js-library-path>
+ <path-element>js/FlexJS/libs</path-element>
+ </js-library-path>
+
<allow-subclass-overrides>true</allow-subclass-overrides>
<mxml>
<children-as-data>true</children-as-data>
@@ -97,6 +117,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
@@ -116,6 +137,12 @@
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>projects/Basic/src/main/resources/basic-manifest.xml</manifest>
+
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+
<manifest>projects/Charts/src/main/resources/basic-manifest.xml</manifest>
</namespace>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/jquery-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/jquery-config-template.xml b/frameworks/jquery-config-template.xml
index 28343d1..f97f278 100644
--- a/frameworks/jquery-config-template.xml
+++ b/frameworks/jquery-config-template.xml
@@ -28,6 +28,10 @@
<swf-version>@swfversion@</swf-version>
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JS</target>
+ </targets>
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
@@ -90,6 +94,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/jquery-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/jquery-config.xml b/frameworks/jquery-config.xml
index 5cdb001..4bae5b3 100644
--- a/frameworks/jquery-config.xml
+++ b/frameworks/jquery-config.xml
@@ -28,6 +28,10 @@
<swf-version>14</swf-version>
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JS</target>
+ </targets>
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
@@ -90,6 +94,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/js-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/js-config-template.xml b/frameworks/js-config-template.xml
index 4818f65..e2db2f8 100644
--- a/frameworks/js-config-template.xml
+++ b/frameworks/js-config-template.xml
@@ -28,6 +28,10 @@
<swf-version>@swfversion@</swf-version>
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JS</target>
+ </targets>
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
@@ -88,6 +92,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js-config.xml b/frameworks/js-config.xml
index 3e5d58b..c66ccef 100644
--- a/frameworks/js-config.xml
+++ b/frameworks/js-config.xml
@@ -28,6 +28,10 @@
<swf-version>14</swf-version>
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JS</target>
+ </targets>
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
@@ -88,6 +92,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/node-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/node-config-template.xml b/frameworks/node-config-template.xml
index 701e978..4581e79 100644
--- a/frameworks/node-config-template.xml
+++ b/frameworks/node-config-template.xml
@@ -28,6 +28,10 @@
<swf-version>@swfversion@</swf-version>
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JSNode</target>
+ </targets>
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
@@ -89,6 +93,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a4be59f/frameworks/node-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/node-config.xml b/frameworks/node-config.xml
index 7c0632b..3fd79ce 100644
--- a/frameworks/node-config.xml
+++ b/frameworks/node-config.xml
@@ -28,6 +28,10 @@
<swf-version>14</swf-version>
<compiler>
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>JSNode</target>
+ </targets>
<!-- List of path elements that form the roots of ActionScript class hierarchies. -->
<!-- not set -->
@@ -89,6 +93,7 @@
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
<binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
<binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <binding-event-handler-interface>org.apache.flex.events.IEventDispatcher</binding-event-handler-interface>
<states-class>org.apache.flex.states.State</states-class>
<states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
<states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>