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:42 UTC

[royale-asjs] 01/06: try to auto-detect which dependencies to use

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 26f92eedc5d33f3cc12a62e8ec367e6ca2c082e5
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Sep 22 19:48:37 2019 -0700

    try to auto-detect which dependencies to use
---
 ApproveRoyale.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index a851b5a..14eb10b 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -779,6 +779,10 @@
     </target>
 
     <target name="build_maven">
+        <condition property="compiler_mvn_profiles" value="test-using-swf,main"
+            else="main">
+            <isset property="env.AIR_HOME" />
+        </condition>
         <condition property="asjs_mvn_profiles" value="generate-swcs-for-swf,generate-swf,main"
             else="main">
             <isset property="env.AIR_HOME" />
@@ -792,6 +796,8 @@
         </exec>
         <exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-compiler" failonerror="true" >
             <arg value="clean" />
+            <arg value="-P" />
+            <arg value="${compiler_mvn_profiles}" />
             <arg value="install" />
         </exec>
         <exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-typedefs" failonerror="true" >