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 08768b9 - Implemented a js-only distribution
new 87f454b Merge pull request #707 from
chrisdutz/feature/js-only-distribution
08768b9 is described below
commit 08768b9b85975ec20efdc8cfc591deb1708472d7
Author: Christofer Dutz <[email protected]>
AuthorDate: Mon Feb 3 23:04:51 2020 +0100
- Implemented a js-only distribution
---
distribution/pom.xml | 434 +++++++++++----------
.../main/assembly/{bin.xml => bin-with-swf.xml} | 3 +-
distribution/src/main/assembly/bin.xml | 2 +-
.../{bin.xml => component-royale-with-swf.xml} | 28 +-
.../{component.xml => component-royale.xml} | 43 +-
.../src/main/assembly/component-swfobject.xml | 47 +++
.../main/assembly/{dir.xml => dir-with-swf.xml} | 4 +-
distribution/src/main/assembly/dir.xml | 5 +-
...ion.xml => royale-sdk-description-with-swf.xml} | 58 +--
.../src/main/resources/royale-sdk-description.xml | 1 -
pom.xml | 2 +
src/main/script/prerequisiteCheckFramework.groovy | 4 +-
12 files changed, 340 insertions(+), 291 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2403ae3..c9c0cf1 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -41,6 +41,10 @@
<playerglobalHome>libs/player</playerglobalHome>
<targetPlayerMajorVersion>20</targetPlayerMajorVersion>
<targetPlayerMinorVersion>0</targetPlayerMinorVersion>
+
+ <assembly.bin>bin.xml</assembly.bin>
+ <assembly.dir>dir.xml</assembly.dir>
+
<assembly.sdk-description>royale-sdk-description.xml</assembly.sdk-description>
</properties>
<modules>
@@ -83,164 +87,6 @@
<version>${royale.compiler.version}</version>
</dependency>
- <!-- Add the framework swc modules -->
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>CreateJS</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Effects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Express</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Flat</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>FontAwesome</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Formatters</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>GoogleMaps</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML5</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>JQuery</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MaterialDesignLite</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Mobile</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Icons</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Storage</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>XML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Crux</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
-
<!-- Add the framework js-swc modules -->
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -499,13 +345,6 @@
<type>war</type>
</dependency>
- <!-- SWFObject -->
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>swfobject</artifactId>
- <version>2.2</version>
- </dependency>
-
<!-- Add the dummy jars -->
<dependency>
<groupId>org.apache.royale.framework.distribution</groupId>
@@ -584,26 +423,7 @@
<version>2.10</version>
<executions>
<execution>
- <id>unpack-swfobject</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.webjars</groupId>
- <artifactId>swfobject</artifactId>
- <version>2.2</version>
- <type>jar</type>
-
<outputDirectory>${project.build.directory}/swfobject-temp</outputDirectory>
- <includes>META-INF/resources/**</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>unpack-closure-ompiler</id>
+ <id>unpack-closure-compiler</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
@@ -654,7 +474,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/${assembly.bin}</descriptor>
</descriptors>
</configuration>
</execution>
@@ -689,14 +509,210 @@
</plugins>
</build>
</profile>
+
<profile>
- <id>create-distribution-in-folder</id>
- <activation>
- <property>
- <name>distributionTargetFolder</name>
- </property>
- </activation>
+ <id>option-with-swf</id>
+ <properties>
+ <assembly.bin>bin-with-swf.xml</assembly.bin>
+ <assembly.dir>dir-with-swf.xml</assembly.dir>
+
<assembly.sdk-description>royale-sdk-description-with-swf.xml</assembly.sdk-description>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>unpack-swfobject</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.webjars</groupId>
+ <artifactId>swfobject</artifactId>
+ <version>2.2</version>
+ <type>jar</type>
+
<outputDirectory>${project.build.directory}/swfobject-temp</outputDirectory>
+ <includes>META-INF/resources/**</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
+ <!-- Add the framework swc modules -->
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>CreateJS</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Effects</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Express</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Flat</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>FontAwesome</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Formatters</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>GoogleMaps</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML5</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>JQuery</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>MaterialDesignLite</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Mobile</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Icons</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Storage</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>XML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Crux</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+
+ <!-- SWFObject -->
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swfobject</artifactId>
+ <version>2.2</version>
+ </dependency>
+
<dependency>
<groupId>com.adobe.flash</groupId>
<artifactId>framework</artifactId>
@@ -752,12 +768,12 @@
<type>zip</type>
</dependency>
- <!-- <dependency>
- <groupId>com.adobe</groupId>
- <artifactId>fontkit</artifactId>
- <version>1.0</version>
- </dependency>
- -->
+ <!-- <dependency>
+ <groupId>com.adobe</groupId>
+ <artifactId>fontkit</artifactId>
+ <version>1.0</version>
+ </dependency>
+ -->
<dependency>
<groupId>com.adobe.air</groupId>
<artifactId>templates</artifactId>
@@ -772,19 +788,27 @@
<type>zip</type>
</dependency>
</dependencies>
+ </profile>
+ <profile>
+ <id>_create-distribution-in-folder</id>
+ <activation>
+ <property>
+ <name>distributionTargetFolder</name>
+ </property>
+ </activation>
<build>
<plugins>
<!-- Not clean since this removes unpacked closure-library from temp
folder and prevents the copy to js/lib/google folder -->
- <!-- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
+ <id>clean-distribution-target-folder</id>
+ <phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
- <id>clean-target-folder</id>
- <phase>prepare-package</phase>
<configuration>
<filesets>
<fileset>
@@ -795,7 +819,7 @@
</configuration>
</execution>
</executions>
- </plugin> -->
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -811,7 +835,7 @@
<attach>false</attach>
<outputDirectory>${distributionTargetFolder}</outputDirectory>
<descriptors>
- <descriptor>src/main/assembly/dir.xml</descriptor>
+ <descriptor>src/main/assembly/${assembly.dir}</descriptor>
</descriptors>
</configuration>
</execution>
@@ -821,7 +845,7 @@
</build>
</profile>
<profile>
- <id>windows</id>
+ <id>_os-windows</id>
<activation>
<os>
<family>Windows</family>
@@ -862,7 +886,7 @@
</dependencies>
</profile>
<profile>
- <id>mac</id>
+ <id>_os-mac</id>
<activation>
<os>
<family>Mac</family>
diff --git a/distribution/src/main/assembly/bin.xml
b/distribution/src/main/assembly/bin-with-swf.xml
similarity index 86%
copy from distribution/src/main/assembly/bin.xml
copy to distribution/src/main/assembly/bin-with-swf.xml
index d6adae3..1ab0929 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin-with-swf.xml
@@ -25,6 +25,7 @@ under the License.
<format>tar.gz</format>
</formats>
<componentDescriptors>
- <componentDescriptor>src/main/assembly/component.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-royale.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-royale-with-swf.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/distribution/src/main/assembly/bin.xml
b/distribution/src/main/assembly/bin.xml
index d6adae3..c29fb03 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -25,6 +25,6 @@ under the License.
<format>tar.gz</format>
</formats>
<componentDescriptors>
- <componentDescriptor>src/main/assembly/component.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-royale.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/distribution/src/main/assembly/bin.xml
b/distribution/src/main/assembly/component-royale-with-swf.xml
similarity index 50%
copy from distribution/src/main/assembly/bin.xml
copy to distribution/src/main/assembly/component-royale-with-swf.xml
index d6adae3..d93f393 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/component-royale-with-swf.xml
@@ -16,15 +16,19 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0
http://maven.apache.org/xsd/assembly-1.1.3.xsd";>
- <id>bin</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <componentDescriptors>
- <componentDescriptor>src/main/assembly/component.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
+<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>
+ <!-- Put the framework swcs into the frameworks/libs directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>frameworks/libs</outputDirectory>
+ <includes>
+ <include>org.apache.royale.framework:*:swc</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.royale.framework:*:swc:typedefs</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</component>
diff --git a/distribution/src/main/assembly/component.xml
b/distribution/src/main/assembly/component-royale.xml
similarity index 92%
rename from distribution/src/main/assembly/component.xml
rename to distribution/src/main/assembly/component-royale.xml
index be2e117..f3db8c3 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -59,17 +59,6 @@ under the License.
<include>org.apache.royale.typedefs:*</include>
</includes>
</dependencySet>
- <!-- Put the framework swcs into the frameworks/libs directory -->
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>frameworks/libs</outputDirectory>
- <includes>
- <include>org.apache.royale.framework:*:swc</include>
- </includes>
- <excludes>
- <exclude>org.apache.royale.framework:*:swc:typedefs</exclude>
- </excludes>
- </dependencySet>
<!-- Put the framework js-swcs into the frameworks/libs directory -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
@@ -177,7 +166,6 @@ under the License.
<outputDirectory></outputDirectory>
<includes>
<include>flex-sdk-description.xml</include>
- <include>royale-sdk-description.xml</include>
</includes>
<filtered>true</filtered>
</fileSet>
@@ -215,32 +203,17 @@ under the License.
<include>**</include>
</includes>
</fileSet> -->
-
- <!-- Copy the SWFObject templates -->
- <fileSet>
- <outputDirectory>templates/swfobject</outputDirectory>
-
<directory>target/swfobject-temp/META-INF/resources/webjars/swfobject/2.2</directory>
- <includes>
- <include>*</include>
- </includes>
- <excludes>
- <exclude>src/**</exclude>
- <exclude>index.html</exclude>
- <exclude>index_dynamic.html</exclude>
- <exclude>test.swf</exclude>
- </excludes>
- </fileSet>
- <!-- Copy our custom index.html template as well as the history code -->
- <fileSet>
- <directory>../templates/swfobject</directory>
- <outputDirectory>templates/swfobject</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
</fileSets>
<files>
+ <!-- Copy the right sdk-description -->
+ <file>
+ <source>src/main/resources/${assembly.sdk-description}</source>
+ <outputDirectory></outputDirectory>
+ <destName>royale-sdk-description.xml</destName>
+ <filtered>true</filtered>
+ </file>
+
<!-- Rename main js dummy jar artifacts to "mxmlc.jar" and "compc.jar"
that is what an IDE expects to find -->
<file>
<source>jars/compiler-mxmljsc/target/compiler-mxmljsc-0.9.7-SNAPSHOT.jar</source>
diff --git a/distribution/src/main/assembly/component-swfobject.xml
b/distribution/src/main/assembly/component-swfobject.xml
new file mode 100644
index 0000000..9727ff6
--- /dev/null
+++ b/distribution/src/main/assembly/component-swfobject.xml
@@ -0,0 +1,47 @@
+<!--
+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";>
+
+ <fileSets>
+ <!-- Copy the SWFObject templates -->
+ <fileSet>
+ <outputDirectory>templates/swfobject</outputDirectory>
+
<directory>target/swfobject-temp/META-INF/resources/webjars/swfobject/2.2</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <excludes>
+ <exclude>src/**</exclude>
+ <exclude>index.html</exclude>
+ <exclude>index_dynamic.html</exclude>
+ <exclude>test.swf</exclude>
+ </excludes>
+ </fileSet>
+ <!-- Copy our custom index.html template as well as the history code -->
+ <fileSet>
+ <directory>../templates/swfobject</directory>
+ <outputDirectory>templates/swfobject</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</component>
diff --git a/distribution/src/main/assembly/dir.xml
b/distribution/src/main/assembly/dir-with-swf.xml
similarity index 81%
copy from distribution/src/main/assembly/dir.xml
copy to distribution/src/main/assembly/dir-with-swf.xml
index 4bc3176..d6a822a 100644
--- a/distribution/src/main/assembly/dir.xml
+++ b/distribution/src/main/assembly/dir-with-swf.xml
@@ -24,9 +24,11 @@ under the License.
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
- <componentDescriptor>src/main/assembly/component.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-royale.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-royale-with-swf.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-flash.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-air.xml</componentDescriptor>
<componentDescriptor>src/main/assembly/component-fontkit.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-swfobject.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/distribution/src/main/assembly/dir.xml
b/distribution/src/main/assembly/dir.xml
index 4bc3176..5f17fce 100644
--- a/distribution/src/main/assembly/dir.xml
+++ b/distribution/src/main/assembly/dir.xml
@@ -24,9 +24,6 @@ under the License.
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
- <componentDescriptor>src/main/assembly/component.xml</componentDescriptor>
-
<componentDescriptor>src/main/assembly/component-flash.xml</componentDescriptor>
-
<componentDescriptor>src/main/assembly/component-air.xml</componentDescriptor>
-
<componentDescriptor>src/main/assembly/component-fontkit.xml</componentDescriptor>
+
<componentDescriptor>src/main/assembly/component-royale.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/distribution/src/main/resources/royale-sdk-description.xml
b/distribution/src/main/resources/royale-sdk-description-with-swf.xml
similarity index 91%
copy from distribution/src/main/resources/royale-sdk-description.xml
copy to distribution/src/main/resources/royale-sdk-description-with-swf.xml
index 6cb8c1d..6bbf271 100644
--- a/distribution/src/main/resources/royale-sdk-description.xml
+++ b/distribution/src/main/resources/royale-sdk-description-with-swf.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<royale-sdk-description>
- <name>Apache Royale</name>
- <version>${project.version}</version>
- <build>${timestamp}</build>
-
- <output-targets>
- <output-target name="js" version="Ecma5Strict" />
- <output-target name="swf" version="AS3" AIR="14.0" Flash="11.7" />
- </output-targets>
-</royale-sdk-description>
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<royale-sdk-description>
+ <name>Apache Royale</name>
+ <version>${project.version}</version>
+ <build>${timestamp}</build>
+
+ <output-targets>
+ <output-target name="js" version="Ecma5Strict" />
+ <output-target name="swf" version="AS3" AIR="${air.version}"
Flash="${flash.version}" />
+ </output-targets>
+</royale-sdk-description>
diff --git a/distribution/src/main/resources/royale-sdk-description.xml
b/distribution/src/main/resources/royale-sdk-description.xml
index 6cb8c1d..8bf5520 100644
--- a/distribution/src/main/resources/royale-sdk-description.xml
+++ b/distribution/src/main/resources/royale-sdk-description.xml
@@ -24,6 +24,5 @@
<output-targets>
<output-target name="js" version="Ecma5Strict" />
- <output-target name="swf" version="AS3" AIR="14.0" Flash="11.7" />
</output-targets>
</royale-sdk-description>
diff --git a/pom.xml b/pom.xml
index a141356..fab5be1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,6 +254,8 @@
</execution>
</executions>
<configuration>
+ <!-- Make rat log the problematic files in the build output -->
+ <consoleOutput>true</consoleOutput>
<excludes>
<!-- JSON files can't contain comments -->
<exclude>**/*.json</exclude>
diff --git a/src/main/script/prerequisiteCheckFramework.groovy
b/src/main/script/prerequisiteCheckFramework.groovy
index 443b9bd..939167d 100644
--- a/src/main/script/prerequisiteCheckFramework.groovy
+++ b/src/main/script/prerequisiteCheckFramework.groovy
@@ -215,10 +215,10 @@ if(uiTestsuiteEnabled) {
}
if(distributionEnabled) {
- if(!optionWithSwfEnabled) {
+ /*if(!optionWithSwfEnabled) {
println "If the 'with-distribution' profile is enabled the
'option-with-swf' profile must be enabled too, as the distribution bundles both
swf and js artifacts."
allConditionsMet = false
- }
+ }*/
}
if(!allConditionsMet) {
