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 <[email protected]> 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 -->
