royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-asjs] 04/04: add flash switch
Date Thu, 18 Jan 2018 19:49:19 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit fe4f0aa8b63c6241ad1787bfa157de985c0ed535
Author: Alex Harui <aharui@apache.org>
AuthorDate: Thu Jan 18 11:47:45 2018 -0800

    add flash switch
---
 ApproveRoyale.xml    | 48 +++++++++++++++++++++++++-----------------------
 releasecandidate.xml |  2 ++
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index e8144f2..a9d4212 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -88,27 +88,29 @@
     <fail message="The ANT_HOME environment variable is not set."
         unless="env.ANT_HOME"/>
 		
-	<available file="${env.AIR_HOME}"
-		type="dir" 
-		property="AIR_HOME" value="${env.AIR_HOME}" />
+        <target name="check-flash" if="use-flash">
+        <available file="${env.AIR_HOME}"
+            type="dir" 
+            property="AIR_HOME" value="${env.AIR_HOME}" />
 
-    <fail message="The AIR_HOME property is not set in environment or command-line."
-        unless="AIR_HOME"/>
-		
-    <available file="${env.PLAYERGLOBAL_HOME}"
-        type="dir"
-        property="PLAYERGLOBAL_HOME" value="${env.PLAYERGLOBAL_HOME}" />
-    
-    <fail message="The PLAYERGLOBAL_HOME property is not set in environment or command-line."
-        unless="PLAYERGLOBAL_HOME"/>
-    
-    <available file="${env.FLASHPLAYER_DEBUGGER}"
-        type="file"
-        property="FLASHPLAYER_DEBUGGER" value="${env.FLASHPLAYER_DEBUGGER}" />
-    
-    <fail message="The FLASHPLAYER_DEBUGGER property is not set in environment or command-line."
-        unless="FLASHPLAYER_DEBUGGER"/>
-    
+        <fail message="The AIR_HOME property is not set in environment or command-line."
+            unless="AIR_HOME"/>
+            
+        <available file="${env.PLAYERGLOBAL_HOME}"
+            type="dir"
+            property="PLAYERGLOBAL_HOME" value="${env.PLAYERGLOBAL_HOME}" />
+        
+        <fail message="The PLAYERGLOBAL_HOME property is not set in environment or command-line."
+            unless="PLAYERGLOBAL_HOME"/>
+        
+        <available file="${env.FLASHPLAYER_DEBUGGER}"
+            type="file"
+            property="FLASHPLAYER_DEBUGGER" value="${env.FLASHPLAYER_DEBUGGER}" />
+        
+        <fail message="The FLASHPLAYER_DEBUGGER property is not set in environment or
command-line."
+            unless="FLASHPLAYER_DEBUGGER"/>
+    </target>
+        
     <available file="${env.ANT_HOME}/lib/${apache.rat.jar}"
         type="file"
         property="apache.rat.found"/>
@@ -193,10 +195,10 @@
         classpathref="anttask.classpath"/>
     </target>
 
-    <target name="main" depends="write-out-jars-list,install-rat,download,check-sigs,uncompress,copy-source-for-maven,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve"
description="Perform required release approval steps">
+    <target name="main" depends="check-flash,write-out-jars-list,install-rat,download,check-sigs,uncompress,copy-source-for-maven,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve"
description="Perform required release approval steps">
     </target>
     
-    <target name="main-no-download" depends="write-out-jars-list,install-rat,check-sigs,uncompress,copy-source-for-maven,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve"
description="Perform required release approval steps">
+    <target name="main-no-download" depends="check-flash,write-out-jars-list,install-rat,check-sigs,uncompress,copy-source-for-maven,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve"
description="Perform required release approval steps">
     </target>
 	
     <target name="copy-source-for-maven">
@@ -746,7 +748,7 @@
         defaultvalue="y" />
     </target>
 
-    <target name="build" depends="ask.build,ask-font,get.dependencies,copy.downloads">
+    <target name="build" depends="check-flash,ask.build,ask-font,get.dependencies,copy.downloads">
         <property name="no.lint" value="true" />
         <ant dir="${basedir}/${package.url.name}/royale-asjs" target="all" />
         <ant dir="${basedir}/${package.url.name}/royale-asjs" target="examples" />
diff --git a/releasecandidate.xml b/releasecandidate.xml
index a3cf9df..448c767 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -888,6 +888,8 @@ package and signature files, unzipping, etc, you can instead:\n\
 https://dist.apache.org/repos/dist/dev/royale/${release.version}/rc${rc}/ApproveRoyale.xml\n\
 3) run the script:\n\
    ant -e -f ApproveRoyale.xml -Drelease.version=${release.version} -Drc=${rc}\n\
+   If you want to test SWF support during the approval, use:\n\
+   ant -e -f ApproveRoyale.xml -Drelease.version=${release.version} -Drc=${rc} -Duse-flash=true\n\
 \n\
 You are not required to use this script, and more testing of the packages\n\
 and build results are always encouraged.\n\

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.

Mime
View raw message