You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/09/09 08:45:51 UTC
[royale-asjs] 01/01: maven distribution changes in config xml
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/maven-distribution
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 5313e081379caa4a20761435956673bd52be04b6
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Sep 9 10:45:45 2018 +0200
maven distribution changes in config xml
---
.../main/resources/frameworks/air-config-template.xml | 12 ++++++++----
.../src/main/resources/frameworks/air-config.xml | 14 +++++++++-----
.../main/resources/frameworks/flex-config-template.xml | 12 ++++++++----
.../src/main/resources/frameworks/flex-config.xml | 16 ++++++++++------
.../main/resources/frameworks/royale-config-template.xml | 2 +-
.../src/main/resources/frameworks/royale-config.xml | 2 +-
6 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/distribution/src/main/resources/frameworks/air-config-template.xml b/distribution/src/main/resources/frameworks/air-config-template.xml
index 2b05f62..81f4840 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. -->
@@ -91,10 +91,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>
@@ -128,6 +128,10 @@
<!-- 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>
diff --git a/distribution/src/main/resources/frameworks/air-config.xml b/distribution/src/main/resources/frameworks/air-config.xml
index 2613cc1..6374ce2 100644
--- a/distribution/src/main/resources/frameworks/air-config.xml
+++ b/distribution/src/main/resources/frameworks/air-config.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>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. -->
@@ -91,10 +91,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>
@@ -128,6 +128,10 @@
<!-- 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>
diff --git a/distribution/src/main/resources/frameworks/flex-config-template.xml b/distribution/src/main/resources/frameworks/flex-config-template.xml
index 259168c..23543e7 100644
--- a/distribution/src/main/resources/frameworks/flex-config-template.xml
+++ b/distribution/src/main/resources/frameworks/flex-config-template.xml
@@ -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. -->
@@ -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>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -129,6 +129,10 @@
<!-- 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>
diff --git a/distribution/src/main/resources/frameworks/flex-config.xml b/distribution/src/main/resources/frameworks/flex-config.xml
index 6943322..d636ca5 100644
--- a/distribution/src/main/resources/frameworks/flex-config.xml
+++ b/distribution/src/main/resources/frameworks/flex-config.xml
@@ -69,9 +69,9 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
- <swf-external-library-path>
- <path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
- </swf-external-library-path>
+ <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. -->
@@ -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/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
- </swf-library-path>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
@@ -129,6 +129,10 @@
<!-- 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>
diff --git a/distribution/src/main/resources/frameworks/royale-config-template.xml b/distribution/src/main/resources/frameworks/royale-config-template.xml
index 59f5aef..b59f854 100644
--- a/distribution/src/main/resources/frameworks/royale-config-template.xml
+++ b/distribution/src/main/resources/frameworks/royale-config-template.xml
@@ -76,7 +76,7 @@
<!-- 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>
</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/royale-config.xml b/distribution/src/main/resources/frameworks/royale-config.xml
index 3826d7d..37a2f45 100644
--- a/distribution/src/main/resources/frameworks/royale-config.xml
+++ b/distribution/src/main/resources/frameworks/royale-config.xml
@@ -76,7 +76,7 @@
<!-- 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>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->