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 2020/05/03 18:27:17 UTC

[royale-asjs] 02/04: update profiles in approval script

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch release/0.9.7
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 6977a1b095dcbd16417ca7601507896c424c912c
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun May 3 10:40:43 2020 -0700

    update profiles in approval script
---
 ApproveRoyale.xml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 400c4ef..ebfa5db 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -781,28 +781,17 @@
     </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">
+        <condition property="compiler_mvn_profiles" value="-Poption-with-swf"
+            else="-Ddummy=true">
             <isset property="env.AIR_HOME" />
         </condition>
-        <condition property="asjs_mvn_defines" value="-Dgenerate.swf.swcs=true"
-            else="-Ddummy=true">
+        <condition property="asjs_mvn_profiles" value="-Pwith-examples,with-distribution,option-with-swf"
+            else="-Pwith-examples,with-distribution">
             <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" />
-            <arg value="-main,utils" />
-            <arg value="clean" />
-            <arg value="install" />
-        </exec>
         <exec executable="${mvn}" dir="${basedir}/${maven.package.url.name}/royale-compiler" failonerror="true" inputstring="Yes">
             <arg value="clean" />
-            <arg value="-P" />
             <arg value="${compiler_mvn_profiles}" />
             <arg value="install" />
         </exec>
@@ -811,9 +800,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}" />
             <arg value="install" />
         </exec>