This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/distribution-allignment
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to
refs/heads/feature/distribution-allignment by this push:
new 3d63955 - Added the empty ***fonts.ser files to the rat exclusions -
Moved all of the stuff needed for FlashBuilder support into a dedicated
assembly descriptor, which can easily be dropped.
3d63955 is described below
commit 3d6395537f3c74d3b7df7f04ef43734985d781f9
Author: Christofer Dutz <[email protected]>
AuthorDate: Wed Mar 3 11:37:14 2021 +0100
- Added the empty ***fonts.ser files to the rat exclusions
- Moved all of the stuff needed for FlashBuilder support into a dedicated
assembly descriptor, which can easily be dropped.
---
distribution/pom.xml | 9 +++
distribution/src/main/assembly/bin-with-swf.xml | 1 +
distribution/src/main/assembly/bin.xml | 1 +
.../src/main/assembly/component-flashbuilder.xml | 72 ++++++++++++++++++++++
.../src/main/assembly/component-royale.xml | 33 ----------
distribution/src/main/assembly/dir-with-swf.xml | 1 +
distribution/src/main/assembly/dir.xml | 1 +
pom.xml | 8 +++
8 files changed, 93 insertions(+), 33 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f3291f6..1fca1b0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -931,6 +931,15 @@
<type>swc</type>
</dependency>
+ <!-- Theme (Needed for FlashBuilder) -->
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>BasicTheme</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+
<!-- SWFObject -->
<dependency>
<groupId>org.webjars</groupId>
diff --git a/distribution/src/main/assembly/bin-with-swf.xml
b/distribution/src/main/assembly/bin-with-swf.xml
index 1ab0929..eb004f7 100644
--- a/distribution/src/main/assembly/bin-with-swf.xml
+++ b/distribution/src/main/assembly/bin-with-swf.xml
@@ -27,5 +27,6 @@ under the License.
<componentDescriptors>
<componentDescriptor>src/main/assembly/component-royale.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-royale-with-swf.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-flashbuilder.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/distribution/src/main/assembly/bin.xml
b/distribution/src/main/assembly/bin.xml
index 1ac3fc1..533eaa8 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -27,5 +27,6 @@ under the License.
<componentDescriptors>
<componentDescriptor>src/main/assembly/component-royale.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-royale-without-swf.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-flashbuilder.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/distribution/src/main/assembly/component-flashbuilder.xml
b/distribution/src/main/assembly/component-flashbuilder.xml
new file mode 100644
index 0000000..9893da2
--- /dev/null
+++ b/distribution/src/main/assembly/component-flashbuilder.xml
@@ -0,0 +1,72 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3
http://maven.apache.org/xsd/component-1.1.3.xsd";>
+
+ <dependencySets>
+ <!-- It seems FlashBuilder needs an additional theme artifact present
to be happy -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>frameworks/themes/Halo</outputDirectory>
+ <outputFileNameMapping>Halo.swc</outputFileNameMapping>
+ <includes>
+
<include>org.apache.royale.framework:BasicTheme:swc:js</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <!-- Copy the dummy files needed by some software -->
+ <fileSet>
+ <directory>src/main/resources/frameworks</directory>
+ <outputDirectory>frameworks</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <filtered>true</filtered>
+ </fileSet>
+
+ <!-- Copy the sdk descriptor -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>flex-sdk-description.xml</include>
+ </includes>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <!-- In ant air-config.xml is simply copied to airmobile-config.xml -->
+ <file>
+
<source>${project.build.directory}/processed-configs/air-config-template.xml</source>
+ <outputDirectory>frameworks</outputDirectory>
+ <destName>airmobile-config.xml</destName>
+ <filtered>true</filtered>
+ </file>
+ <file>
+
<source>${project.build.directory}/processed-configs/flex-config-template.xml</source>
+ <outputDirectory>frameworks</outputDirectory>
+ <destName>flex-config.xml</destName>
+ <filtered>true</filtered>
+ </file>
+ </files>
+</component>
diff --git a/distribution/src/main/assembly/component-royale.xml
b/distribution/src/main/assembly/component-royale.xml
index 82565d9..2496a48 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -156,16 +156,6 @@ under the License.
<fileMode>0755</fileMode>
</fileSet>
- <!-- Copy the dummy files needed by some software -->
- <fileSet>
- <directory>src/main/resources/frameworks</directory>
- <outputDirectory>frameworks</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
-
<!-- Copy the projects -->
<fileSet>
<outputDirectory>frameworks/projects</outputDirectory>
@@ -194,16 +184,6 @@ under the License.
</includes>
</fileSet>
- <!-- Copy the sdk descriptor -->
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>flex-sdk-description.xml</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
-
<!-- Copy the unpacked closure-compiler -->
<!-- <fileSet>
<outputDirectory>js/lib/google/closure-compiler/compiler</outputDirectory>
@@ -261,13 +241,6 @@ under the License.
<destName>air-config.xml</destName>
<filtered>true</filtered>
</file>
- <!-- In ant air-config.xml is simply copied to airmobile-config.xml -->
- <file>
-
<source>${project.build.directory}/processed-configs/air-config-template.xml</source>
- <outputDirectory>frameworks</outputDirectory>
- <destName>airmobile-config.xml</destName>
- <filtered>true</filtered>
- </file>
<file>
<source>../frameworks/asdoc-config.xml</source>
<outputDirectory>frameworks</outputDirectory>
@@ -279,12 +252,6 @@ under the License.
<filtered>true</filtered>
</file>
<file>
-
<source>${project.build.directory}/processed-configs/flex-config-template.xml</source>
- <outputDirectory>frameworks</outputDirectory>
- <destName>flex-config.xml</destName>
- <filtered>true</filtered>
- </file>
- <file>
<source>${project.build.directory}/processed-configs/jquery-config-template.xml</source>
<outputDirectory>frameworks</outputDirectory>
<destName>jquery-config.xml</destName>
diff --git a/distribution/src/main/assembly/dir-with-swf.xml
b/distribution/src/main/assembly/dir-with-swf.xml
index d6a822a..a9095d8 100644
--- a/distribution/src/main/assembly/dir-with-swf.xml
+++ b/distribution/src/main/assembly/dir-with-swf.xml
@@ -30,5 +30,6 @@ under the License.
<componentDescriptor>src/main/assembly/component-air.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-fontkit.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-swfobject.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-flashbuilder.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/distribution/src/main/assembly/dir.xml
b/distribution/src/main/assembly/dir.xml
index 05c1f7b..dbcd0ee 100644
--- a/distribution/src/main/assembly/dir.xml
+++ b/distribution/src/main/assembly/dir.xml
@@ -26,5 +26,6 @@ under the License.
<componentDescriptors>
<componentDescriptor>src/main/assembly/component-royale.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-royale-without-swf.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-flashbuilder.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/pom.xml b/pom.xml
index 89b4a08..cb000bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,6 +348,14 @@
<!-- Exclude serc/assets like *.afdesign or other files that
generate other project source files like SVGs -->
<exclude>src/assets/**</exclude>
+
+ <!--
+ Exclude these empty files, as they are empty and therefore don't
contain anything
+ (They are needed for supporting the FlashBuilder product)
+ -->
+ <exclude>**/localfonts.ser</exclude>
+ <exclude>**/macfonts.ser</exclude>
+ <exclude>**/winfonts.ser</exclude>
</excludes>
</configuration>
</plugin>
