You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/12/30 07:05:15 UTC
git commit: [flex-sdk] [refs/heads/develop] - flash integration not
supported on linux
Repository: flex-sdk
Updated Branches:
refs/heads/develop 35214ffd3 -> cfc19471e
flash integration not supported on linux
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cfc19471
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cfc19471
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cfc19471
Branch: refs/heads/develop
Commit: cfc19471e508207c45c83092964810b8e4454c6c
Parents: 35214ff
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Dec 30 18:04:56 2017 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Dec 30 18:04:56 2017 +1100
----------------------------------------------------------------------
frameworks/build.xml | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cfc19471/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 2e71195..7a31bdc 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -108,7 +108,7 @@
Should consider updating the OSMF and TLF versions in use.
-->
- <target name="compile" description="Builds all SWCs but not their resource bundles" depends="flex-config">
+ <target name="compile" description="Builds all SWCs but not their resource bundles" depends="flex-config,flash-integration.compile">
<antcall target="framework"/>
<antcall target="mx"/>
<antcall target="textLayout"/>
@@ -123,7 +123,6 @@
<antcall target="mobilecomponents"/>
<antcall target="mobiletheme"/>
<antcall target="core"/>
- <antcall target="flash_integration"/>
<antcall target="authoringsupport"/>
<antcall target="halo"/>
<antcall target="wireframe"/>
@@ -134,6 +133,10 @@
<antcall target="compile-automation"/>
<antcall target="flatspark"/>
</target>
+
+ <target name="flash-integration.compile" unless="isLinux">
+ <antcall target="flash_integration" />
+ </target>
<target name="test" description="Runs the tests for all projects that have FlexUnit tests">
<delete dir="${FLEX_HOME}/test-reports"/>
@@ -262,7 +265,7 @@
<antcall target="automation_airspark"/>
</target>
- <target name="other.locales" description ="Builds resource SWCs for all locales">
+ <target name="other.locales" depends="flash-integration.other.locales" description ="Builds resource SWCs for all locales">
<ant dir="${basedir}/projects/framework" target="other.locales"/>
<ant dir="${basedir}/projects/mx" target="other.locales"/>
<ant dir="${basedir}/projects/textLayout" target="other.locales"/>
@@ -274,7 +277,6 @@
<ant dir="${basedir}/projects/spark" target="other.locales"/>
<ant dir="${basedir}/projects/mobilecomponents" target="other.locales" />
<ant dir="${basedir}/projects/playerglobal" target="other.locales" />
- <ant dir="${basedir}/projects/flash-integration" target="other.locales"/>
<ant dir="${basedir}/projects/automation" target="other.locales"/>
<ant dir="${basedir}/projects/automation_agent" target="other.locales"/>
<ant dir="${basedir}/projects/tool" target="other.locales"/>
@@ -283,8 +285,12 @@
<ant dir="${basedir}/projects/experimental" target="other.locales"/>
<ant dir="${basedir}/projects/experimental_mobile" target="other.locales"/>
</target>
+
+ <target name="flash-integration.other.locales" unless="isLinux">
+ <ant dir="${basedir}/projects/flash-integration" target="other.locales"/>
+ </target>
- <target name="doc" >
+ <target name="doc" depends="flash-integration.doc">
<ant dir="${basedir}/projects/framework" target="doc" />
<ant dir="${basedir}/projects/mx" target="doc" />
<ant dir="${basedir}/projects/textLayout" target="doc" />
@@ -301,7 +307,6 @@
<ant dir="${basedir}/projects/core" target="doc" />
<ant dir="${basedir}/projects/authoringsupport" target="doc" />
<ant dir="${basedir}/projects/wireframe" target="doc" />
- <ant dir="${basedir}/projects/flash-integration" target="doc" />
<!-- removed until sources donated to Apache -->
<!--
<ant dir="${basedir}/projects/automation" target="doc" />
@@ -311,6 +316,10 @@
<ant dir="${basedir}/projects/experimental_mobile" target="doc" />
<!-- ant dir="${basedir}/projects/flatspark" target="doc" / -->
</target>
+
+ <target name="flash-integration.doc" unless="isLinux">
+ <ant dir="${basedir}/projects/flash-integration" target="doc" />
+ </target>
<!--
Cleanup
@@ -322,7 +331,7 @@
<ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}"/>
</target>
- <target name="clean" depends="check-tlf-home,automation-clean,airsdk-clean" description="Cleans all SWCs and their resource bundles">
+ <target name="clean" depends="check-tlf-home,automation-clean,airsdk-clean,flash-integration.clean" description="Cleans all SWCs and their resource bundles">
<delete file="${basedir}/flex-config.xml"/>
<delete file="${basedir}/air-config.xml"/>
<delete file="${basedir}/airmobile-config.xml"/>
@@ -340,7 +349,6 @@
<ant dir="${basedir}/projects/sparkskins" target="clean"/>
<ant dir="${basedir}/projects/halo" target="clean"/>
<ant dir="${basedir}/projects/wireframe" target="clean"/>
- <ant dir="${basedir}/projects/flash-integration" target="clean"/>
<ant dir="${basedir}/projects/rpc" target="clean"/>
<ant dir="${basedir}/projects/authoringsupport" target="clean"/>
<ant dir="${basedir}/projects/charts" target="clean"/>
@@ -372,6 +380,10 @@
<delete file="macFonts.ser"/>
<delete file="winFonts.ser"/>
</target>
+
+ <target name="flash-integration.clean" unless="isLinux">
+ <ant dir="${basedir}/projects/flash-integration" target="clean"/>
+ </target>
<target name="automation-clean" description="Builds all automation SWCs but not their resource bundles">
<ant dir="${basedir}/projects/automation_agent" target="clean"/>
@@ -385,7 +397,6 @@
<ant dir="${basedir}/projects/tool_air" target="clean"/>
</target>
-
<target name="airsdk-clean" description="Delete files copied from the AIR SDK">
<!-- Delete AIR files and directories from 'prepare' target -->
<delete file="${FLEX_HOME}/AIR SDK license.pdf"/>