You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/03/24 17:30:48 UTC
[royale-asjs] branch develop updated (29b25a6 -> 86e3b34)
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 29b25a6 change in Image
new a2afed8 Maven: builds framework with Apache airglobal/playerglobal when option-with-swf is specified
new 86e3b34 Maven Distribution: does not require Adobe artifacts to create a 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/pom.xml | 113 ++++++++++++++++++++++++++-------------------------
pom.xml | 7 ++--
2 files changed, 61 insertions(+), 59 deletions(-)
[royale-asjs] 02/02: Maven Distribution: does not require Adobe
artifacts to create a distribution
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 86e3b341beca569f2c2b862f2749b9e332e70ea0
Author: Josh Tynjala <jo...@bowlerhat.dev>
AuthorDate: Wed Mar 24 10:30:32 2021 -0700
Maven Distribution: does not require Adobe artifacts to create a distribution
If distributionTargetFolder is specified, Adobe artifacts are still required. The change is that a zip/tar.gz distribution does not include Adobe dependencies because they were not actually used. We could potentially use the Apache playerglobal for distributionTargetFolder, but we don't have a full alternative to the AIR SDK (only to airglobal).
---
distribution/pom.xml | 113 ++++++++++++++++++++++++++-------------------------
1 file changed, 57 insertions(+), 56 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index cc64fbb..f3dbf63 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -960,7 +960,64 @@
<artifactId>swfobject</artifactId>
<version>2.2</version>
</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>
+ <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>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${distributionTargetFolder}</directory>
+ </fileset>
+ </filesets>
+ <failOnError>false</failOnError>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-distribution-folder</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>./</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <outputDirectory>${distributionTargetFolder}</outputDirectory>
+ <descriptors>
+ <descriptor>src/main/assembly/${assembly.dir}</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
<dependency>
<groupId>com.adobe.flash</groupId>
<artifactId>framework</artifactId>
@@ -1037,62 +1094,6 @@
</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>
- <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>
- <configuration>
- <filesets>
- <fileset>
- <directory>${distributionTargetFolder}</directory>
- </fileset>
- </filesets>
- <failOnError>false</failOnError>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>create-distribution-folder</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>./</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <attach>false</attach>
- <outputDirectory>${distributionTargetFolder}</outputDirectory>
- <descriptors>
- <descriptor>src/main/assembly/${assembly.dir}</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<!-- <profile>
<id>_os-windows</id>
<activation>
[royale-asjs] 01/02: Maven: builds framework with Apache
airglobal/playerglobal when option-with-swf is specified
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit a2afed8abea888b0a24c7b09f73ebc5119eec85d
Author: Josh Tynjala <jo...@bowlerhat.dev>
AuthorDate: Wed Mar 24 10:27:35 2021 -0700
Maven: builds framework with Apache airglobal/playerglobal when option-with-swf is specified
---
pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index f4c7bbf..86c225c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -400,11 +400,12 @@
</properties>
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
+ <groupId>org.apache.royale.typedefs</groupId>
+ <artifactId>royale-typedefs-airglobal</artifactId>
+ <version>${royale.typedefs.version}</version>
<type>swc</type>
<scope>runtime</scope>
+ <classifier>swf</classifier>
</dependency>
</dependencies>
</profile>