You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/10/12 22:37:06 UTC
[10/18] git commit: [flex-falcon] [refs/heads/develop] - tweak
packaging so we no longer need full flex-sdk
tweak packaging so we no longer need full flex-sdk
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3821d2b6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3821d2b6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3821d2b6
Branch: refs/heads/develop
Commit: 3821d2b609e7b0a8c40d11940dcfb26ad57a754a
Parents: fff4f1f
Author: Alex Harui <ah...@apache.org>
Authored: Mon Oct 12 13:06:39 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Oct 12 13:06:39 2015 -0700
----------------------------------------------------------------------
build.xml | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3821d2b6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 19ed873..65b3abc 100644
--- a/build.xml
+++ b/build.xml
@@ -72,7 +72,7 @@
<target name="jx" depends="compiler.jx, extern.swcs, compiler.jx.tests" description="Builds FalconJX" />
- <target name="oem" depends="check-flex-home, compiler.oem" description="Builds FB Integration JAR" />
+ <target name="oem" depends="compiler.oem" description="Builds FB Integration JAR" />
<target name="compiler.binary.release" >
<ant dir="compiler" target="release-binaries" />
@@ -149,7 +149,7 @@
</copy>
</target>
- <target name="swfutils" depends="check-flex-home,swfutils_check,swfutils_copy"
+ <target name="swfutils" depends="swfutils_check,check-flex-home,swfutils_copy"
description="Builds swfutils.jar">
<mkdir dir="swfutils" />
<mkdir dir="swfutils/src" />
@@ -179,6 +179,11 @@
type="dir"
property="swfutils.bundled"
value="true" />
+ <!-- set this to skip FLEX_HOME check -->
+ <available file="swfutils"
+ type="dir"
+ property="mxmlc.jar.exists"
+ value="true" />
</target>
<target name="compiler.jx" description="Builds FalconJX.">
@@ -344,9 +349,12 @@
<!-- compiler -->
<antcall target="stage-fb-integration"/>
- <!-- exters -->
+ <!-- externs -->
<antcall target="stage-externs"/>
+ <!-- copy the flex-sdk files that go in bin-legacy -->
+ <ant dir="compiler" target="stage.sdk" />
+
<!--
Source files have Windows line endings. Most UNIX editors can handle
either type of line endings but the converse is often not true.
@@ -679,6 +687,9 @@
<filelist dir="${FLEX_SDK_HOME}" files="LICENSE,LICENSE.bin"/>
</concat-->
+ <!-- copy the flex-sdk files that go in generated/dist/sdk -->
+ <ant dir="compiler" target="copy.sdk" />
+
<!-- generated -->
<copy todir="${basedir}/temp/compiler/generated/dist/sdk">
<fileset dir="${basedir}/compiler/generated/dist/sdk">