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/19 21:43:22 UTC
[royale-asjs] branch release/0.9.6 updated (55f3786 -> 97fff9e)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch release/0.9.6
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 55f3786 fix ASDoc js-only
new e0bec43 need to copy-externs before creating config for js-only because it wants js.swc
new 97fff9e use correct maven profiles for swf and js-only
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:
ApproveRoyale.xml | 10 ++++++++--
build.xml | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
[royale-asjs] 01/02: need to copy-externs before creating config
for js-only because it wants js.swc
Posted by ah...@apache.org.
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 e0bec432a7e32c7a9cb7eadad52edd3fcc00fe69
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Sep 19 12:50:06 2019 -0700
need to copy-externs before creating config for js-only because it wants js.swc
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 29f2895..3edc707 100644
--- a/build.xml
+++ b/build.xml
@@ -203,7 +203,7 @@
<property name="no.thirdparty-downloads" value="set" />
</target>
- <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,create-config,copy-externs,copy-compiler"
+ <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,copy-externs,copy-compiler,create-config"
description="Stuff that needs to be done before any builds." unless="airsdk.found"/>
<target name="check-compile-env" depends="check-playerglobal-home,check-air-home,check-compiler-home" unless="airsdk.found"
[royale-asjs] 02/02: use correct maven profiles for swf and js-only
Posted by ah...@apache.org.
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 97fff9e9f44d12605724928df38e9f718af9bfbb
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Sep 19 14:17:10 2019 -0700
use correct maven profiles for swf and js-only
---
ApproveRoyale.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index e1c4c93..a851b5a 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -88,7 +88,7 @@
<fail message="The ANT_HOME environment variable is not set."
unless="env.ANT_HOME"/>
- <target name="check-flash" if="use-flash">
+ <target name="check-flash" if="use-flash">
<available file="${env.AIR_HOME}"
type="dir"
property="AIR_HOME" value="${env.AIR_HOME}" />
@@ -778,7 +778,11 @@
<antcall target="build_maven" />
</target>
- <target name="build_maven" >
+ <target name="build_maven">
+ <condition property="asjs_mvn_profiles" value="generate-swcs-for-swf,generate-swf,main"
+ else="main">
+ <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" />
@@ -796,6 +800,8 @@
</exec>
<exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-asjs" failonerror="true" >
<arg value="clean" />
+ <arg value="-P" />
+ <arg value="${asjs_mvn_profiles}" />
<arg value="install" />
</exec>
</target>