You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/07/25 13:09:09 UTC
git commit: [flex-asjs] [refs/heads/develop] - - Split up the
dependencies to air,
flash and fontkit into separate profiles and assembly descriptors - Fine tuned
the distribution to be more like the original - Added new adt scripts that
match the sligtly
Repository: flex-asjs
Updated Branches:
refs/heads/develop 8eb7b02e7 -> afd88a11f
- Split up the dependencies to air, flash and fontkit into separate profiles and assembly descriptors
- Fine tuned the distribution to be more like the original
- Added new adt scripts that match the sligtly different jar namings of the FlexJS SDK when built with maven
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/afd88a11
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/afd88a11
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/afd88a11
Branch: refs/heads/develop
Commit: afd88a11fd8a73e759ebd129f3a3da3cf29676e9
Parents: 8eb7b02
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Jul 25 15:09:00 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Jul 25 15:09:00 2016 +0200
----------------------------------------------------------------------
distribution/pom.xml | 213 +++++++++++++++----
.../src/main/assembly/component-air.xml | 103 +++++++++
.../src/main/assembly/component-fontkit.xml | 30 +++
distribution/src/main/assembly/component.xml | 2 +-
distribution/src/main/assembly/dir.xml | 1 +
.../src/main/assembly/filter.properties | 21 ++
distribution/src/main/resources/air/adt | 24 +++
distribution/src/main/resources/air/adt.bat | 22 ++
.../frameworks/air-config-template.xml | 6 +-
.../main/resources/frameworks/air-config.xml | 6 +-
.../frameworks/flex-config-template.xml | 6 +-
11 files changed, 394 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index b6937a6..1f80358 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -401,19 +401,6 @@
<type>war</type>
</dependency>
- <dependency>
- <groupId>com.adobe.flash</groupId>
- <artifactId>framework</artifactId>
- <version>${flash.version}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.air</groupId>
- <artifactId>framework</artifactId>
- <version>${air.version}</version>
- <type>pom</type>
- </dependency>
-
<!-- SWFObject -->
<dependency>
<groupId>org.webjars</groupId>
@@ -471,6 +458,9 @@
<goal>single</goal>
</goals>
<configuration>
+ <filters>
+ <filter>src/main/assembly/filter.properties</filter>
+ </filters>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
@@ -483,12 +473,113 @@
<profiles>
<profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-src-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>create-distribution-in-folder</id>
<activation>
<property>
<name>distributionTargetFolder</name>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.flash</groupId>
+ <artifactId>framework</artifactId>
+ <version>${flash.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe.air</groupId>
+ <artifactId>compiler</artifactId>
+ <version>${air.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.compiler</groupId>
+ <artifactId>adt</artifactId>
+ <version>${air.version}</version>
+ <classifier>android</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.compiler</groupId>
+ <artifactId>adt</artifactId>
+ <version>${air.version}</version>
+ <classifier>desktop</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.compiler</groupId>
+ <artifactId>adt</artifactId>
+ <version>${air.version}</version>
+ <classifier>ios</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air</groupId>
+ <artifactId>runtime</artifactId>
+ <version>${air.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air</groupId>
+ <artifactId>framework</artifactId>
+ <version>${air.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air</artifactId>
+ <version>${air.version}</version>
+ <classifier>android</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe</groupId>
+ <artifactId>fontkit</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe.air</groupId>
+ <artifactId>templates</artifactId>
+ <version>${air.version}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe.air</groupId>
+ <artifactId>misc</artifactId>
+ <version>${air.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -536,29 +627,79 @@
</build>
</profile>
<profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <id>windows</id>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ <property>
+ <name>distributionTargetFolder</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>adl</artifactId>
+ <version>${air.version}</version>
+ <classifier>win</classifier>
+ <type>exe</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.compiler</groupId>
+ <artifactId>adt</artifactId>
+ <version>${air.version}</version>
+ <classifier>win</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air</artifactId>
+ <version>${air.version}</version>
+ <classifier>win</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air-captive</artifactId>
+ <version>${air.version}</version>
+ <classifier>mac</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>mac</id>
+ <activation>
+ <os>
+ <family>Mac</family>
+ </os>
+ <property>
+ <name>distributionTargetFolder</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>adl</artifactId>
+ <version>${air.version}</version>
+ <classifier>mac</classifier>
+ <type>exe</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air</artifactId>
+ <version>${air.version}</version>
+ <classifier>mac</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.runtime</groupId>
+ <artifactId>air-captive</artifactId>
+ <version>${air.version}</version>
+ <classifier>mac</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/assembly/component-air.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/component-air.xml b/distribution/src/main/assembly/component-air.xml
index 66f00a2..1655f6d 100644
--- a/distribution/src/main/assembly/component-air.xml
+++ b/distribution/src/main/assembly/component-air.xml
@@ -19,6 +19,24 @@ 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>
+ <!-- Put the air jars into the lib directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>com.adobe.air.compiler:adt:jar</include>
+ </includes>
+ </dependencySet>
+ <!-- Unpack the platform-directories to the lib directory-->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>com.adobe.air.compiler:adt:zip:android</include>
+ <include>com.adobe.air.compiler:adt:zip:desktop</include>
+ <include>com.adobe.air.compiler:adt:zip:ios</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
<!-- Put the air swcs into the frameworks/libs/air directory -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
@@ -27,5 +45,90 @@ under the License.
<include>com.adobe.air.framework:*:swc</include>
</includes>
</dependencySet>
+ <!-- Put the air debug launcher into the bin directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>com.adobe.air.runtime:adl:exe:win</include>
+ </includes>
+ <outputFileNameMapping>adl.exe</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>com.adobe.air.runtime:adl:exe:mac</include>
+ </includes>
+ <outputFileNameMapping>adl</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>runtimes/air/win</outputDirectory>
+ <includes>
+ <include>com.adobe.air.runtime:air:zip:win</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>runtimes/air/mac</outputDirectory>
+ <includes>
+ <include>com.adobe.air.runtime:air:zip:mac</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>runtimes/air/android</outputDirectory>
+ <includes>
+ <include>com.adobe.air.runtime:air:zip:android</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>runtimes/air-captive/win</outputDirectory>
+ <includes>
+ <include>com.adobe.air.runtime:air-captive:zip:win</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>runtimes/air-captive/mac</outputDirectory>
+ <includes>
+ <include>com.adobe.air.runtime:air-captive:zip:mac</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- Put the air templates into the templates directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>templates</outputDirectory>
+ <includes>
+ <include>com.adobe.air:templates:jar</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- Unpack the rest of the stuff that usually belongs to an AIR SDK -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>com.adobe.air:misc:zip</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
</dependencySets>
+ <fileSets>
+ <!-- Copy the adt scripts and update the air version-number -->
+ <fileSet>
+ <directory>src/main/resources/air</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
</component>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/assembly/component-fontkit.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/component-fontkit.xml b/distribution/src/main/assembly/component-fontkit.xml
new file mode 100644
index 0000000..0b6a026
--- /dev/null
+++ b/distribution/src/main/assembly/component-fontkit.xml
@@ -0,0 +1,30 @@
+<!--
+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>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>com.adobe:fontkit</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</component>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/assembly/component.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml
index c74bef0..cb86030 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -158,7 +158,7 @@ under the License.
<!-- Copy the sdk descriptor -->
<fileSet>
<directory>src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>flex-sdk-description.xml</include>
</includes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/assembly/dir.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/dir.xml b/distribution/src/main/assembly/dir.xml
index bd07978..4bc3176 100644
--- a/distribution/src/main/assembly/dir.xml
+++ b/distribution/src/main/assembly/dir.xml
@@ -27,5 +27,6 @@ under the License.
<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>
</componentDescriptors>
</assembly>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/filter.properties b/distribution/src/main/assembly/filter.properties
new file mode 100644
index 0000000..dc8b6ae
--- /dev/null
+++ b/distribution/src/main/assembly/filter.properties
@@ -0,0 +1,21 @@
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+airVersion=${air-version}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/resources/air/adt
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/air/adt b/distribution/src/main/resources/air/adt
new file mode 100755
index 0000000..71138b2
--- /dev/null
+++ b/distribution/src/main/resources/air/adt
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+scriptDir=$(dirname "$0")
+args=$@
+java -Dfile.encoding=UTF-8 -jar "$scriptDir/../lib/adt-${airVersion}.jar" "$args"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/resources/air/adt.bat
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/air/adt.bat b/distribution/src/main/resources/air/adt.bat
new file mode 100644
index 0000000..f077f7d
--- /dev/null
+++ b/distribution/src/main/resources/air/adt.bat
@@ -0,0 +1,22 @@
+@echo off
+
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+SET scriptDir=%~dp0
+SET args=%*
+@java -jar "%scriptDir%\..\lib\adt-${airVersion}.jar" %args%
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/resources/frameworks/air-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/air-config-template.xml b/distribution/src/main/resources/frameworks/air-config-template.xml
index 98ab586..43075ab 100644
--- a/distribution/src/main/resources/frameworks/air-config-template.xml
+++ b/distribution/src/main/resources/frameworks/air-config-template.xml
@@ -181,7 +181,11 @@
</namespace>
<namespace>
<uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>manifests/svg-manifest.xml</manifest>
+ <manifest>manifests/svg-manifest-html.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/svg</uri>
+ <manifest>manifests/svg-manifest-graphics.xml</manifest>
</namespace>
</namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/resources/frameworks/air-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/air-config.xml b/distribution/src/main/resources/frameworks/air-config.xml
index 35eb7bc..590ad1e 100644
--- a/distribution/src/main/resources/frameworks/air-config.xml
+++ b/distribution/src/main/resources/frameworks/air-config.xml
@@ -182,7 +182,11 @@
</namespace>
<namespace>
<uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>manifests/svg-manifest.xml</manifest>
+ <manifest>manifests/svg-manifest-html.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/svg</uri>
+ <manifest>manifests/svg-manifest-graphics.xml</manifest>
</namespace>
</namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afd88a11/distribution/src/main/resources/frameworks/flex-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/flex-config-template.xml b/distribution/src/main/resources/frameworks/flex-config-template.xml
index 9bdf6df..ffa629d 100644
--- a/distribution/src/main/resources/frameworks/flex-config-template.xml
+++ b/distribution/src/main/resources/frameworks/flex-config-template.xml
@@ -184,7 +184,11 @@
</namespace>
<!--namespace>
<uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>manifests/svg-manifest.xml</manifest>
+ <manifest>manifests/svg-manifest-html.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/svg</uri>
+ <manifest>manifests/svg-manifest-graphics.xml</manifest>
</namespace-->
</namespaces>