You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/09/24 03:16:47 UTC
[royale-asjs] 06/06: got SWFs to build in profiles
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch release/0.9.6
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 3b8c3184991bd4f1069ff446ad436f853d945aee
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Sep 23 20:16:13 2019 -0700
got SWFs to build in profiles
---
ApproveRoyale.xml | 5 ++++
examples/express/pom.xml | 70 +++++++++++++++++++++++++++++++++++++++++++
examples/royale/ASDoc/pom.xml | 14 +++++++++
pom.xml | 2 --
releasesteps.xml | 1 +
5 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 14eb10b..401274d 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -787,6 +787,10 @@
else="main">
<isset property="env.AIR_HOME" />
</condition>
+ <condition property="asjs_mvn_defines" value="-Dgenerate.swf.swcs=true"
+ else="-Ddummy=true">
+ <isset property="env.AIR_HOME" />
+ </condition>
<echo>Path is ${env.Path}</echo>
<exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-compiler" failonerror="true" >
<arg value="-P" />
@@ -805,6 +809,7 @@
<arg value="install" />
</exec>
<exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-asjs" failonerror="true" >
+ <arg value="${asjs_mvn_defines}" />
<arg value="clean" />
<arg value="-P" />
<arg value="${asjs_mvn_profiles}" />
diff --git a/examples/express/pom.xml b/examples/express/pom.xml
index eec39db..3e1d13b 100644
--- a/examples/express/pom.xml
+++ b/examples/express/pom.xml
@@ -80,6 +80,41 @@
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>Effects</artifactId>
<version>0.9.6-SNAPSHOT</version>
<type>swc</type>
@@ -104,6 +139,41 @@
</profiles>
<dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Effects</artifactId>
diff --git a/examples/royale/ASDoc/pom.xml b/examples/royale/ASDoc/pom.xml
index 2a99f17..2416b04 100644
--- a/examples/royale/ASDoc/pom.xml
+++ b/examples/royale/ASDoc/pom.xml
@@ -64,6 +64,13 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>RoyaleSite</artifactId>
<version>0.9.6-SNAPSHOT</version>
<type>swc</type>
@@ -82,6 +89,13 @@
<classifier>js</classifier>
</dependency>
<dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.6-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>RoyaleSite</artifactId>
<version>0.9.6-SNAPSHOT</version>
diff --git a/pom.xml b/pom.xml
index db3bf26..1060f23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -429,7 +429,6 @@
<id>generate-swf</id>
<properties>
<royale.example.targets>SWF,JSRoyale</royale.example.targets>
- <generate.swf>true</generate.swf>
</properties>
<dependencies>
<dependency>
@@ -446,7 +445,6 @@
<id>generate-swcs-for-swf</id>
<properties>
<royale.skipAS>false</royale.skipAS>
- <generate.swf.swcs>true</generate.swf.swcs>
</properties>
<dependencies>
<dependency>
diff --git a/releasesteps.xml b/releasesteps.xml
index 5c3edf1..9842e9c 100644
--- a/releasesteps.xml
+++ b/releasesteps.xml
@@ -194,6 +194,7 @@
<!-- build these modules -->
<exec executable="${mvn}" dir="${artifactfolder}/sources" failonerror="true" >
+ <arg value="-Dgenerate.swf.swcs=true" />
<arg value="clean" />
<arg value="install" />
<arg value="-P" />