Repository: flex-sdk Updated Branches: refs/heads/develop 6f971e3e3 -> e4219d62b
- Updated the flex-sdk to use the apache-flex blazeds 4.7 build from builds.apache.org Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e4219d62 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e4219d62 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e4219d62 Branch: refs/heads/develop Commit: e4219d62b3d0376e1f38b6292b00835e6c6461fc Parents: 6f971e3 Author: Christofer Dutz <[email protected]> Authored: Wed Nov 19 14:31:33 2014 +0100 Committer: Christofer Dutz <[email protected]> Committed: Wed Nov 19 14:31:33 2014 +0100 ---------------------------------------------------------------------- frameworks/downloads.xml | 77 ++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e4219d62/frameworks/downloads.xml ---------------------------------------------------------------------- diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml index 1baff1b..11dafec 100644 --- a/frameworks/downloads.xml +++ b/frameworks/downloads.xml @@ -26,8 +26,9 @@ <property file="${FLEX_HOME}/local.properties"/> <property name="download.dir" value="${FLEX_HOME}/in"/> - - <!-- See note in modules/download.xml about this property. --> + + <property name="lib.dir" value="${FLEX_HOME}/lib"/> + <!-- See note in modules/download.xml about this property. --> <property name="lib.opt.dir" value="${FLEX_HOME}/lib/external/optional"/> <property name="adobe.flex.dir" value="adobe_flex_sdk_4.6"/> @@ -215,63 +216,28 @@ </fileset> </delete> </target> - - <!--============================================================================= --> - <!-- Optional Jars. Licenses are not compatible with Apache v2 license. --> - <!--============================================================================= --> - - <!-- - flex-messaging-common.jar - BlazeDS interface for -service compiler option - This does not get installed if build.noprompt is set. + + <!-- + flex-messaging-common.jar - BlazeDS interface for -service compiler option. --> - - <target name="blazeds-jar-check" unless="blazeds.donot.ask" - description="Checks if flex-messaging-common.jar is in optional lib directory."> - <available file="${lib.opt.dir}/flex-messaging-common.jar" property="blazeds.donot.ask"/> - <condition property="blazeds.donot.ask"> - <isset property="build.noprompt"/> - </condition> - </target> - - <target name="blazeds-jar" depends="blazeds-jar-check,get-blazeds-jar" - description="Downloads and copies flex-messaging-common.jar to the optional lib directory."/> - <!-- Prompt before downloading. --> - <target name="ask-blazeds" unless="blazeds.donot.ask" - description="Prompt the user before downloading BlaseDS"> + <target name="blazeds-jar" depends="get-blazeds-jar" + description="Downloads and copies flex-messaging-common.jar to the optional lib directory."/> - <property name="blazeds.prompt.text" - value="Apache Flex can optionally integrate with Adobe BlazeDS. - ${line.separator}This feature requires flex-messaging-common.jar from the Adobe Flex SDK. - ${line.separator}The Adobe SDK license agreement for Adobe Flex 4.6 applies to this jar. - ${line.separator}This license is not compatible with the Apache v2 license. - ${adobe.flex.license} - ${line.separator}Do you want to install this jar from the Adobe Flex SDK?"/> - <input - message="${blazeds.prompt.text}" - validargs="y,n" - defaultvalue="n" - addproperty="input.blazeds.download"/> - <condition property="do.blazeds.install"> - <equals arg1="y" arg2="${input.blazeds.download}"/> - </condition> - <!-- Only ask once per ant run. --> - <property name="blazeds.donot.ask" value="set"/> - </target> - - <target name="get-blazeds-jar" depends="ask-blazeds" if="do.blazeds.install"> + <target name="get-blazeds-jar"> + <available file="${download.dir}/flex-messaging-common.jar" type="file" + property="apache.flex.blazeds.exists"/> - <available file="${download.dir}/${adobe.flex.dir}" type="dir" - property="adobe.flex.sdk.exists"/> - - <antcall target="get-adobe-flex-sdk"/> + <antcall target="get-apache-flex-blazeds"/> - <copy file="${download.dir}/${adobe.flex.dir}/lib/flex-messaging-common.jar" - todir="${lib.opt.dir}" verbose="true"/> - <copy file="${download.dir}/${adobe.flex.dir}/license-adobesdk.htm" - tofile="${lib.opt.dir}/flex-messaging-common-LICENSE.htm" verbose="true"/> + <copy file="${download.dir}/flex-messaging-common.jar" + todir="${lib.dir}" verbose="true"/> </target> + <!--============================================================================= --> + <!-- Optional Jars. Licenses are not compatible with Apache v2 license. --> + <!--============================================================================= --> + <!-- Embedded Font Support This does not get installed if build.noprompt is set. @@ -374,6 +340,13 @@ <target name="clean-adobe-flex-sdk"> <delete dir="${download.dir}/${adobe.flex.dir}"/> </target> + + <target name="get-apache-flex-blazeds" unless="apache.flex.blazeds.exists" + description="Downloads the Apache Flex BlazeDS libraries"> + <mkdir dir="${download.dir}"/> + <get src="https://builds.apache.org/view/E-G/view/Flex/job/flex-blazeds/lastSuccessfulBuild/artifact/modules/common/target/flex-messaging-common.jar"; + dest="${download.dir}/flex-messaging-common.jar" /> + </target> <target name="get_from_mirror"> <condition property="usingmirror" value="true">
