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 2016/07/20 17:31:27 UTC
git commit: [flex-asjs] [refs/heads/develop] - fix up build for
flex-typedefs repo
Repository: flex-asjs
Updated Branches:
refs/heads/develop b1d4e9afc -> 6c83ea5cf
fix up build for flex-typedefs repo
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6c83ea5c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6c83ea5c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6c83ea5c
Branch: refs/heads/develop
Commit: 6c83ea5cfc37ec5dc2bb8e430c02b81fd97d1bfa
Parents: b1d4e9a
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jul 20 10:30:58 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jul 20 10:31:17 2016 -0700
----------------------------------------------------------------------
build.xml | 47 ++++++++++++++++++++++++++++++++++++++++-
examples/build_example.xml | 8 +++----
2 files changed, 50 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6c83ea5c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7a388a3..a2e6b0a 100644
--- a/build.xml
+++ b/build.xml
@@ -322,6 +322,30 @@
unless="FALCONJX_HOME"/>
</target>
+ <target name="check-typedef-home" unless="FLEXJS_TYPEDEFS_HOME"
+ description="Check FALCON_HOME is a directory.">
+
+ <echo message="FLEXJS_TYPEDEFS_HOME is ${env.FLEXJS_TYPEDEFS_HOME}"/>
+
+ <available file="${env.FLEXJS_TYPEDEFS_HOME}/js/target/js.swc"
+ type="file"
+ property="FLEXJS_TYPEDEFS_HOME"
+ value="${env.FLEXJS_TYPEDEFS_HOME}"/>
+
+ <available file="${basedir}/../flex-typedefs/js/target/js.swc"
+ type="file"
+ property="FLEXJS_TYPEDEFS_HOME"
+ value="${basedir}/../flex-typedefs"/>
+
+ <available file="${basedir}/js/target/js.swc"
+ type="file"
+ property="FLEXJS_TYPEDEFS_HOME"
+ value="${basedir}"/>
+
+ <fail message="FLEXJS_TYPEDEFS_HOME must be set to a folder containing js/target/js.swc such as the flex-typedefs repo"
+ unless="FLEXJS_TYPEDEFS_HOME"/>
+ </target>
+
<target name="create-description" description="Generate flex-sdk-description.xml" unless="airsdk.found">
<tstamp>
<format property="build.number.date" pattern="yyyyMMdd" />
@@ -366,7 +390,7 @@
<target name="copy-externs" description="Copy extern swcs into this folder">
<mkdir dir="${basedir}/js/libs" />
<copy todir="${basedir}/js/libs" flatten="true">
- <fileset dir="${FALCONJX_HOME}/../externs">
+ <fileset dir="${FLEXJS_TYPEDEFS_HOME}">
<include name="**/*.swc"/>
</fileset>
</copy>
@@ -1612,6 +1636,7 @@
<antcall target="warn-before-clone" />
<antcall target="clone-flex-asjs" />
<antcall target="clone-flex-falcon" />
+ <antcall target="clone-flex-typedefs" />
<antcall target="clone-flex-flexunit" />
<antcall target="clone-flex-sdk" />
<antcall target="clone-flex-tlf" />
@@ -1664,6 +1689,25 @@
</exec>
</target>
+ <target name="check-flex-typedefs">
+ <available file="${base.folder.name}/flex-typedefs"
+ type="dir"
+ property="flex-typedefs-exists"/>
+ </target>
+
+ <target name="clone-flex-typedefs" depends="check-flex-typedefs" unless="flex-typedefs-exists">
+ <echo>cloning flex-typedefs repo into ${base.folder.name}/flex-typedefs</echo>
+ <exec executable="git" failonerror="true" dir="${base.folder.name}">
+ <arg value="clone" />
+ <arg value="https://git-wip-us.apache.org/repos/asf/flex-typedefs.git" />
+ <arg value="flex-typedefs" />
+ </exec>
+ <exec executable="git" failonerror="true" dir="${base.folder.name}/flex-typedefs">
+ <arg value="checkout" />
+ <arg value="develop" />
+ </exec>
+ </target>
+
<target name="check-flex-sdk">
<available file="${base.folder.name}/flex-sdk"
type="dir"
@@ -1758,6 +1802,7 @@
<ant dir="${base.folder.name}/flex-sdk" />
<property name="javadoc.zip.uptodate" value="set" /> <!-- javadoc fails on windows? -->
<ant dir="${base.folder.name}/flex-falcon" target="all" />
+ <ant dir="${base.folder.name}/flex-typedefs" />
<ant dir="${base.folder.name}/flex-flexunit" inheritAll="false" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6c83ea5c/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index aa0393f..5e1c12d 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -29,12 +29,12 @@
</and>
</condition>
- <condition property="FALCON_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk">
+ <condition property="FALCON_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler/lib">
<and>
<not>
<isset property="FALCON_HOME" />
</not>
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" type="file" />
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar" type="file" />
</and>
</condition>
@@ -65,12 +65,12 @@
</and>
</condition>
- <condition property="FALCONJX_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler.jx">
+ <condition property="FALCONJX_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler-jx">
<and>
<not>
<isset property="FALCONJX_HOME" />
</not>
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" type="file" />
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" type="file" />
</and>
</condition>