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 2014/04/06 07:39:45 UTC
[23/26] git commit: [flex-falcon] [refs/heads/develop] - upgrade
installation to handle fb integration. Should make integration with other
IDEs better as well.
upgrade installation to handle fb integration. Should make integration with other IDEs better as well.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e0b3b4fe
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e0b3b4fe
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e0b3b4fe
Branch: refs/heads/develop
Commit: e0b3b4fe95de8a1cb9e93d738ae63224f49611a3
Parents: caa7973
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 4 06:52:11 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 4 06:52:11 2014 -0700
----------------------------------------------------------------------
build.xml | 55 +++++++++++++++++++++++++++++++++++++++-
compiler/build.xml | 26 ++++++++++++++-----
flex-compiler-oem/build.xml | 6 ++---
installer.xml | 23 ++++++++++++-----
4 files changed, 92 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e0b3b4fe/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index cd59d4a..6baf9b9 100644
--- a/build.xml
+++ b/build.xml
@@ -156,7 +156,7 @@
description="Packages the source release kit which is the official Apache release."/>
<target name="binary-release"
- depends="setup-binary-release,compiler.binary.release,compiler.jx,binary-package,javadoc"
+ depends="setup-binary-release,compiler.binary.release,compiler.jx,compiler.oem,binary-package,javadoc"
description="Builds and packages the binary kit which is provided as a convenience."/>
<!--
@@ -227,6 +227,9 @@
<!-- compiler.tests -->
<antcall target="stage-compiler.tests"/>
+ <!-- compiler -->
+ <antcall target="stage-fb-integration"/>
+
<!--
Source files have Windows line endings. Most UNIX editors can handle
either type of line endings but the converse is often not true.
@@ -280,6 +283,18 @@
<!--<antcall target="version-update"/>-->
</target>
+ <target name="stage-fb-integration">
+ <copy todir="${basedir}/temp/flex-compiler-oem" includeEmptyDirs="false">
+ <fileset dir="${basedir}/flex-compiler-oem">
+ <include name="**"/>
+ <exclude name=".classpath" />
+ <exclude name=".project" />
+ <exclude name=".settings/**" />
+ <exclude name="bin/**"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="stage-compiler.tests">
<copy todir="${basedir}/temp/compiler.tests" includeEmptyDirs="false">
<fileset dir="${basedir}/compiler.tests">
@@ -378,6 +393,44 @@
</fileset>
</copy>
+ <fixcrlf srcdir="${basedir}/temp/compiler/generated/dist/sdk/bin" eol="unix" fixlast="false">
+ <include name="aasdoc"/>
+ <include name="acompc"/>
+ <include name="adl"/>
+ <include name="amxmlc"/>
+ <include name="asc"/>
+ <include name="asdoc"/>
+ <include name="compc"/>
+ <include name="copylocale"/>
+ <include name="digest"/>
+ <include name="fcsh"/>
+ <include name="fdb"/>
+ <include name="fontswf"/>
+ <include name="mxmlc"/>
+ <include name="optimizer"/>
+ <include name="swcdepends"/>
+ <include name="swfdump"/>
+ </fixcrlf>
+
+ <fixcrlf srcdir="${basedir}/temp/compiler/generated/dist/sdk/bin-legacy" eol="unix" fixlast="false">
+ <include name="aasdoc"/>
+ <include name="acompc"/>
+ <include name="adl"/>
+ <include name="amxmlc"/>
+ <include name="asc"/>
+ <include name="asdoc"/>
+ <include name="compc"/>
+ <include name="copylocale"/>
+ <include name="digest"/>
+ <include name="fcsh"/>
+ <include name="fdb"/>
+ <include name="fontswf"/>
+ <include name="mxmlc"/>
+ <include name="optimizer"/>
+ <include name="swcdepends"/>
+ <include name="swfdump"/>
+ </fixcrlf>
+
<antcall target="binary-package-zip"/>
<antcall target="binary-package-tgz"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e0b3b4fe/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 1a71926..92ea3e2 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -768,32 +768,44 @@
-->
+ <target name="bin-legacy">
+ <copy todir="${sdk}/bin-legacy" includeEmptyDirs="false">
+ <fileset dir="${sdk.branch}/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <replace dir="${sdk}/bin-legacy" value="/lib-legacy/" >
+ <include name="**/*"/>
+ <replacetoken>/lib/</replacetoken>
+ </replace>
+ </target>
+
<target name="set.flex.config.xml.available">
<available property="flex.config.xml.available" file="${sdk}/frameworks/flex-config.xml"/>
</target>
- <target name="copy.sdk" depends="set.flex.config.xml.available" unless="flex.config.xml.available"
+ <target name="copy.sdk" depends="bin-legacy,set.flex.config.xml.available" unless="flex.config.xml.available"
description="Copy a subset of the Flex SDK to our Falcon SDK area." >
<echo message="Copying SDK"/>
<!-- Copy portions of this SDK to create Falcon's generated SDK -->
<copy todir="${sdk}" includeEmptyDirs="false">
<fileset dir="${sdk.branch}">
- <include name="lib/**/*"/>
<include name="frameworks/**/*"/>
<exclude name="frameworks/projects/**/*"/>
</fileset>
</copy>
+ <copy todir="${sdk}/lib-legacy" failOnError="false" overwrite="false">
+ <fileset dir="${sdk.branch}/lib">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
<!-- If sdk.branch is set to binary distro flexTasks is in a different place. -->
<copy todir="${sdk}/lib" failOnError="false" overwrite="false">
<fileset dir="${sdk.branch}/ant/lib">
<include name="flexTasks.jar"/>
</fileset>
</copy>
- <copy todir="${sdk}/bin-legacy" includeEmptyDirs="false">
- <fileset dir="${sdk.branch}/bin">
- <include name="**/*"/>
- </fileset>
- </copy>
+
<copy todir="${sdk}/bin" includeEmptyDirs="false">
<fileset dir="${compiler}/commandline">
<include name="**/*"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e0b3b4fe/flex-compiler-oem/build.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index c65d02c..f301987 100644
--- a/flex-compiler-oem/build.xml
+++ b/flex-compiler-oem/build.xml
@@ -41,9 +41,6 @@
<!-- Properties can be overridden locally by loading a local.properties file -->
<property file="${compiler}/local.properties"/>
- <property name="env.FLEX_HOME" value="${compiler}/generated/dist/sdk"/>
- <property name="env.PLAYERGLOBAL_HOME" value="${compiler}/generated/dist/sdk/frameworks/libs/player"/>
-
<!-- set FLEX_HOME from environment if not already set -->
<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
@@ -81,6 +78,7 @@
-->
<path id="classpath">
+ <fileset dir="${FLEX_HOME}/lib" includes="swfutils.jar"/>
<fileset dir="${sdk}/lib" includes="**/*.jar"/>
</path>
@@ -129,7 +127,7 @@
<attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
<attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
<attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
- <attribute name="Class-Path" value="mxmlc.jar compc.jar swfutils.jar"/>
+ <attribute name="Class-Path" value="falcon-mxmlc.jar falcon-compc.jar ../lib-legacy/swfutils.jar"/>
</manifest>
</jar>
</target>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e0b3b4fe/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 7eaae6b..0eb1ed9 100644
--- a/installer.xml
+++ b/installer.xml
@@ -84,7 +84,7 @@
<os family="unix" />
</condition>
- <target name="overlay" depends="download,copyfiles,download.jx,copyfiles.jx" description="Places Falcon and FalconJX files in an SDK folder">
+ <target name="overlay" depends="movefiles,download,copyfiles,download.jx,copyfiles.jx" description="Places Falcon and FalconJX files in an SDK folder">
<echo>Falcon and FalconJX installed in ${FLEX_HOME}</echo>
</target>
@@ -100,21 +100,30 @@
<ant dir="${basedir}/compiler.jx" antfile="downloads.xml"/>
</target>
- <target name="copyfiles" description="copy Falcon files into SDK" >
+ <target name="movefiles" description="move SDK files into -legacy folders" >
<mkdir dir="${FLEX_HOME}/bin-legacy" />
+ <mkdir dir="${FLEX_HOME}/lib-legacy" />
+ <move todir="${FLEX_HOME}/lib-legacy" overwrite="true" includeEmptyDirs="false">
+ <fileset dir="${FLEX_HOME}/lib">
+ <include name="**/*"/>
+ </fileset>
+ </move>
+ </target>
+
+ <target name="copyfiles" description="copy Falcon files into SDK" >
<!-- If sdk.branch is set to binary distro flexTasks is in a different place. -->
<copy todir="${FLEX_HOME}/ant/lib" failOnError="false" overwrite="false">
<fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/ant/lib">
<include name="flexTasks.jar"/>
</fileset>
</copy>
- <copy todir="${FLEX_HOME}/bin-legacy" overwrite="true" includeEmptyDirs="false">
- <fileset dir="${FLEX_HOME}/bin">
+ <copy todir="${FLEX_HOME}/bin" overwrite="true" includeEmptyDirs="false">
+ <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/bin">
<include name="**/*"/>
</fileset>
</copy>
- <copy todir="${FLEX_HOME}/bin" overwrite="true" includeEmptyDirs="false">
- <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/bin">
+ <copy todir="${FLEX_HOME}/bin-legacy" overwrite="true" includeEmptyDirs="false">
+ <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/bin-legacy">
<include name="**/*"/>
</fileset>
</copy>
@@ -123,6 +132,8 @@
<include name="**"/>
</fileset>
</copy>
+ <!-- needed to make FB happy, maybe other IDEs as well -->
+ <copy tofile="${FLEX_HOME}/lib/mxmlc.jar" file="${FLEX_HOME}/lib/falcon-mxmlc.jar" overwrite="true"/>
<!-- Copy compiler external dependencies -->
<copy todir="${FLEX_HOME}/lib/external" overwrite="true" includeEmptyDirs="false">
<fileset dir="${FALCON_HOME}/lib">