[royale-asjs] branch release/0.9.6 updated: bad merge last time

[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


The following commit(s) were added to refs/heads/release/0.9.6 by this push:
     new 71372ff  bad merge last time
71372ff is described below

commit 71372ffb5bf5f4d8091e39258ab9c72f6937778e
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Sep 26 11:24:54 2019 -0700

    bad merge last time
---
 ApproveRoyale.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 7dfa534..cb543cf 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" inputstring="Yes">
+            <arg value="${asjs_mvn_defines}" />
             <arg value="clean" />
             <arg value="-P" />
             <arg value="${asjs_mvn_profiles}" />