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 2021/02/22 17:54:55 UTC
[royale-asjs] branch develop updated (1146503 -> 140a013)
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 1146503 - Added more manifest files to be copied to the manifest directory.
new cb66abe Revert "- Added more manifest files to be copied to the manifest directory."
new 140a013 Revert "- Hopefully fixed the (with-swf) distribution"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
distribution/src/main/assembly/component-air.xml | 5 +-
.../main/assembly/component-royale-with-swf.xml | 1 -
.../src/main/assembly/component-royale.xml | 124 ++++++---------------
3 files changed, 34 insertions(+), 96 deletions(-)
[royale-asjs] 01/02: Revert "- Added more manifest files to be
copied to the manifest directory."
Posted by ca...@apache.org.
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
commit cb66abeed634df8ca8f731830dd5db3ad34d296e
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Feb 22 18:54:19 2021 +0100
Revert "- Added more manifest files to be copied to the manifest directory."
This reverts commit 11465038de846de20a6d943702584c0c620d1b76.
---
.../src/main/assembly/component-royale.xml | 120 ++++++---------------
1 file changed, 30 insertions(+), 90 deletions(-)
diff --git a/distribution/src/main/assembly/component-royale.xml b/distribution/src/main/assembly/component-royale.xml
index 2312891..d066b82 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -255,9 +255,9 @@ under the License.
<!-- Copy the manifests -->
<file>
- <source>../frameworks/projects/Basic/src/main/resources/basic-as-manifest.xml</source>
+ <source>../frameworks/projects/Binding/src/main/resources/basic-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-as-manifest-basic.xml</destName>
+ <destName>basic-manifest-binding.xml</destName>
</file>
<file>
<source>../frameworks/projects/Basic/src/main/resources/basic-manifest.xml</source>
@@ -265,14 +265,14 @@ under the License.
<destName>basic-manifest-basic.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Basic/src/main/resources/svg-manifest.xml</source>
+ <source>../frameworks/projects/Basic/src/main/resources/basic-as-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>svg-manifest-basic.xml</destName>
+ <destName>basic-as-manifest-basic.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Binding/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/Basic/src/main/resources/svg-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-binding.xml</destName>
+ <destName>svg-manifest-basic.xml</destName>
</file>
<file>
<source>../frameworks/projects/Charts/src/main/resources/basic-manifest.xml</source>
@@ -295,11 +295,6 @@ under the License.
<destName>createjs-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/DragDrop/src/main/resources/basic-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
<destName>basic-manifest-dragdrop.xml</destName>
@@ -310,16 +305,6 @@ under the License.
<destName>basic-manifest-effects.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Express/src/main/resources/express-as-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>express-as-manifest.xml</destName>
- </file>
- <file>
- <source>../frameworks/projects/Express/src/main/resources/express-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>express-manifest.xml</destName>
- </file>
- <file>
<source>../frameworks/projects/Flat/src/main/resources/flat-as-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
<destName>flat-as-manifest.xml</destName>
@@ -330,16 +315,6 @@ under the License.
<destName>flat-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/FontAwesome/src/main/resources/fa-as-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>fa-as-manifest.xml</destName>
- </file>
- <file>
- <source>../frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>fa-manifest.xml</destName>
- </file>
- <file>
<source>../frameworks/projects/Formatters/src/main/resources/basic-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
<destName>basic-manifest-formatters.xml</destName>
@@ -375,41 +350,11 @@ under the License.
<destName>html5-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Icons/src/main/resources/icons-as-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>icons-as-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>
- </file>
- <file>
- <source>../frameworks/projects/Jewel/src/main/resources/jewel-as-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>jewel-as-manifest.xml</destName>
- </file>
- <file>
- <source>../frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>jewel-manifest.xml</destName>
- </file>
- <file>
<source>../frameworks/projects/JQuery/src/main/resources/jquery-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
<destName>jquery-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/MaterialDesignLite/src/main/resources/mdl-as-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>mdl-as-manifest.xml</destName>
- </file>
- <file>
- <source>../frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>mdl-manifest.xml</destName>
- </file>
- <file>
<source>../frameworks/projects/Mobile/src/main/resources/basic-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
<destName>basic-manifest-mobile.xml</destName>
@@ -420,69 +365,64 @@ under the License.
<destName>cordova-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/MXRoyale/src/main/resources/mx-royale-as-manifest.xml</source>
- <outputDirectory>frameworks/manifests</outputDirectory>
- <destName>mx-royale-as-manifest.xml</destName>
- </file>
- <file>
- <source>../frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml</source>
+ <source>../frameworks/projects/Network/src/main/resources/basic-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>mx-royale-manifest.xml</destName>
+ <destName>basic-manifest-network.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Network/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/Icons/src/main/resources/icons-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-network.xml</destName>
+ <destName>basic-manifest-icons.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Reflection/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/Storage/src/main/resources/basic-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-reflection.xml</destName>
+ <destName>basic-manifest-storage.xml</destName>
</file>
<file>
- <source>../frameworks/projects/RoyaleSite/src/main/resources/royalesite-manifest.xml</source>
+ <source>../frameworks/projects/XML/src/main/resources/basic-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>royalesite-manifest.xml</destName>
+ <destName>basic-manifest-xml.xml</destName>
</file>
<file>
- <source>../frameworks/projects/RoyaleUnitUI/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/Express/src/main/resources/express-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-royaleunitui.xml</destName>
+ <destName>express-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml</source>
+ <source>../frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>spark-royale-manifest.xml</destName>
+ <destName>fa-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Storage/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-storage.xml</destName>
+ <destName>mdl-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Text/src/main/resources/basic-as-manifest.xml</source>
+ <source>../frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-as-manifest-text.xml</destName>
+ <destName>jewel-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/Text/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/Crux/src/main/resources/crux-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-text.xml</destName>
+ <destName>crux-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/TLF/src/main/resources/basic-as-manifest.xml</source>
+ <source>../frameworks/projects/Icons/src/main/resources/icons-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-as-manifest-tlf.xml</destName>
+ <destName>icons-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/TLF/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-tlf.xml</destName>
+ <destName>mx-royale-manifest.xml</destName>
</file>
<file>
- <source>../frameworks/projects/XML/src/main/resources/basic-manifest.xml</source>
+ <source>../frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml</source>
<outputDirectory>frameworks/manifests</outputDirectory>
- <destName>basic-manifest-xml.xml</destName>
+ <destName>spark-royale-manifest.xml</destName>
</file>
</files>
</component>
[royale-asjs] 02/02: Revert "- Hopefully fixed the (with-swf)
distribution"
Posted by ca...@apache.org.
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
commit 140a013cc7e04e91879517facb53b82dedfeb2fb
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Feb 22 18:54:37 2021 +0100
Revert "- Hopefully fixed the (with-swf) distribution"
This reverts commit c2a7d5e4761c37d1baddeb6b0cb2d897f45a28db.
---
distribution/src/main/assembly/component-air.xml | 5 ++---
distribution/src/main/assembly/component-royale-with-swf.xml | 1 -
distribution/src/main/assembly/component-royale.xml | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/distribution/src/main/assembly/component-air.xml b/distribution/src/main/assembly/component-air.xml
index faf1d3b..e24c2f4 100644
--- a/distribution/src/main/assembly/component-air.xml
+++ b/distribution/src/main/assembly/component-air.xml
@@ -41,18 +41,17 @@ under the License.
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--dependencySet>
+ <dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>frameworks</outputFileNameMapping>
<includes>
<include></include>
</includes>
- </dependencySet-->
+ </dependencySet>
<!-- Put the air swcs into the frameworks/libs/air directory -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>frameworks/libs/air</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>com.adobe.air.framework:*:swc</include>
</includes>
diff --git a/distribution/src/main/assembly/component-royale-with-swf.xml b/distribution/src/main/assembly/component-royale-with-swf.xml
index 22b54b7..ac748cb 100644
--- a/distribution/src/main/assembly/component-royale-with-swf.xml
+++ b/distribution/src/main/assembly/component-royale-with-swf.xml
@@ -33,7 +33,6 @@ under the License.
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>frameworks/libs</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.royale.framework:*:swc</include>
</includes>
diff --git a/distribution/src/main/assembly/component-royale.xml b/distribution/src/main/assembly/component-royale.xml
index d066b82..25a7cf3 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -96,7 +96,7 @@ under the License.
</dependencySet>
<!-- Put the framework swcs into the frameworks/libs directory (needed for IDEs) -->
- <!--dependencySet>
+ <dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>frameworks/libs</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
@@ -106,7 +106,7 @@ under the License.
<excludes>
<exclude>org.apache.royale.framework:*:swc:typedefs</exclude>
</excludes>
- </dependencySet-->
+ </dependencySet>
<!-- Copy the fonts -->
<!-- Disabled as currently font swf compilation is deactivated -->