[royale-asjs] 02/02: use correct maven profiles for swf and js-only

[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>