You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/03/24 23:16:03 UTC
[royale-asjs] branch develop updated: Ant: fix for release after
airglobal/playerglobal changes
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 646af1c Ant: fix for release after airglobal/playerglobal changes
646af1c is described below
commit 646af1c173dddb2aeff89528ec354a6807960cac
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Mar 24 16:15:45 2021 -0700
Ant: fix for release after airglobal/playerglobal changes
---
build.xml | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index d2d6a12..ab8a80d 100644
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,9 @@
<property environment="env"/>
<property file="${ROYALE_HOME}/local.properties"/>
<property file="${ROYALE_HOME}/build.properties"/>
+ <condition property="swf.distribution">
+ <isset property="env.AIR_HOME" />
+ </condition>
<property name="debug" value="true"/>
<property name="strict" value="true"/>
@@ -47,7 +50,7 @@
<property name="source.kit" value="${kit.prefix}-src"/>
<condition property="binary.kit" value="${kit.prefix}-bin-js">
<not>
- <isset property="env.AIR_HOME" />
+ <isset property="swf.distribution" />
</not>
</condition>
<property name="binary.kit" value="${kit.prefix}-bin-js-swf"/>
@@ -68,15 +71,15 @@
</not>
</and>
</condition>
- <!-- turn off SWF portion of checkintest if no AIR_HOME -->
+ <!-- turn off SWF portion of checkintest if no swf.distribution -->
<condition property="runtime.setup">
<not>
- <isset property="env.AIR_HOME" />
+ <isset property="swf.distribution" />
</not>
</condition>
<condition property="mxmlc.jar.exists">
<not>
- <isset property="env.AIR_HOME" />
+ <isset property="swf.distribution" />
</not>
</condition>
@@ -998,7 +1001,7 @@ limitations under the License.
</target>
- <target name="jsonly-package" if="env.AIR_HOME"
+ <target name="jsonly-package" if="swf.distribution"
description="subset binary package to be a js-only package if AIR_HOME is set and we built a SWF+JS package">
<!-- assumes temp folder contains the binary package with SWF stuff in it -->
<delete dir="${basedir}/temp/royale-asjs/frameworks/libs" failonerror="false" includeEmptyDirs="true" />
@@ -1099,7 +1102,7 @@ limitations under the License.
<property name="env.GOOG_HOME" value="${staging-dir}/js/lib/google/closure-library" />
</target>
- <target name="tweak-for-jsonly" unless="env.AIR_HOME" description="do a few more things so the JSOnly package works">
+ <target name="tweak-for-jsonly" unless="swf.distribution" description="do a few more things so the JSOnly package works">
<copy file="${ROYALE_HOME}/js/libs/js.swc"
tofile="${ROYALE_HOME}/frameworks/libs/KeepsFBFromHanging.swc" failonerror="false"/>
<copy file="${basedir}/npm/js-only/package.json" todir="${basedir}/temp" overwrite="true"/>
@@ -1322,7 +1325,7 @@ limitations under the License.
</target>
- <target name="basictests-compile-js" depends="load-task" unless="env.AIR_HOME">
+ <target name="basictests-compile-js" depends="load-task" unless="swf.distribution">
<property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
<property name="ROYALE_COMPILER_HOME" value="${ROYALE_HOME}/js"/>
<property name="GOOG_HOME" value="${env.GOOG_HOME}"/>
@@ -1371,9 +1374,9 @@ limitations under the License.
Tests: Mustella checkintests
-->
- <target name="basictests-mustella" depends="mustella-setup,basictests" if="env.AIR_HOME" unless="skipTests"/>
+ <target name="basictests-mustella" depends="mustella-setup,basictests" if="swf.distribution" unless="skipTests"/>
- <target name="mustella-setup" depends="prebuild,runtime-setup" description="compile mustella java file" if="env.AIR_HOME" unless="skipTests">
+ <target name="mustella-setup" depends="prebuild,runtime-setup" description="compile mustella java file" if="swf.distribution" unless="skipTests">
<ant dir="${basedir}/mustella" />
<!--
<ant dir="${basedir}/mustella" target="makemustellaswc">
@@ -1387,7 +1390,7 @@ limitations under the License.
<!-- To run the checkintests as well as any mustella tests need AIR for the adl and
a flash player content debugger.
-->
- <target name="check-runtime-env" depends="check-air-home" if="env.AIR_HOME"
+ <target name="check-runtime-env" depends="check-air-home" if="swf.distribution"
description="Check for the required runtime environment variables for the checkintests">
<available file="${env.FLASHPLAYER_DEBUGGER}" property="FLASHPLAYER_DEBUGGER.set"/>
@@ -1424,7 +1427,7 @@ limitations under the License.
<taskdef resource="flexTasks.tasks" classpath="${basedir}/js/lib/compiler-royaleTasks.jar"/>
</target>
- <target name="basictests" depends="load-task,basictests-compile-java" description="run basic tests using mustella" if="env.AIR_HOME" unless="skipTests">
+ <target name="basictests" depends="load-task,basictests-compile-java" description="run basic tests using mustella" if="swf.distribution" unless="skipTests">
<property name="ROYALE_COMPILER_HOME" value="${basedir}/js" />
<property name="ROYALE_HOME" value="${basedir}" />
<mxmlc fork="true" debug="true"
@@ -1497,11 +1500,11 @@ limitations under the License.
<delete dir="${basedir}/mustella/tests/mxtests/basicTests/bin" failonerror="false" includeEmptyDirs="true"/>
</target>
- <target name="mxtests-mustella" depends="mustella-setup,mxtests" if="env.AIR_HOME" />
+ <target name="mxtests-mustella" depends="mustella-setup,mxtests" if="swf.distribution" />
<target name="mxtests-compile-java" depends="basictests-compile-java" />
- <target name="mxtests" depends="load-task,mxtests-compile-java" description="run MX tests using mustella" if="env.AIR_HOME">
+ <target name="mxtests" depends="load-task,mxtests-compile-java" description="run MX tests using mustella" if="swf.distribution">
<property name="ROYALE_COMPILER_HOME" value="${basedir}/js" />
<property name="ROYALE_HOME" value="${basedir}" />
<mxmlc fork="true" debug="true" configname="flex"
@@ -1595,7 +1598,7 @@ limitations under the License.
</target>
- <target name="mxtests-compile-js" depends="load-task" unless="env.AIR_HOME">
+ <target name="mxtests-compile-js" depends="load-task" unless="swf.distribution">
<property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
<property name="ROYALE_COMPILER_HOME" value="${ROYALE_HOME}/js"/>
<property name="GOOG_HOME" value="${env.GOOG_HOME}"/>
@@ -1744,13 +1747,13 @@ limitations under the License.
<checksum algorithm="SHA-512" file="${basedir}/out/${source.kit}.zip" forceOverwrite="yes" fileext=".sha512"/>
</target>
- <target name="create-SHA-512-jsonly" if="env.AIR_HOME" >
+ <target name="create-SHA-512-jsonly" if="swf.distribution" >
<echo message="Generating SHA-512 hashes for release artifacts"/>
<checksum algorithm="SHA-512" file="${basedir}/out/${binary-js.kit}.tar.gz" forceOverwrite="yes" fileext=".sha512"/>
<checksum algorithm="SHA-512" file="${basedir}/out/${binary-js.kit}.zip" forceOverwrite="yes" fileext=".sha512"/>
</target>
- <target name="sign-jsonly" if="env.AIR_HOME" >
+ <target name="sign-jsonly" if="swf.distribution" >
<exec executable="gpg">
<arg value="--armor" />
<arg value="--output" />