You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2019/07/16 16:04:23 UTC
[royale-asjs] branch develop updated: fixes for config files in
Maven distribution
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 85333c6 fixes for config files in Maven distribution
85333c6 is described below
commit 85333c6f6d0a98e1b0a1ff984e81255a6947942b
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Tue Jul 16 09:04:16 2019 -0700
fixes for config files in Maven distribution
---
distribution/src/main/assembly/component.xml | 5 +
.../resources/frameworks/air-config-template.xml | 188 ++++++++-------------
.../src/main/resources/frameworks/air-config.xml | 188 ++++++++-------------
.../main/resources/frameworks/airmobile-config.xml | 187 ++++++++------------
.../frameworks/createjs-config-template.xml | 3 +-
.../main/resources/frameworks/createjs-config.xml | 3 +-
.../resources/frameworks/flex-config-template.xml | 68 +-------
.../src/main/resources/frameworks/flex-config.xml | 1 +
.../frameworks/jquery-config-template.xml | 4 +-
.../main/resources/frameworks/jquery-config.xml | 4 +-
.../resources/frameworks/js-config-template.xml | 4 +-
.../src/main/resources/frameworks/js-config.xml | 4 +-
.../resources/frameworks/node-config-template.xml | 4 +-
.../src/main/resources/frameworks/node-config.xml | 4 +-
.../frameworks/royale-config-template.xml | 111 +++---------
.../main/resources/frameworks/royale-config.xml | 111 +++---------
16 files changed, 295 insertions(+), 594 deletions(-)
diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml
index ada42c3..21c9fe6 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -285,6 +285,11 @@ under the License.
<destName>basic-manifest-html.xml</destName>
</file>
<file>
+ <source>../frameworks/projects/HTML/src/main/resources/html-manifest.xml</source>
+ <outputDirectory>frameworks/manifests</outputDirectory>
+ <destName>html-manifest.xml</destName>
+ </file>
+ <file>
<source>../frameworks/projects/HTML5/src/main/resources/html5-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
<destName>html5-manifest.xml</destName>
diff --git a/distribution/src/main/resources/frameworks/air-config-template.xml b/distribution/src/main/resources/frameworks/air-config-template.xml
index 2b05f62..fa0d1a5 100644
--- a/distribution/src/main/resources/frameworks/air-config-template.xml
+++ b/distribution/src/main/resources/frameworks/air-config-template.xml
@@ -76,6 +76,7 @@
<!-- linking. -->
<js-external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -124,158 +125,113 @@
<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>
+ <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/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>
-
- <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>
+ <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/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/icons</uri>
-
<manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>
diff --git a/distribution/src/main/resources/frameworks/air-config.xml b/distribution/src/main/resources/frameworks/air-config.xml
index 2613cc1..a80e87c 100644
--- a/distribution/src/main/resources/frameworks/air-config.xml
+++ b/distribution/src/main/resources/frameworks/air-config.xml
@@ -76,6 +76,7 @@
<!-- linking. -->
<js-external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -124,158 +125,113 @@
<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>
+ <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/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>
-
- <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>
+ <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/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/icons</uri>
-
<manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>
diff --git a/distribution/src/main/resources/frameworks/airmobile-config.xml b/distribution/src/main/resources/frameworks/airmobile-config.xml
index c95a8a5..ca7b850 100644
--- a/distribution/src/main/resources/frameworks/airmobile-config.xml
+++ b/distribution/src/main/resources/frameworks/airmobile-config.xml
@@ -76,6 +76,7 @@
<!-- linking. -->
<js-external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -124,158 +125,112 @@
<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>
+ <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/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>
-
- <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>
+ <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/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/icons</uri>
-
<manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>
diff --git a/distribution/src/main/resources/frameworks/createjs-config-template.xml b/distribution/src/main/resources/frameworks/createjs-config-template.xml
index 378750c..280dc7c 100644
--- a/distribution/src/main/resources/frameworks/createjs-config-template.xml
+++ b/distribution/src/main/resources/frameworks/createjs-config-template.xml
@@ -59,6 +59,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
<path-element>../js/libs/royale-typedefs-createjs-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
@@ -76,7 +77,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.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 dbe95f2..2385fd4 100644
--- a/distribution/src/main/resources/frameworks/createjs-config.xml
+++ b/distribution/src/main/resources/frameworks/createjs-config.xml
@@ -59,6 +59,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
<path-element>../js/libs/royale-typedefs-createjs-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
@@ -76,7 +77,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git a/distribution/src/main/resources/frameworks/flex-config-template.xml b/distribution/src/main/resources/frameworks/flex-config-template.xml
index 259168c..b699e45 100644
--- a/distribution/src/main/resources/frameworks/flex-config-template.xml
+++ b/distribution/src/main/resources/frameworks/flex-config-template.xml
@@ -77,6 +77,7 @@
<!-- linking. -->
<js-external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -125,170 +126,117 @@
<component-factory-class>org.apache.royale.core.ClassFactory</component-factory-class>
<component-factory-interface>org.apache.royale.core.IFactory</component-factory-interface>
+
<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/icons</uri>
-
<manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>
diff --git a/distribution/src/main/resources/frameworks/flex-config.xml b/distribution/src/main/resources/frameworks/flex-config.xml
index 6943322..4df432b 100644
--- a/distribution/src/main/resources/frameworks/flex-config.xml
+++ b/distribution/src/main/resources/frameworks/flex-config.xml
@@ -77,6 +77,7 @@
<!-- linking. -->
<js-external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
diff --git a/distribution/src/main/resources/frameworks/jquery-config-template.xml b/distribution/src/main/resources/frameworks/jquery-config-template.xml
index 08bf62b..39a2337 100644
--- a/distribution/src/main/resources/frameworks/jquery-config-template.xml
+++ b/distribution/src/main/resources/frameworks/jquery-config-template.xml
@@ -58,6 +58,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
<path-element>../js/libs/royale-typedefs-jquery-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
@@ -75,8 +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/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.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 53e8932..f4ebaa9 100644
--- a/distribution/src/main/resources/frameworks/jquery-config.xml
+++ b/distribution/src/main/resources/frameworks/jquery-config.xml
@@ -58,6 +58,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
<path-element>../js/libs/royale-typedefs-jquery-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
@@ -75,8 +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/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.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 222bb66..3e7190d 100644
--- a/distribution/src/main/resources/frameworks/js-config-template.xml
+++ b/distribution/src/main/resources/frameworks/js-config-template.xml
@@ -58,6 +58,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -74,8 +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/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.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 8d198cc..576f6a3 100644
--- a/distribution/src/main/resources/frameworks/js-config.xml
+++ b/distribution/src/main/resources/frameworks/js-config.xml
@@ -58,6 +58,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -74,8 +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/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
</library-path>
<mxml>
diff --git a/distribution/src/main/resources/frameworks/node-config-template.xml b/distribution/src/main/resources/frameworks/node-config-template.xml
index e3f7dfd..9bf0046 100644
--- a/distribution/src/main/resources/frameworks/node-config-template.xml
+++ b/distribution/src/main/resources/frameworks/node-config-template.xml
@@ -58,6 +58,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
<path-element>../js/libs/royale-typedefs-node-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
@@ -75,8 +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/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.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 cfde4d4..bcdc386 100644
--- a/distribution/src/main/resources/frameworks/node-config.xml
+++ b/distribution/src/main/resources/frameworks/node-config.xml
@@ -58,6 +58,7 @@
<!-- linking. -->
<external-library-path>
<path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
<path-element>../js/libs/royale-typedefs-node-${royale.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
@@ -75,8 +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/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
</library-path>
<mxml>
diff --git a/distribution/src/main/resources/frameworks/royale-config-template.xml b/distribution/src/main/resources/frameworks/royale-config-template.xml
index 59f5aef..eb30223 100644
--- a/distribution/src/main/resources/frameworks/royale-config-template.xml
+++ b/distribution/src/main/resources/frameworks/royale-config-template.xml
@@ -76,7 +76,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<js-external-library-path>
- <path-element>../js/libs/js.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -135,165 +136,103 @@
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Binding/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-binding.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Basic/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-basic.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Charts/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-charts.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Collections/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-collections.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Core/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-core.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/DragDrop/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-dragdrop.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Effects/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-effects.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Formatters/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-formatters.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Graphics/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-graphics.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/svg</uri>
-
- <manifest>projects/Graphics/src/main/resources/svg-manifest.xml</manifest>
-
+ <manifest>manifests/svg-manifest-graphics.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/HTML/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-html.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/html</uri>
-
- <manifest>projects/HTML/src/main/resources/html-manifest.xml</manifest>
-
+ <manifest>manifests/html-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Mobile/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-mobile.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Network/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-network.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/html5</uri>
-
- <manifest>projects/HTML5/src/main/resources/html5-manifest.xml</manifest>
-
+ <manifest>manifests/html5-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/flat</uri>
-
- <manifest>projects/Flat/src/main/resources/flat-manifest.xml</manifest>
-
+ <manifest>manifests/flat-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/jquery</uri>
-
- <manifest>projects/JQuery/src/main/resources/jquery-manifest.xml</manifest>
-
+ <manifest>manifests/jquery-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/google</uri>
-
- <manifest>projects/GoogleMaps/src/main/resources/google-manifest.xml</manifest>
-
+ <manifest>manifests/google-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/cordova</uri>
-
- <manifest>projects/Mobile/src/main/resources/cordova-manifest.xml</manifest>
-
+ <manifest>manifests/cordova-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/createjs</uri>
-
- <manifest>projects/CreateJS/src/main/resources/createjs-manifest.xml</manifest>
-
+ <manifest>manifests/createjs-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/mdl</uri>
-
- <manifest>projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml</manifest>
-
+ <manifest>manifests/mdl-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/express</uri>
-
- <manifest>projects/Express/src/main/resources/express-manifest.xml</manifest>
-
+ <manifest>manifests/express-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/fa</uri>
-
- <manifest>projects/FontAwesome/src/main/resources/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>
-
+ <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/icons</uri>
-
<manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>
diff --git a/distribution/src/main/resources/frameworks/royale-config.xml b/distribution/src/main/resources/frameworks/royale-config.xml
index 3826d7d..a5d2975 100644
--- a/distribution/src/main/resources/frameworks/royale-config.xml
+++ b/distribution/src/main/resources/frameworks/royale-config.xml
@@ -76,7 +76,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<js-external-library-path>
- <path-element>../js/libs/js.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-js-${royale.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/royale-typedefs-gcl-${royale.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -135,165 +136,103 @@
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Binding/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-binding.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Basic/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-basic.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Charts/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-charts.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Collections/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-collections.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Core/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-core.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/DragDrop/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-dragdrop.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Effects/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-effects.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Formatters/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-formatters.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Graphics/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-graphics.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/svg</uri>
-
- <manifest>projects/Graphics/src/main/resources/svg-manifest.xml</manifest>
-
+ <manifest>manifests/svg-manifest-graphics.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/HTML/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-html.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/html</uri>
-
- <manifest>projects/HTML/src/main/resources/html-manifest.xml</manifest>
-
+ <manifest>manifests/html-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Mobile/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-mobile.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/basic</uri>
-
- <manifest>projects/Network/src/main/resources/basic-manifest.xml</manifest>
-
+ <manifest>manifests/basic-manifest-network.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/html5</uri>
-
- <manifest>projects/HTML5/src/main/resources/html5-manifest.xml</manifest>
-
+ <manifest>manifests/html5-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/flat</uri>
-
- <manifest>projects/Flat/src/main/resources/flat-manifest.xml</manifest>
-
+ <manifest>manifests/flat-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/jquery</uri>
-
- <manifest>projects/JQuery/src/main/resources/jquery-manifest.xml</manifest>
-
+ <manifest>manifests/jquery-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/google</uri>
-
- <manifest>projects/GoogleMaps/src/main/resources/google-manifest.xml</manifest>
-
+ <manifest>manifests/google-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/cordova</uri>
-
- <manifest>projects/Mobile/src/main/resources/cordova-manifest.xml</manifest>
-
+ <manifest>manifests/cordova-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/createjs</uri>
-
- <manifest>projects/CreateJS/src/main/resources/createjs-manifest.xml</manifest>
-
+ <manifest>manifests/createjs-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/mdl</uri>
-
- <manifest>projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml</manifest>
-
+ <manifest>manifests/mdl-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/express</uri>
-
- <manifest>projects/Express/src/main/resources/express-manifest.xml</manifest>
-
+ <manifest>manifests/express-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/royale/fa</uri>
-
- <manifest>projects/FontAwesome/src/main/resources/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>
-
+ <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/icons</uri>
-
<manifest>manifests/icons-manifest.xml</manifest>
-
</namespace>
</namespaces>