This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/distribution-allignment
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 26c96b57697ee03a4784ac04aeb4c91872b67ea4
Author: Christofer Dutz <christofer.d...@c-ware.de>
AuthorDate: Sun Feb 28 13:41:32 2021 +0100
- Re-imported the current versions of Ant distribution descriptors and
adjusted them for a maven directory structure.
---
.../src/main/assembly/component-royale.xml | 4 +-
.../frameworks/flex-config-template.xml | 32 +--
.../resources-with-swf/frameworks/flex-config.xml | 105 ++-----
.../frameworks/royale-config-template.xml | 79 ++++-
.../frameworks/royale-config.xml | 83 ++++--
.../frameworks/flex-config-template.xml | 32 +--
.../frameworks/flex-config.xml | 99 ++-----
.../frameworks/royale-config-template.xml | 80 +++++-
.../frameworks/royale-config.xml | 88 ++++--
...config-template.xml => ace-config-template.xml} | 4 +-
.../{jquery-config-template.xml => ace-config.xml} | 8 +-
.../resources/frameworks/air-config-template.xml | 128 ++++-----
.../src/main/resources/frameworks/air-config.xml | 140 ++++-----
.../main/resources/frameworks/airmobile-config.xml | 143 ++++-----
.../frameworks/asdoc-config.xml} | 319 ++++++++++-----------
.../frameworks/createjs-config-template.xml | 2 +-
.../main/resources/frameworks/createjs-config.xml | 6 +-
.../frameworks/jquery-config-template.xml | 2 +-
.../main/resources/frameworks/jquery-config.xml | 6 +-
.../resources/frameworks/js-config-template.xml | 2 +-
.../src/main/resources/frameworks/js-config.xml | 6 +-
.../main/resources/frameworks/mxml-manifest.xml | 40 +--
.../resources/frameworks/node-config-template.xml | 2 +-
.../src/main/resources/frameworks/node-config.xml | 6 +-
.../main/resources/frameworks/spark-manifest.xml | 40 +--
.../mxroyale/RemoteObjectAMFTest/asconfig.json | 4 +-
26 files changed, 708 insertions(+), 752 deletions(-)
diff --git a/distribution/src/main/assembly/component-royale.xml
b/distribution/src/main/assembly/component-royale.xml
index 25a7cf3..5593312 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -53,14 +53,14 @@ under the License.
</excludes>
</dependencySet>
<!-- Put the externs swcs into the externs directory -->
- <dependencySet>
+ <!--dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>externs</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.royale.typedefs:*</include>
</includes>
- </dependencySet>
+ </dependencySet-->
<!-- Put the framework js-swcs into the frameworks/libs directory -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
diff --git
a/distribution/src/main/resources-with-swf/frameworks/flex-config-template.xml
b/distribution/src/main/resources-with-swf/frameworks/flex-config-template.xml
index b41ab58..8c68552 100644
---
a/distribution/src/main/resources-with-swf/frameworks/flex-config-template.xml
+++
b/distribution/src/main/resources-with-swf/frameworks/flex-config-template.xml
@@ -20,7 +20,7 @@
-->
-<royale-config>
+<flex-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
<target-player>@playerversion@</target-player>
@@ -69,9 +69,9 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
- <swf-external-library-path>
+ <external-library-path>
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
- </swf-external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
@@ -93,10 +93,10 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -107,7 +107,10 @@
<mxml>
<children-as-data>true</children-as-data>
<imports>
- <implicit-import>org.apache.royale.events.*</implicit-import>
+ <implicit-import>org.apache.royale.events.Event</implicit-import>
+
<implicit-import>org.apache.royale.events.EventDispatcher</implicit-import>
+
<implicit-import>org.apache.royale.events.IEventDispatcher</implicit-import>
+ <implicit-import>mx.events.MouseEvent</implicit-import>
<implicit-import>org.apache.royale.geom.*</implicit-import>
<implicit-import>org.apache.royale.core.ClassFactory</implicit-import>
<implicit-import>org.apache.royale.core.IFactory</implicit-import>
@@ -125,8 +128,8 @@
<states-event-override-class>org.apache.royale.states.SetEventHandler</states-event-override-class>
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
+ <fxg-base-class>flash.display.Sprite</fxg-base-class>
-
<namespaces>
<!-- Specify a URI to associate with a manifest of components for use as
MXML -->
<!-- elements.
-->
@@ -230,18 +233,6 @@
<uri>library://ns.apache.org/royale/mx</uri>
<manifest>manifests/mx-royale-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
@@ -292,6 +283,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<theme>
+ <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
@@ -496,4 +488,4 @@
<language>EN</language>
</metadata>
-</royale-config>
+</flex-config>
diff --git
a/distribution/src/main/resources-with-swf/frameworks/flex-config.xml
b/distribution/src/main/resources-with-swf/frameworks/flex-config.xml
index d00eb4f..029d9f8 100644
--- a/distribution/src/main/resources-with-swf/frameworks/flex-config.xml
+++ b/distribution/src/main/resources-with-swf/frameworks/flex-config.xml
@@ -20,12 +20,12 @@
-->
-<royale-config>
+<flex-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
@@ -69,9 +69,9 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
- <swf-external-library-path>
+ <external-library-path>
<path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
- </swf-external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
@@ -93,10 +93,10 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
-
<path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
- </swf-library-path>
+
<path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -107,7 +107,10 @@
<mxml>
<children-as-data>true</children-as-data>
<imports>
- <implicit-import>org.apache.royale.events.*</implicit-import>
+ <implicit-import>org.apache.royale.events.Event</implicit-import>
+
<implicit-import>org.apache.royale.events.EventDispatcher</implicit-import>
+
<implicit-import>org.apache.royale.events.IEventDispatcher</implicit-import>
+ <implicit-import>mx.events.MouseEvent</implicit-import>
<implicit-import>org.apache.royale.geom.*</implicit-import>
<implicit-import>org.apache.royale.core.ClassFactory</implicit-import>
<implicit-import>org.apache.royale.core.IFactory</implicit-import>
@@ -125,177 +128,110 @@
<states-event-override-class>org.apache.royale.states.SetEventHandler</states-event-override-class>
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
+ <fxg-base-class>flash.display.Sprite</fxg-base-class>
<namespaces>
<!-- Specify a URI to associate with a manifest of components for use as
MXML -->
<!-- elements.
-->
<namespace>
+ <uri>http://ns.adobe.com/mxml/2009</uri>
+ <manifest>mxml-2009-manifest.xml</manifest>
+ </namespace>
+ <namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-binding.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-basic.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-charts.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-collections.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-core.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-dragdrop.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-effects.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-formatters.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-graphics.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/svg</uri>
-
<manifest>manifests/svg-manifest-graphics.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-html.xml</manifest>
-
</namespace>
<namespace>
- <uri>library://ns.apache.org/royale/svg</uri>
-
- <manifest>manifests/svg-manifest-basic.xml</manifest>
-
+ <uri>library://ns.apache.org/royale/html</uri>
+ <manifest>manifests/html-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-mobile.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-network.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/html5</uri>
-
<manifest>manifests/html5-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/flat</uri>
-
<manifest>manifests/flat-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/jquery</uri>
-
<manifest>manifests/jquery-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/google</uri>
-
<manifest>manifests/google-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/cordova</uri>
-
<manifest>manifests/cordova-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/createjs</uri>
-
<manifest>manifests/createjs-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/mdl</uri>
-
<manifest>manifests/mdl-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/express</uri>
-
<manifest>manifests/express-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/fa</uri>
-
<manifest>manifests/fa-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/mx</uri>
-
<manifest>manifests/mx-royale-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/spark</uri>
-
- <manifest>manifests/spark-royale-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
-
- <manifest>manifests/jewel-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
-
- <manifest>manifests/crux-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
-
- <manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>
@@ -347,6 +283,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<theme>
+ <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
@@ -551,4 +488,4 @@
<language>EN</language>
</metadata>
-</royale-config>
+</flex-config>
diff --git
a/distribution/src/main/resources-with-swf/frameworks/royale-config-template.xml
b/distribution/src/main/resources-with-swf/frameworks/royale-config-template.xml
index 816fe68..49c1201 100644
---
a/distribution/src/main/resources-with-swf/frameworks/royale-config-template.xml
+++
b/distribution/src/main/resources-with-swf/frameworks/royale-config-template.xml
@@ -94,13 +94,76 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs</path-element>
+ <path-element>libs/Basic.swc</path-element>
+ <path-element>libs/Binding.swc</path-element>
+ <path-element>libs/Charts.swc</path-element>
+ <path-element>libs/Collections.swc</path-element>
+ <path-element>libs/Core.swc</path-element>
+ <path-element>libs/CreateJS.swc</path-element>
+ <path-element>libs/DragDrop.swc</path-element>
+ <path-element>libs/Effects.swc</path-element>
+ <path-element>libs/Express.swc</path-element>
+ <path-element>libs/Flat.swc</path-element>
+ <path-element>libs/FontAwesome.swc</path-element>
+ <path-element>libs/Formatters.swc</path-element>
+ <path-element>libs/GoogleMaps.swc</path-element>
+ <path-element>libs/Graphics.swc</path-element>
+ <path-element>libs/HTML.swc</path-element>
+ <path-element>libs/HTML5.swc</path-element>
+ <path-element>libs/Icons.swc</path-element>
+ <path-element>libs/Jewel.swc</path-element>
+ <path-element>libs/Crux.swc</path-element>
+ <path-element>libs/jQuery.swc</path-element>
+ <path-element>libs/Language.swc</path-element>
+ <path-element>libs/MaterialDesignLite.swc</path-element>
+ <path-element>libs/Mobile.swc</path-element>
+ <path-element>libs/Network.swc</path-element>
+ <path-element>libs/Reflection.swc</path-element>
+ <path-element>libs/RoyaleSite.swc</path-element>
+ <path-element>libs/RoyaleUnit.swc</path-element>
+ <path-element>libs/RoyaleUnitUI.swc</path-element>
+ <path-element>libs/Storage.swc</path-element>
+ <path-element>libs/TLF.swc</path-element>
+ <path-element>libs/Text.swc</path-element>
+ <path-element>libs/XML.swc</path-element>
<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/libs</path-element>
+ <path-element>js/libs/AceJS.swc</path-element>
+ <path-element>js/libs/BasicJS.swc</path-element>
+ <path-element>js/libs/BindingJS.swc</path-element>
+ <path-element>js/libs/ChartsJS.swc</path-element>
+ <path-element>js/libs/CollectionsJS.swc</path-element>
+ <path-element>js/libs/CoreJS.swc</path-element>
+ <path-element>js/libs/CreateJSJS.swc</path-element>
+ <path-element>js/libs/DragDropJS.swc</path-element>
+ <path-element>js/libs/EffectsJS.swc</path-element>
+ <path-element>js/libs/ExpressJS.swc</path-element>
+ <path-element>js/libs/FlatJS.swc</path-element>
+ <path-element>js/libs/FontAwesomeJS.swc</path-element>
+ <path-element>js/libs/FormattersJS.swc</path-element>
+ <path-element>js/libs/GoogleMapsJS.swc</path-element>
+ <path-element>js/libs/GraphicsJS.swc</path-element>
+ <path-element>js/libs/HTMLJS.swc</path-element>
+ <path-element>js/libs/HTML5JS.swc</path-element>
+ <path-element>js/libs/IconsJS.swc</path-element>
+ <path-element>js/libs/JewelJS.swc</path-element>
+ <path-element>js/libs/CruxJS.swc</path-element>
+ <path-element>js/libs/jQueryJS.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
+ <path-element>js/libs/MaterialDesignLiteJS.swc</path-element>
+ <path-element>js/libs/MobileJS.swc</path-element>
+ <path-element>js/libs/NetworkJS.swc</path-element>
+ <path-element>js/libs/ReflectionJS.swc</path-element>
+ <path-element>js/libs/RoyaleSiteJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitUIJS.swc</path-element>
+ <path-element>js/libs/StorageJS.swc</path-element>
+ <path-element>js/libs/TLFJS.swc</path-element>
+ <path-element>js/libs/TextJS.swc</path-element>
+ <path-element>js/libs/XMLJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
@@ -226,18 +289,6 @@
<uri>library://ns.apache.org/royale/fa</uri>
<manifest>manifests/fa-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
diff --git
a/distribution/src/main/resources-with-swf/frameworks/royale-config.xml
b/distribution/src/main/resources-with-swf/frameworks/royale-config.xml
index 78c3109..43ae2a0 100644
--- a/distribution/src/main/resources-with-swf/frameworks/royale-config.xml
+++ b/distribution/src/main/resources-with-swf/frameworks/royale-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
@@ -94,13 +94,76 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs</path-element>
+ <path-element>libs/Basic.swc</path-element>
+ <path-element>libs/Binding.swc</path-element>
+ <path-element>libs/Charts.swc</path-element>
+ <path-element>libs/Collections.swc</path-element>
+ <path-element>libs/Core.swc</path-element>
+ <path-element>libs/CreateJS.swc</path-element>
+ <path-element>libs/DragDrop.swc</path-element>
+ <path-element>libs/Effects.swc</path-element>
+ <path-element>libs/Express.swc</path-element>
+ <path-element>libs/Flat.swc</path-element>
+ <path-element>libs/FontAwesome.swc</path-element>
+ <path-element>libs/Formatters.swc</path-element>
+ <path-element>libs/GoogleMaps.swc</path-element>
+ <path-element>libs/Graphics.swc</path-element>
+ <path-element>libs/HTML.swc</path-element>
+ <path-element>libs/HTML5.swc</path-element>
+ <path-element>libs/Icons.swc</path-element>
+ <path-element>libs/Jewel.swc</path-element>
+ <path-element>libs/Crux.swc</path-element>
+ <path-element>libs/jQuery.swc</path-element>
+ <path-element>libs/Language.swc</path-element>
+ <path-element>libs/MaterialDesignLite.swc</path-element>
+ <path-element>libs/Mobile.swc</path-element>
+ <path-element>libs/Network.swc</path-element>
+ <path-element>libs/Reflection.swc</path-element>
+ <path-element>libs/RoyaleSite.swc</path-element>
+ <path-element>libs/RoyaleUnit.swc</path-element>
+ <path-element>libs/RoyaleUnitUI.swc</path-element>
+ <path-element>libs/Storage.swc</path-element>
+ <path-element>libs/TLF.swc</path-element>
+ <path-element>libs/Text.swc</path-element>
+ <path-element>libs/XML.swc</path-element>
<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/libs</path-element>
+ <path-element>js/libs/AceJS.swc</path-element>
+ <path-element>js/libs/BasicJS.swc</path-element>
+ <path-element>js/libs/BindingJS.swc</path-element>
+ <path-element>js/libs/ChartsJS.swc</path-element>
+ <path-element>js/libs/CollectionsJS.swc</path-element>
+ <path-element>js/libs/CoreJS.swc</path-element>
+ <path-element>js/libs/CreateJSJS.swc</path-element>
+ <path-element>js/libs/DragDropJS.swc</path-element>
+ <path-element>js/libs/EffectsJS.swc</path-element>
+ <path-element>js/libs/ExpressJS.swc</path-element>
+ <path-element>js/libs/FlatJS.swc</path-element>
+ <path-element>js/libs/FontAwesomeJS.swc</path-element>
+ <path-element>js/libs/FormattersJS.swc</path-element>
+ <path-element>js/libs/GoogleMapsJS.swc</path-element>
+ <path-element>js/libs/GraphicsJS.swc</path-element>
+ <path-element>js/libs/HTMLJS.swc</path-element>
+ <path-element>js/libs/HTML5JS.swc</path-element>
+ <path-element>js/libs/IconsJS.swc</path-element>
+ <path-element>js/libs/JewelJS.swc</path-element>
+ <path-element>js/libs/CruxJS.swc</path-element>
+ <path-element>js/libs/jQueryJS.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
+ <path-element>js/libs/MaterialDesignLiteJS.swc</path-element>
+ <path-element>js/libs/MobileJS.swc</path-element>
+ <path-element>js/libs/NetworkJS.swc</path-element>
+ <path-element>js/libs/ReflectionJS.swc</path-element>
+ <path-element>js/libs/RoyaleSiteJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitUIJS.swc</path-element>
+ <path-element>js/libs/StorageJS.swc</path-element>
+ <path-element>js/libs/TLFJS.swc</path-element>
+ <path-element>js/libs/TextJS.swc</path-element>
+ <path-element>js/libs/XMLJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
@@ -226,18 +289,6 @@
<uri>library://ns.apache.org/royale/fa</uri>
<manifest>manifests/fa-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
diff --git
a/distribution/src/main/resources-without-swf/frameworks/flex-config-template.xml
b/distribution/src/main/resources-without-swf/frameworks/flex-config-template.xml
index 28cbb16..66859f1 100644
---
a/distribution/src/main/resources-without-swf/frameworks/flex-config-template.xml
+++
b/distribution/src/main/resources-without-swf/frameworks/flex-config-template.xml
@@ -20,7 +20,7 @@
-->
-<royale-config>
+<flex-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
<target-player>@playerversion@</target-player>
@@ -69,8 +69,8 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
- <swf-external-library-path>
- </swf-external-library-path>
+ <external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
@@ -92,9 +92,9 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -105,7 +105,10 @@
<mxml>
<children-as-data>true</children-as-data>
<imports>
- <implicit-import>org.apache.royale.events.*</implicit-import>
+ <implicit-import>org.apache.royale.events.Event</implicit-import>
+
<implicit-import>org.apache.royale.events.EventDispatcher</implicit-import>
+
<implicit-import>org.apache.royale.events.IEventDispatcher</implicit-import>
+ <implicit-import>mx.events.MouseEvent</implicit-import>
<implicit-import>org.apache.royale.geom.*</implicit-import>
<implicit-import>org.apache.royale.core.ClassFactory</implicit-import>
<implicit-import>org.apache.royale.core.IFactory</implicit-import>
@@ -123,8 +126,8 @@
<states-event-override-class>org.apache.royale.states.SetEventHandler</states-event-override-class>
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
+ <fxg-base-class>flash.display.Sprite</fxg-base-class>
-
<namespaces>
<!-- Specify a URI to associate with a manifest of components for use as
MXML -->
<!-- elements.
-->
@@ -228,18 +231,6 @@
<uri>library://ns.apache.org/royale/mx</uri>
<manifest>manifests/mx-royale-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
@@ -290,6 +281,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<theme>
+ <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
@@ -494,4 +486,4 @@
<language>EN</language>
</metadata>
-</royale-config>
+</flex-config>
diff --git
a/distribution/src/main/resources-without-swf/frameworks/flex-config.xml
b/distribution/src/main/resources-without-swf/frameworks/flex-config.xml
index 9919e9a..c5fbe31 100644
--- a/distribution/src/main/resources-without-swf/frameworks/flex-config.xml
+++ b/distribution/src/main/resources-without-swf/frameworks/flex-config.xml
@@ -20,12 +20,12 @@
-->
-<royale-config>
+<flex-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
@@ -69,8 +69,8 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
- <swf-external-library-path>
- </swf-external-library-path>
+ <external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
@@ -92,9 +92,9 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -105,7 +105,10 @@
<mxml>
<children-as-data>true</children-as-data>
<imports>
- <implicit-import>org.apache.royale.events.*</implicit-import>
+ <implicit-import>org.apache.royale.events.Event</implicit-import>
+
<implicit-import>org.apache.royale.events.EventDispatcher</implicit-import>
+
<implicit-import>org.apache.royale.events.IEventDispatcher</implicit-import>
+ <implicit-import>mx.events.MouseEvent</implicit-import>
<implicit-import>org.apache.royale.geom.*</implicit-import>
<implicit-import>org.apache.royale.core.ClassFactory</implicit-import>
<implicit-import>org.apache.royale.core.IFactory</implicit-import>
@@ -123,177 +126,110 @@
<states-event-override-class>org.apache.royale.states.SetEventHandler</states-event-override-class>
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
+ <fxg-base-class>flash.display.Sprite</fxg-base-class>
<namespaces>
<!-- Specify a URI to associate with a manifest of components for use as
MXML -->
<!-- elements.
-->
<namespace>
+ <uri>http://ns.adobe.com/mxml/2009</uri>
+ <manifest>mxml-2009-manifest.xml</manifest>
+ </namespace>
+ <namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-binding.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-basic.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-charts.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-collections.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-core.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-dragdrop.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-effects.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-formatters.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-graphics.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/svg</uri>
-
<manifest>manifests/svg-manifest-graphics.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-html.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/svg</uri>
-
<manifest>manifests/svg-manifest-basic.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-mobile.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
<manifest>manifests/basic-manifest-network.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/html5</uri>
-
<manifest>manifests/html5-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/flat</uri>
-
<manifest>manifests/flat-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/jquery</uri>
-
<manifest>manifests/jquery-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/google</uri>
-
<manifest>manifests/google-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/cordova</uri>
-
<manifest>manifests/cordova-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/createjs</uri>
-
<manifest>manifests/createjs-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/mdl</uri>
-
<manifest>manifests/mdl-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/express</uri>
-
<manifest>manifests/express-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/fa</uri>
-
<manifest>manifests/fa-manifest.xml</manifest>
-
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/mx</uri>
-
<manifest>manifests/mx-royale-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/spark</uri>
-
- <manifest>manifests/spark-royale-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
-
- <manifest>manifests/jewel-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
-
- <manifest>manifests/crux-manifest.xml</manifest>
-
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
-
- <manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>
@@ -345,6 +281,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<theme>
+ <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
@@ -549,4 +486,4 @@
<language>EN</language>
</metadata>
-</royale-config>
+</flex-config>
diff --git
a/distribution/src/main/resources-without-swf/frameworks/royale-config-template.xml
b/distribution/src/main/resources-without-swf/frameworks/royale-config-template.xml
index dd81b21..e0e6e82 100644
---
a/distribution/src/main/resources-without-swf/frameworks/royale-config-template.xml
+++
b/distribution/src/main/resources-without-swf/frameworks/royale-config-template.xml
@@ -70,6 +70,7 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
<external-library-path>
+
<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 -->
@@ -93,12 +94,75 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs</path-element>
+ <path-element>libs/Basic.swc</path-element>
+ <path-element>libs/Binding.swc</path-element>
+ <path-element>libs/Charts.swc</path-element>
+ <path-element>libs/Collections.swc</path-element>
+ <path-element>libs/Core.swc</path-element>
+ <path-element>libs/CreateJS.swc</path-element>
+ <path-element>libs/DragDrop.swc</path-element>
+ <path-element>libs/Effects.swc</path-element>
+ <path-element>libs/Express.swc</path-element>
+ <path-element>libs/Flat.swc</path-element>
+ <path-element>libs/FontAwesome.swc</path-element>
+ <path-element>libs/Formatters.swc</path-element>
+ <path-element>libs/GoogleMaps.swc</path-element>
+ <path-element>libs/Graphics.swc</path-element>
+ <path-element>libs/HTML.swc</path-element>
+ <path-element>libs/HTML5.swc</path-element>
+ <path-element>libs/Icons.swc</path-element>
+ <path-element>libs/Jewel.swc</path-element>
+ <path-element>libs/Crux.swc</path-element>
+ <path-element>libs/jQuery.swc</path-element>
+ <path-element>libs/Language.swc</path-element>
+ <path-element>libs/MaterialDesignLite.swc</path-element>
+ <path-element>libs/Mobile.swc</path-element>
+ <path-element>libs/Network.swc</path-element>
+ <path-element>libs/Reflection.swc</path-element>
+ <path-element>libs/RoyaleSite.swc</path-element>
+ <path-element>libs/RoyaleUnit.swc</path-element>
+ <path-element>libs/RoyaleUnitUI.swc</path-element>
+ <path-element>libs/Storage.swc</path-element>
+ <path-element>libs/TLF.swc</path-element>
+ <path-element>libs/Text.swc</path-element>
+ <path-element>libs/XML.swc</path-element>
</library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
- <path-element>js/libs</path-element>
+ <path-element>js/libs/AceJS.swc</path-element>
+ <path-element>js/libs/BasicJS.swc</path-element>
+ <path-element>js/libs/BindingJS.swc</path-element>
+ <path-element>js/libs/ChartsJS.swc</path-element>
+ <path-element>js/libs/CollectionsJS.swc</path-element>
+ <path-element>js/libs/CoreJS.swc</path-element>
+ <path-element>js/libs/CreateJSJS.swc</path-element>
+ <path-element>js/libs/DragDropJS.swc</path-element>
+ <path-element>js/libs/EffectsJS.swc</path-element>
+ <path-element>js/libs/ExpressJS.swc</path-element>
+ <path-element>js/libs/FlatJS.swc</path-element>
+ <path-element>js/libs/FontAwesomeJS.swc</path-element>
+ <path-element>js/libs/FormattersJS.swc</path-element>
+ <path-element>js/libs/GoogleMapsJS.swc</path-element>
+ <path-element>js/libs/GraphicsJS.swc</path-element>
+ <path-element>js/libs/HTMLJS.swc</path-element>
+ <path-element>js/libs/HTML5JS.swc</path-element>
+ <path-element>js/libs/IconsJS.swc</path-element>
+ <path-element>js/libs/JewelJS.swc</path-element>
+ <path-element>js/libs/CruxJS.swc</path-element>
+ <path-element>js/libs/jQueryJS.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
+ <path-element>js/libs/MaterialDesignLiteJS.swc</path-element>
+ <path-element>js/libs/MobileJS.swc</path-element>
+ <path-element>js/libs/NetworkJS.swc</path-element>
+ <path-element>js/libs/ReflectionJS.swc</path-element>
+ <path-element>js/libs/RoyaleSiteJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitUIJS.swc</path-element>
+ <path-element>js/libs/StorageJS.swc</path-element>
+ <path-element>js/libs/TLFJS.swc</path-element>
+ <path-element>js/libs/TextJS.swc</path-element>
+ <path-element>js/libs/XMLJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
@@ -224,18 +288,6 @@
<uri>library://ns.apache.org/royale/fa</uri>
<manifest>manifests/fa-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
diff --git
a/distribution/src/main/resources-without-swf/frameworks/royale-config.xml
b/distribution/src/main/resources-without-swf/frameworks/royale-config.xml
index 35a8fe2..fdfc565 100644
--- a/distribution/src/main/resources-without-swf/frameworks/royale-config.xml
+++ b/distribution/src/main/resources-without-swf/frameworks/royale-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
@@ -70,13 +70,14 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
<external-library-path>
+
<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/royale-typedefs-js.swc</path-element>
- <path-element>../js/libs/royale-typedefs-gcl.swc</path-element>
+ <path-element>../js/libs/js.swc</path-element>
+ <path-element>../js/libs/GCL.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are
generated by -->
@@ -93,12 +94,75 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs</path-element>
+ <path-element>libs/Basic.swc</path-element>
+ <path-element>libs/Binding.swc</path-element>
+ <path-element>libs/Charts.swc</path-element>
+ <path-element>libs/Collections.swc</path-element>
+ <path-element>libs/Core.swc</path-element>
+ <path-element>libs/CreateJS.swc</path-element>
+ <path-element>libs/DragDrop.swc</path-element>
+ <path-element>libs/Effects.swc</path-element>
+ <path-element>libs/Express.swc</path-element>
+ <path-element>libs/Flat.swc</path-element>
+ <path-element>libs/FontAwesome.swc</path-element>
+ <path-element>libs/Formatters.swc</path-element>
+ <path-element>libs/GoogleMaps.swc</path-element>
+ <path-element>libs/Graphics.swc</path-element>
+ <path-element>libs/HTML.swc</path-element>
+ <path-element>libs/HTML5.swc</path-element>
+ <path-element>libs/Icons.swc</path-element>
+ <path-element>libs/Jewel.swc</path-element>
+ <path-element>libs/Crux.swc</path-element>
+ <path-element>libs/jQuery.swc</path-element>
+ <path-element>libs/Language.swc</path-element>
+ <path-element>libs/MaterialDesignLite.swc</path-element>
+ <path-element>libs/Mobile.swc</path-element>
+ <path-element>libs/Network.swc</path-element>
+ <path-element>libs/Reflection.swc</path-element>
+ <path-element>libs/RoyaleSite.swc</path-element>
+ <path-element>libs/RoyaleUnit.swc</path-element>
+ <path-element>libs/RoyaleUnitUI.swc</path-element>
+ <path-element>libs/Storage.swc</path-element>
+ <path-element>libs/TLF.swc</path-element>
+ <path-element>libs/Text.swc</path-element>
+ <path-element>libs/XML.swc</path-element>
</library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
- <path-element>js/libs</path-element>
+ <path-element>js/libs/AceJS.swc</path-element>
+ <path-element>js/libs/BasicJS.swc</path-element>
+ <path-element>js/libs/BindingJS.swc</path-element>
+ <path-element>js/libs/ChartsJS.swc</path-element>
+ <path-element>js/libs/CollectionsJS.swc</path-element>
+ <path-element>js/libs/CoreJS.swc</path-element>
+ <path-element>js/libs/CreateJSJS.swc</path-element>
+ <path-element>js/libs/DragDropJS.swc</path-element>
+ <path-element>js/libs/EffectsJS.swc</path-element>
+ <path-element>js/libs/ExpressJS.swc</path-element>
+ <path-element>js/libs/FlatJS.swc</path-element>
+ <path-element>js/libs/FontAwesomeJS.swc</path-element>
+ <path-element>js/libs/FormattersJS.swc</path-element>
+ <path-element>js/libs/GoogleMapsJS.swc</path-element>
+ <path-element>js/libs/GraphicsJS.swc</path-element>
+ <path-element>js/libs/HTMLJS.swc</path-element>
+ <path-element>js/libs/HTML5JS.swc</path-element>
+ <path-element>js/libs/IconsJS.swc</path-element>
+ <path-element>js/libs/JewelJS.swc</path-element>
+ <path-element>js/libs/CruxJS.swc</path-element>
+ <path-element>js/libs/jQueryJS.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
+ <path-element>js/libs/MaterialDesignLiteJS.swc</path-element>
+ <path-element>js/libs/MobileJS.swc</path-element>
+ <path-element>js/libs/NetworkJS.swc</path-element>
+ <path-element>js/libs/ReflectionJS.swc</path-element>
+ <path-element>js/libs/RoyaleSiteJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitJS.swc</path-element>
+ <path-element>js/libs/RoyaleUnitUIJS.swc</path-element>
+ <path-element>js/libs/StorageJS.swc</path-element>
+ <path-element>js/libs/TLFJS.swc</path-element>
+ <path-element>js/libs/TextJS.swc</path-element>
+ <path-element>js/libs/XMLJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
@@ -224,18 +288,6 @@
<uri>library://ns.apache.org/royale/fa</uri>
<manifest>manifests/fa-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
diff --git
a/distribution/src/main/resources/frameworks/jquery-config-template.xml
b/distribution/src/main/resources/frameworks/ace-config-template.xml
similarity index 99%
copy from distribution/src/main/resources/frameworks/jquery-config-template.xml
copy to distribution/src/main/resources/frameworks/ace-config-template.xml
index eaae3bf..2503a1d 100644
--- a/distribution/src/main/resources/frameworks/jquery-config-template.xml
+++ b/distribution/src/main/resources/frameworks/ace-config-template.xml
@@ -59,7 +59,7 @@
<external-library-path>
<path-element>../js/libs/royale-typedefs-js.swc</path-element>
<path-element>../js/libs/royale-typedefs-gcl.swc</path-element>
- <path-element>../js/libs/royale-typedefs-jquery.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-ace.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are
generated by -->
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git
a/distribution/src/main/resources/frameworks/jquery-config-template.xml
b/distribution/src/main/resources/frameworks/ace-config.xml
similarity index 98%
copy from distribution/src/main/resources/frameworks/jquery-config-template.xml
copy to distribution/src/main/resources/frameworks/ace-config.xml
index eaae3bf..58bf3ca 100644
--- a/distribution/src/main/resources/frameworks/jquery-config-template.xml
+++ b/distribution/src/main/resources/frameworks/ace-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>@playerversion@</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>@swfversion@</swf-version>
+ <swf-version>20</swf-version>
<compiler>
<!-- build both SWF and JS. -->
@@ -59,7 +59,7 @@
<external-library-path>
<path-element>../js/libs/royale-typedefs-js.swc</path-element>
<path-element>../js/libs/royale-typedefs-gcl.swc</path-element>
- <path-element>../js/libs/royale-typedefs-jquery.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-ace.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are
generated by -->
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git a/distribution/src/main/resources/frameworks/air-config-template.xml
b/distribution/src/main/resources/frameworks/air-config-template.xml
index 8f739af..db39351 100644
--- a/distribution/src/main/resources/frameworks/air-config-template.xml
+++ b/distribution/src/main/resources/frameworks/air-config-template.xml
@@ -68,9 +68,9 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
- <swf-external-library-path>
+ <external-library-path>
<path-element>{airHome}/frameworks/libs/air/airglobal.swc</path-element>
- </swf-external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
@@ -92,10 +92,10 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
<path-element>{airHome}/frameworks/libs/air</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -125,8 +125,7 @@
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
-
- <namespaces>
+ <namespaces>
<!-- Specify a URI to associate with a manifest of components for use as
MXML -->
<!-- elements.
-->
<namespace>
@@ -149,94 +148,66 @@
<uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-collections.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-core.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-dragdrop.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-effects.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-formatters.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/svg</uri>
- <manifest>manifests/svg-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>manifests/basic-manifest-graphics.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-html.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/html</uri>
<manifest>manifests/html-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-mobile.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-network.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/html5</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/html5</uri>
<manifest>manifests/html5-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/flat</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/flat</uri>
<manifest>manifests/flat-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jquery</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/jquery</uri>
<manifest>manifests/jquery-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/google</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/google</uri>
<manifest>manifests/google-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/cordova</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/cordova</uri>
<manifest>manifests/cordova-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/createjs</uri>
- <manifest>manifests/createjs-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/mdl</uri>
- <manifest>manifests/mdl-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/express</uri>
- <manifest>manifests/express-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/fa</uri>
- <manifest>manifests/fa-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/createjs</uri>
+ <manifest>manifests/createjs-manifest.xml</manifest>
+ </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
@@ -285,6 +256,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<!-- not set -->
<theme>
+ <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
diff --git a/distribution/src/main/resources/frameworks/air-config.xml
b/distribution/src/main/resources/frameworks/air-config.xml
index edb3506..e3b926c 100644
--- a/distribution/src/main/resources/frameworks/air-config.xml
+++ b/distribution/src/main/resources/frameworks/air-config.xml
@@ -21,10 +21,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${air.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
@@ -68,9 +68,9 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
- <swf-external-library-path>
+ <external-library-path>
<path-element>libs/air/airglobal.swc</path-element>
- </swf-external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
@@ -92,10 +92,10 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
- <path-element>libs/air</path-element>
- </swf-library-path>
+ <path-element>{airHome}/frameworks/libs/air</path-element>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -125,8 +125,7 @@
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
-
- <namespaces>
+ <namespaces>
<!-- Specify a URI to associate with a manifest of components for use as
MXML -->
<!-- elements.
-->
<namespace>
@@ -149,94 +148,62 @@
<uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-collections.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-core.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-dragdrop.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-effects.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-formatters.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/svg</uri>
- <manifest>manifests/svg-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-html.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/html</uri>
- <manifest>manifests/html-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>manifests/basic-manifest-graphics.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>manifests/basic-manifest-html.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-mobile.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-network.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/html5</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/html5</uri>
<manifest>manifests/html5-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/flat</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/flat</uri>
<manifest>manifests/flat-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jquery</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/jquery</uri>
<manifest>manifests/jquery-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/google</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/google</uri>
<manifest>manifests/google-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/cordova</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/cordova</uri>
<manifest>manifests/cordova-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/createjs</uri>
- <manifest>manifests/createjs-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/mdl</uri>
- <manifest>manifests/mdl-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/express</uri>
- <manifest>manifests/express-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/fa</uri>
- <manifest>manifests/fa-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/createjs</uri>
+ <manifest>manifests/createjs-manifest.xml</manifest>
+ </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
@@ -285,6 +252,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<!-- not set -->
<theme>
+ <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
diff --git a/distribution/src/main/resources/frameworks/airmobile-config.xml
b/distribution/src/main/resources/frameworks/airmobile-config.xml
index e9727f8..73dfdba 100644
--- a/distribution/src/main/resources/frameworks/airmobile-config.xml
+++ b/distribution/src/main/resources/frameworks/airmobile-config.xml
@@ -21,10 +21,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${air.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
@@ -52,9 +52,9 @@
<path-element>string</path-element>
</source-path>
-->
-
- <!-- Allow the source-path to have path-elements which contain other
path-elements -->
- <allow-source-path-overlap>false</allow-source-path-overlap>
+
+ <!-- Allow the source-path to have path-elements which contain other
path-elements -->
+ <allow-source-path-overlap>false</allow-source-path-overlap>
<!-- Run the AS3 compiler in a mode that detects legal but potentially
incorrect -->
<!-- code.
-->
@@ -68,9 +68,9 @@
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
- <swf-external-library-path>
+ <external-library-path>
<path-element>{airHome}/frameworks/libs/air/airglobal.swc</path-element>
- </swf-external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit
from -->
<!-- linking.
-->
@@ -92,10 +92,10 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
<path-element>{airHome}/frameworks/libs/air</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -125,7 +125,7 @@
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
- <namespaces>
+ <namespaces>
<!-- Specify a URI to associate with a manifest of components for use as
MXML -->
<!-- elements.
-->
<namespace>
@@ -148,94 +148,62 @@
<uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-collections.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-core.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-dragdrop.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-effects.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-formatters.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/svg</uri>
- <manifest>manifests/svg-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-html.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/html</uri>
- <manifest>manifests/html-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>manifests/basic-manifest-graphics.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>manifests/basic-manifest-html.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-mobile.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
<manifest>manifests/basic-manifest-network.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/html5</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/html5</uri>
<manifest>manifests/html5-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/flat</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/flat</uri>
<manifest>manifests/flat-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jquery</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/jquery</uri>
<manifest>manifests/jquery-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/google</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/google</uri>
<manifest>manifests/google-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/cordova</uri>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/cordova</uri>
<manifest>manifests/cordova-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/createjs</uri>
- <manifest>manifests/createjs-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/mdl</uri>
- <manifest>manifests/mdl-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/express</uri>
- <manifest>manifests/express-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/fa</uri>
- <manifest>manifests/fa-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/createjs</uri>
+ <manifest>manifests/createjs-manifest.xml</manifest>
+ </namespace>
</namespaces>
<!-- Enable post-link SWF optimization. -->
@@ -284,6 +252,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<!-- not set -->
<theme>
+ <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
diff --git
a/distribution/src/main/resources-with-swf/frameworks/royale-config.xml
b/distribution/src/main/resources/frameworks/asdoc-config.xml
similarity index 60%
copy from distribution/src/main/resources-with-swf/frameworks/royale-config.xml
copy to distribution/src/main/resources/frameworks/asdoc-config.xml
index 78c3109..fad032b 100644
--- a/distribution/src/main/resources-with-swf/frameworks/royale-config.xml
+++ b/distribution/src/main/resources/frameworks/asdoc-config.xml
@@ -22,22 +22,20 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.1</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>14</swf-version>
<compiler>
- <!-- build both SWF and JS. -->
- <targets>
- <target>SWF</target>
- <target>JSRoyale</target>
- </targets>
-
- <define><name>COMPILE::SWF</name><value>AUTO</value></define>
- <define><name>COMPILE::JS</name><value>AUTO</value></define>
-
+ <define><name>COMPILE::SWF</name><value>true</value></define>
+ <define><name>COMPILE::JS</name><value>false</value></define>
+ <define><name>CONFIG::debug</name><value>false</value></define>
+ <define><name>CONFIG::release</name><value>true</value></define>
+ <define><name>CONFIG::LOGGING</name><value>false</value></define>
+
<define><name>CONFIG::performanceInstrumentation</name><value>false</value></define>
+
<!-- Turn on generation of accessible SWFs. -->
<accessible>true</accessible>
@@ -53,6 +51,25 @@
<path-element>string</path-element>
</source-path>
-->
+ <source-path>
+
<path-element>${frameworks_dir}/projects/Binding/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Charts/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Collections/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Core/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/CreateJS/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/DragDrop/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Effects/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Formatters/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Graphics/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/HTML5/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/JQuery/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Language/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Mobile/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Network/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Reflection/src/main/royale</path-element>
+ </source-path>
<!-- Allow the source-path to have path-elements which contain other
path-elements -->
<allow-source-path-overlap>false</allow-source-path-overlap>
@@ -67,19 +84,6 @@
<debug>true</debug>
-->
- <!-- List of SWC files or directories to compile against but to omit
from -->
- <!-- linking.
-->
- <external-library-path>
-
<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/royale-typedefs-js.swc</path-element>
- <path-element>../js/libs/royale-typedefs-gcl.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 Royale applications.
-->
@@ -94,151 +98,78 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs</path-element>
+ <path-element>${royalelib}/libs/core.swc</path-element>
+ <path-element>${royalelib}/libs/framework.swc</path-element>
<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/libs</path-element>
- </js-library-path>
-
- <allow-subclass-overrides>true</allow-subclass-overrides>
- <mxml>
- <children-as-data>true</children-as-data>
- <imports>
- <implicit-import>org.apache.royale.events.*</implicit-import>
- <implicit-import>org.apache.royale.geom.*</implicit-import>
-
<implicit-import>org.apache.royale.core.ClassFactory</implicit-import>
-
<implicit-import>org.apache.royale.core.IFactory</implicit-import>
- </imports>
- </mxml>
-
<binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
-
<binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
-
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
-
<binding-event-handler-event>org.apache.royale.events.Event</binding-event-handler-event>
-
<binding-event-handler-class>org.apache.royale.events.EventDispatcher</binding-event-handler-class>
-
<binding-event-handler-interface>org.apache.royale.events.IEventDispatcher</binding-event-handler-interface>
- <states-class>org.apache.royale.states.State</states-class>
-
<states-instance-override-class>org.apache.royale.states.AddItems</states-instance-override-class>
-
<states-property-override-class>org.apache.royale.states.SetProperty</states-property-override-class>
-
<states-event-override-class>org.apache.royale.states.SetEventHandler</states-event-override-class>
-
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
-
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
- <fxg-base-class>flash.display.Sprite</fxg-base-class>
-
- <namespaces>
- <!-- Specify a URI to associate with a manifest of components for use as
MXML -->
- <!-- elements.
-->
- <namespace>
- <uri>http://ns.adobe.com/mxml/2009</uri>
- <manifest>mxml-2009-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-binding.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-basic.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-charts.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-collections.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-core.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-dragdrop.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-effects.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-formatters.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/svg</uri>
- <manifest>manifests/svg-manifest-graphics.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-html.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/html</uri>
- <manifest>manifests/html-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-mobile.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/basic</uri>
- <manifest>manifests/basic-manifest-network.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/html5</uri>
- <manifest>manifests/html5-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/flat</uri>
- <manifest>manifests/flat-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jquery</uri>
- <manifest>manifests/jquery-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/google</uri>
- <manifest>manifests/google-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/cordova</uri>
- <manifest>manifests/cordova-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/createjs</uri>
- <manifest>manifests/createjs-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/mdl</uri>
- <manifest>manifests/mdl-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/express</uri>
- <manifest>manifests/express-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/fa</uri>
- <manifest>manifests/fa-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/jewel</uri>
- <manifest>manifests/jewel-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/crux</uri>
- <manifest>manifests/crux-manifest.xml</manifest>
- </namespace>
- <namespace>
- <uri>library://ns.apache.org/royale/icons</uri>
- <manifest>manifests/icons-manifest.xml</manifest>
- </namespace>
- </namespaces>
+ <!-- namespace declaration for asdoc -->
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Binding/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Charts/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Collections/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Core/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/createjs</uri>
+
<manifest>${frameworks_dir}/projects/CreateJS/src/main/resources/createjs-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/DragDrop/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Effects/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Formatters/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/google</uri>
+
<manifest>${frameworks_dir}/projects/GoogleMaps/src/main/resources/google-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Graphics/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Basic/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/html5</uri>
+
<manifest>${frameworks_dir}/projects/HTML5/src/main/resources/html5-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/jquery</uri>
+
<manifest>${frameworks_dir}/projects/JQuery/src/main/resources/jquery-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Mobile/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+
<manifest>${frameworks_dir}/projects/Network/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/html</uri>
+
<manifest>${frameworks_dir}/projects/HTML/src/main/resources/html-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
<!-- Enable post-link SWF optimization. -->
<optimize>true</optimize>
@@ -261,7 +192,6 @@
<name>ChangeEvent</name>
<name>NonCommittingChangeEvent</name>
<name>Transient</name>
- <name>Mixin</name>
</keep-as3-metadata>
-->
@@ -288,7 +218,6 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<theme>
- <filename>themes/Basic/src/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors.
-->
@@ -493,4 +422,58 @@
<language>EN</language>
</metadata>
+ <exclude-classes>
+ <class>org.apache.royale.utils.Language</class>
+ <class>org.apache.royale.utils.URLUtils</class>
+ <class>org.apache.royale.core.IRoyaleElement</class>
+ <class>org.apache.royale.core.WrappedHTMLElement</class>
+ <class>org.apache.royale.events.BrowserEvent</class>
+ <class>org.apache.royale.html.beads.CSSTextButtonView</class>
+ <class>org.apache.royale.maps.google.beads.MapView_original</class>
+ <class>org.apache.royale.events.utils.EventUtils</class>
+ <class>org.apache.royale.utils.ObjectMap</class>
+ </exclude-classes>
+
+ <exclude-sources>
+
<path-element>${frameworks_dir}/projects/Language/src/main/royale/org/apache.royale/utils/Language.as</path-element>
+
<path-element>${frameworks_dir}/projects/Core/src/main/royale/org/apache.royale/utils/URLUtils.as</path-element>
+
<path-element>${frameworks_dir}/projects/Core/src/main/royale/org/apache.royale/core/WrappedHTMLElement.as</path-element>
+
<path-element>${frameworks_dir}/projects/Core/src/main/royale/org/apache.royale/events/BrowserEvent.as</path-element>
+
<path-element>${frameworks_dir}/projects/Core/src/main/royale/org/apache.royale/events/utils/EventUtils.as</path-element>
+
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/royale/org/apache.royale/maps/google/beads/MapView_original.as</path-element>
+
<path-element>${frameworks_dir}/projects/Core/src/main/royale/org/apache.royale/utils/ObjectMap.as</path-element>
+ </exclude-sources>
+
+ <!-- source path for asdoc -->
+
+ <!-- namespaces to include in asdoc -->
+ <doc-namespaces>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <uri>library://ns.apache.org/royale/createjs</uri>
+ <uri>library://ns.apache.org/royale/google</uri>
+ <uri>library://ns.apache.org/royale/html5</uri>
+ <uri>library://ns.apache.org/royale/jquery</uri>
+ </doc-namespaces>
+
+ <!-- classes to include in asdoc -->
+ <doc-sources>
+
<path-element>${frameworks_dir}/projects/Binding/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Charts/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Collections/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Core/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/CreateJS/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/DragDrop/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Effects/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Formatters/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/royale/org</path-element>
+
<path-element>${frameworks_dir}/projects/Graphics/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Basic/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/HTML5/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/JQuery/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Mobile/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Network/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/Reflection/src/main/royale</path-element>
+
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/royale/google/maps/LatLng.as</path-element>
+ </doc-sources>
+
</royale-config>
diff --git
a/distribution/src/main/resources/frameworks/createjs-config-template.xml
b/distribution/src/main/resources/frameworks/createjs-config-template.xml
index 3dca59c..cb179d5 100644
--- a/distribution/src/main/resources/frameworks/createjs-config-template.xml
+++ b/distribution/src/main/resources/frameworks/createjs-config-template.xml
@@ -77,7 +77,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git a/distribution/src/main/resources/frameworks/createjs-config.xml
b/distribution/src/main/resources/frameworks/createjs-config.xml
index 128a572..af6ff80 100644
--- a/distribution/src/main/resources/frameworks/createjs-config.xml
+++ b/distribution/src/main/resources/frameworks/createjs-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
@@ -77,7 +77,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git
a/distribution/src/main/resources/frameworks/jquery-config-template.xml
b/distribution/src/main/resources/frameworks/jquery-config-template.xml
index eaae3bf..e26ec29 100644
--- a/distribution/src/main/resources/frameworks/jquery-config-template.xml
+++ b/distribution/src/main/resources/frameworks/jquery-config-template.xml
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git a/distribution/src/main/resources/frameworks/jquery-config.xml
b/distribution/src/main/resources/frameworks/jquery-config.xml
index a8f5673..0d7c571 100644
--- a/distribution/src/main/resources/frameworks/jquery-config.xml
+++ b/distribution/src/main/resources/frameworks/jquery-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
<!-- build both SWF and JS. -->
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git a/distribution/src/main/resources/frameworks/js-config-template.xml
b/distribution/src/main/resources/frameworks/js-config-template.xml
index 26aa09c..375ed2e 100644
--- a/distribution/src/main/resources/frameworks/js-config-template.xml
+++ b/distribution/src/main/resources/frameworks/js-config-template.xml
@@ -75,7 +75,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<mxml>
diff --git a/distribution/src/main/resources/frameworks/js-config.xml
b/distribution/src/main/resources/frameworks/js-config.xml
index 349823f..e952c3b 100644
--- a/distribution/src/main/resources/frameworks/js-config.xml
+++ b/distribution/src/main/resources/frameworks/js-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
<!-- build both SWF and JS. -->
@@ -75,7 +75,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<mxml>
diff --git a/distribution/src/main/resources/frameworks/mxml-manifest.xml
b/distribution/src/main/resources/frameworks/mxml-manifest.xml
index 4c75e91..5dd6cdd 100644
--- a/distribution/src/main/resources/frameworks/mxml-manifest.xml
+++ b/distribution/src/main/resources/frameworks/mxml-manifest.xml
@@ -1,21 +1,21 @@
<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<componentPackage>
-</componentPackage>
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+ <componentPackage>
+ </componentPackage>
diff --git
a/distribution/src/main/resources/frameworks/node-config-template.xml
b/distribution/src/main/resources/frameworks/node-config-template.xml
index 2361640..5b89c4d 100644
--- a/distribution/src/main/resources/frameworks/node-config-template.xml
+++ b/distribution/src/main/resources/frameworks/node-config-template.xml
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<mxml>
diff --git a/distribution/src/main/resources/frameworks/node-config.xml
b/distribution/src/main/resources/frameworks/node-config.xml
index 97b1cdb..25928b7 100644
--- a/distribution/src/main/resources/frameworks/node-config.xml
+++ b/distribution/src/main/resources/frameworks/node-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>${flash.version}</target-player>
+ <target-player>11.7</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>${swf.version}</swf-version>
+ <swf-version>20</swf-version>
<compiler>
<!-- build both SWF and JS. -->
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
</library-path>
<mxml>
diff --git a/distribution/src/main/resources/frameworks/spark-manifest.xml
b/distribution/src/main/resources/frameworks/spark-manifest.xml
index 4c75e91..5dd6cdd 100644
--- a/distribution/src/main/resources/frameworks/spark-manifest.xml
+++ b/distribution/src/main/resources/frameworks/spark-manifest.xml
@@ -1,21 +1,21 @@
<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<componentPackage>
-</componentPackage>
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+ <componentPackage>
+ </componentPackage>
diff --git a/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
b/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
index 70633a7..7121cae 100644
--- a/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
+++ b/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
@@ -2,11 +2,11 @@
"config": "royale",
"compilerOptions": {
"debug": true,
- "targets": ["JSRoyale"],
+ "targets": ["JSRoyale","JSRoyale"],
// "theme":
"${royalelib}/themes/JewelTheme/src/main/resources/styles.css",
"source-map": true,
"library-path": [
- "${royalelib}/js/libs/MXRoyaleJS.swc"
+ "${royalelib}/libs/MXRoyale.swc"
],
"js-library-path": [
"${royalelib}/js/libs/MXRoyaleJS.swc"
