This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 cc43bcc add crux to templates and release xml configurations since
that was missed
cc43bcc is described below
commit cc43bccf2c98f6f783521dd19bf73fbf82e51748
Author: Carlos Rovira <[email protected]>
AuthorDate: Tue Jul 23 23:08:11 2019 +0200
add crux to templates and release xml configurations since that was missed
---
ApproveRoyale.xml | 2 ++
distribution/pom.xml | 13 +++++++++++++
distribution/src/main/assembly/component.xml | 5 +++++
.../src/main/resources/frameworks/air-config-template.xml | 4 ++++
distribution/src/main/resources/frameworks/air-config.xml | 4 ++++
.../src/main/resources/frameworks/airmobile-config.xml | 4 ++++
.../src/main/resources/frameworks/flex-config-template.xml | 4 ++++
distribution/src/main/resources/frameworks/flex-config.xml | 6 ++++++
.../main/resources/frameworks/royale-config-template.xml | 4 ++++
.../src/main/resources/frameworks/royale-config.xml | 4 ++++
frameworks/projects/Crux/asconfig.json | 2 +-
frameworks/royale-config-template.xml | 2 ++
releasesteps.xml | 13 ++++++++++++-
13 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 22b2294..e893355 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -475,6 +475,7 @@
<exclude name="royale-asjs/frameworks/libs/HTML5.swc"/>
<exclude name="royale-asjs/frameworks/libs/Icons.swc"/>
<exclude name="royale-asjs/frameworks/libs/jQuery.swc"/>
+ <exclude name="royale-asjs/frameworks/libs/Crux.swc"/>
<exclude name="royale-asjs/frameworks/libs/Jewel.swc"/>
<exclude name="royale-asjs/frameworks/libs/JewelTheme.swc"/>
<exclude name="royale-asjs/frameworks/libs/Language.swc"/>
@@ -509,6 +510,7 @@
<exclude name="royale-asjs/frameworks/js/libs/HTML5JS.swc"/>
<exclude name="royale-asjs/frameworks/js/libs/IconsJS.swc"/>
<exclude name="royale-asjs/frameworks/js/libs/JewelJS.swc"/>
+ <exclude name="royale-asjs/frameworks/js/libs/CruxJS.swc"/>
<exclude name="royale-asjs/frameworks/js/libs/jQueryJS.swc"/>
<exclude name="royale-asjs/frameworks/js/libs/LanguageJS.swc"/>
<exclude
name="royale-asjs/frameworks/js/libs/MaterialDesignLiteJS.swc"/>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 84670f2..f868007 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -232,6 +232,12 @@
<version>0.9.6-SNAPSHOT</version>
<type>swc</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Crux</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
<!-- Add the framework js-swc modules -->
<dependency>
@@ -409,6 +415,13 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Crux</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
<!-- Add dependencies to the externs from the compiler module -->
<dependency>
diff --git a/distribution/src/main/assembly/component.xml
b/distribution/src/main/assembly/component.xml
index 21c9fe6..359c8b7 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -350,6 +350,11 @@ under the License.
<destName>jewel-manifest.xml</destName>
</file>
<file>
+
<source>../frameworks/projects/Crux/src/main/resources/crux-manifest.xml</source>
+ <outputDirectory>frameworks/manifests</outputDirectory>
+ <destName>crux-manifest.xml</destName>
+ </file>
+ <file>
<source>../frameworks/projects/Icons/src/main/resources/icons-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
<destName>icons-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 fa0d1a5..1100d36 100644
--- a/distribution/src/main/resources/frameworks/air-config-template.xml
+++ b/distribution/src/main/resources/frameworks/air-config-template.xml
@@ -230,6 +230,10 @@
<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>
diff --git a/distribution/src/main/resources/frameworks/air-config.xml
b/distribution/src/main/resources/frameworks/air-config.xml
index a80e87c..a6234e3 100644
--- a/distribution/src/main/resources/frameworks/air-config.xml
+++ b/distribution/src/main/resources/frameworks/air-config.xml
@@ -230,6 +230,10 @@
<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>
diff --git a/distribution/src/main/resources/frameworks/airmobile-config.xml
b/distribution/src/main/resources/frameworks/airmobile-config.xml
index ca7b850..11d1f79 100644
--- a/distribution/src/main/resources/frameworks/airmobile-config.xml
+++ b/distribution/src/main/resources/frameworks/airmobile-config.xml
@@ -229,6 +229,10 @@
<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>
diff --git
a/distribution/src/main/resources/frameworks/flex-config-template.xml
b/distribution/src/main/resources/frameworks/flex-config-template.xml
index b699e45..02448a8 100644
--- a/distribution/src/main/resources/frameworks/flex-config-template.xml
+++ b/distribution/src/main/resources/frameworks/flex-config-template.xml
@@ -235,6 +235,10 @@
<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>
diff --git a/distribution/src/main/resources/frameworks/flex-config.xml
b/distribution/src/main/resources/frameworks/flex-config.xml
index 4df432b..6834e07 100644
--- a/distribution/src/main/resources/frameworks/flex-config.xml
+++ b/distribution/src/main/resources/frameworks/flex-config.xml
@@ -286,6 +286,12 @@
</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>
diff --git
a/distribution/src/main/resources/frameworks/royale-config-template.xml
b/distribution/src/main/resources/frameworks/royale-config-template.xml
index eb30223..a075ab8 100644
--- a/distribution/src/main/resources/frameworks/royale-config-template.xml
+++ b/distribution/src/main/resources/frameworks/royale-config-template.xml
@@ -231,6 +231,10 @@
<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>
diff --git a/distribution/src/main/resources/frameworks/royale-config.xml
b/distribution/src/main/resources/frameworks/royale-config.xml
index a5d2975..1d252b0 100644
--- a/distribution/src/main/resources/frameworks/royale-config.xml
+++ b/distribution/src/main/resources/frameworks/royale-config.xml
@@ -231,6 +231,10 @@
<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>
diff --git a/frameworks/projects/Crux/asconfig.json
b/frameworks/projects/Crux/asconfig.json
index 629cc29..62bc897 100644
--- a/frameworks/projects/Crux/asconfig.json
+++ b/frameworks/projects/Crux/asconfig.json
@@ -16,6 +16,6 @@
},
"files":
[
- "src/main/royale/FlatClasses.as"
+ "src/main/royale/CruxClasses.as"
]
}
diff --git a/frameworks/royale-config-template.xml
b/frameworks/royale-config-template.xml
index 7b246fa..22f9f4f 100644
--- a/frameworks/royale-config-template.xml
+++ b/frameworks/royale-config-template.xml
@@ -112,6 +112,7 @@
<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>
@@ -148,6 +149,7 @@
<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>
diff --git a/releasesteps.xml b/releasesteps.xml
index d6c1f42..01d0061 100644
--- a/releasesteps.xml
+++ b/releasesteps.xml
@@ -219,7 +219,7 @@
<delete file="${artifactfolder}/swcs.txt" />
<!-- this is a comma-delimited, no spaces, no-line-breaks list used to
decide which swcs
to skip in the rat-check of the binaries and which swcs to examine
before approval -->
- <property name="swcs-list"
value="Basic,Binding,Charts,Collections,Core,CreateJS,DragDrop,Effects,Express,Flat,FontAwesome,Formatters,GoogleMaps,Graphics,HTML,HTML5,Icons,JQuery,Jewel,Language,MXRoyale,MaterialDesignLite,Mobile,Network,Reflection,RoyaleSite,SparkRoyale,Storage,TLF,Text,XML,BasicTheme,JewelTheme"/>
+ <property name="swcs-list"
value="Basic,Binding,Charts,Collections,Core,CreateJS,DragDrop,Effects,Express,Flat,FontAwesome,Formatters,GoogleMaps,Graphics,HTML,HTML5,Icons,JQuery,Jewel,Crux,Language,MXRoyale,MaterialDesignLite,Mobile,Network,Reflection,RoyaleSite,SparkRoyale,Storage,TLF,Text,XML,BasicTheme,JewelTheme"/>
<echo file="${artifactfolder}/swcs.txt" message="${swcs-list}"/>
</target>
@@ -475,6 +475,9 @@
<param name="swcname" value="Jewel" />
</antcall>
<antcall target="sign-swc-artifacts" >
+ <param name="swcname" value="Crux" />
+ </antcall>
+ <antcall target="sign-swc-artifacts" >
<param name="swcname" value="JQuery" />
</antcall>
<antcall target="sign-swc-artifacts" >
@@ -1260,6 +1263,10 @@
</antcall>
<antcall target="compare-swf-swc">
<param name="folderName" value="royale-asjs/frameworks/libs" />
+ <param name="fileName" value="Crux.swc"/>
+ </antcall>
+ <antcall target="compare-swf-swc">
+ <param name="folderName" value="royale-asjs/frameworks/libs" />
<param name="fileName" value="JewelTheme.swc"/>
</antcall>
<antcall target="compare-swf-swc">
@@ -1396,6 +1403,10 @@
</antcall>
<antcall target="compare-swf-swc">
<param name="folderName" value="royale-asjs/frameworks/js/libs" />
+ <param name="fileName" value="CruxJS.swc"/>
+ </antcall>
+ <antcall target="compare-swf-swc">
+ <param name="folderName" value="royale-asjs/frameworks/js/libs" />
<param name="fileName" value="LanguageJS.swc"/>
</antcall>
<antcall target="compare-swf-swc">
