Repository: flex-sdk Updated Branches: refs/heads/develop 5620f8109 -> f26aa1b29
build flex-messaging-common.jar as part of SDK build and package sources in release artifacts Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/629bd128 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/629bd128 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/629bd128 Branch: refs/heads/develop Commit: 629bd1286d5fe9e12139d3678b9dbf27e743e1b5 Parents: d869224 Author: Alex Harui <[email protected]> Authored: Wed Dec 10 14:10:52 2014 -0800 Committer: Alex Harui <[email protected]> Committed: Wed Dec 10 15:27:37 2014 -0800 ---------------------------------------------------------------------- README | 38 +++++++---- build.xml | 50 ++++++++++++++- frameworks/downloads.xml | 25 +------- modules/build.xml | 7 +- modules/compiler/build.xml | 2 +- modules/flex-messaging-common/build.xml | 95 ++++++++++++++++++++++++++++ 6 files changed, 177 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/629bd128/README ---------------------------------------------------------------------- diff --git a/README b/README index e640701..20449b2 100644 --- a/README +++ b/README @@ -64,6 +64,7 @@ The following steps are all you need for a fully functional SDK: - Get the source code - flex-sdk - flex-tlf + - flex-blazeds - Build the SDK - Prepare the SDK for use with an IDE - Optional steps: @@ -79,8 +80,9 @@ set the corresponding environment variables. Make sure to use absolute paths, relative paths will result in build errors. The environment variables PLAYERGLOBAL_HOME, AIR_HOME, FLASHPLAYER_DEBUGGER, -TLF_HOME, and ADOBE_EXTENSION_MANAGER can also be set in a property file -called env.properties. See the env-template.properties file for instructions. +TLF_HOME, BLAZEDS_HOME and ADOBE_EXTENSION_MANAGER can also be set in a +property file called env.properties. See the env-template.properties file +for instructions. The Adobe Flash Player and Adobe AIR have excluded licenses so they can not be bundled with the Apache Flex SDK, i.e. they need to be installed separately. @@ -113,6 +115,8 @@ Optional: Text Layout Framework (* 6) TLF_HOME Optional: Adobe Extension Manager CS5 (* 7) ADOBE_EXTENSION_MANAGER +Optional: Flex Messaging Common (* 8) BLAZEDS_HOME + --------------------------------------------------------------------- * 1) @@ -192,7 +196,9 @@ The build scripts assume that the source code folder containing the Apache Flex Text Layout Framework root folder ('flex-tlf') is at the same level as the SDK root folder ('flex-sdk'). See 'Getting the source code', below. If this is not the case on your system, then you must set the TLF_HOME environment variable to -point to your TLF root folder. +point to your TLF root folder. If you are using a released artifact, the +source should be included in the artifact so setting TLF_HOME should not be +required. * 7) The Adobe Extension Manager is only required for those creating releases or @@ -216,6 +222,15 @@ and set ADOBE_EXTENSION_MANAGER to the absolute path of On Linux, no Adobe Extension Manager exists. +* 8) +The build scripts assume that the source code folder containing the Apache Flex +BlazeDS root folder ('flex-blazeds) is at the same level as the SDK +root folder ('flex-sdk'). See 'Getting the source code', below. If this is not +the case on your system, then you must set the BLAZEDS_HOME environment variable +to point to your BLAZEDS root folder. If you are using a released artifact, the +source should be included in the artifact so setting BLAZEDS_HOME should not be +required. + Get the source code ------------------- @@ -236,6 +251,13 @@ following commands: cd flex-tlf git checkout develop +The Apache Flex SDK requires source code from Apache Flex BlazeDS. To get +the latest source for Apache Flex BlazeDS (âmasterâ branch), use the +following commands: + + git clone https://git-wip-us.apache.org/repos/asf/flex-blazeds.git flex-blazeds + cd flex-blazeds + For further information visit: http://flex.apache.org/download-source.html @@ -470,16 +492,6 @@ and agree to the license terms of the dependency before the software can be downloaded to your system. These are optional components which enable additional features. They are installed in libs/external/optional. - flex-messaging-common.jar (provides integration with Adobe BlazeDS) - - This file is extracted from: - - http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/flex_sdk_4.6.0.23201B.zip - - and is released under an Adobe license: - - http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf - adt.jar, afe.jar, aglj40.jar, flex-fontkit.jar and rideau.jar (provides embedded font support) These jars are extracted from: http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/629bd128/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 2525e3e..a3229ce 100644 --- a/build.xml +++ b/build.xml @@ -70,6 +70,26 @@ property="TLF_HOME" value="${FLEX_HOME}/frameworks/projects" /> + <available file="${FLEX_HOME}/../flex-blazeds/modules/remoting" + type="dir" + property="BLAZEDS_HOME" + value="${FLEX_HOME}/../flex-blazeds" /> + + <available file="${FLEX_HOME}/../blazeds/modules/remoting" + type="dir" + property="BLAZEDS_HOME" + value="${FLEX_HOME}/../blazeds" /> + + <available file="${env.BLAZEDS_HOME}" + type="dir" + property="BLAZEDS_HOME" + value="${env.BLAZEDS_HOME}"/> + + <available file="${FLEX_HOME}/modules/flex-messaging-common/common/src" + type="dir" + property="BLAZEDS_HOME" + value="${FLEX_HOME}/modules/flex-messaging-common/common/src" /> + <tstamp> <format property="build.number.date" pattern="yyyyMMdd" /> </tstamp> @@ -163,7 +183,7 @@ <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description" description="Stuff that needs to be done before any builds." /> - <target name="check-compile-env" depends="check-playerglobal-home,check-air-home,check-tlf-home" + <target name="check-compile-env" depends="check-playerglobal-home,check-air-home,check-tlf-home,check-blazeds-home" description="Check for the required environment variables for compilation."> <echo>OS: ${os.name} / ${os.version} / ${os.arch}</echo> <echo>VM: ${java.vm.name} / ${java.vm.version}</echo> @@ -229,6 +249,21 @@ </target> + <target name="check-blazeds-home" unless="BLAZEDS_HOME" + description="Check BLAZEDS_HOME is a directory."> + + <echo message="BLAZEDS_HOME is ${env.BLAZEDS_HOME}"/> + + <available file="${env.BLAZEDS_HOME}" + type="dir" + property="BLAZEDS_HOME" + value="${env.BLAZEDS_HOME}"/> + + <fail message="BLAZEDS_HOME must be set correctly for a release build" + unless="BLAZEDS_HOME"/> + + </target> + <target name="check-adobe-extension-manager-env" unless="ADOBE_EXTENSION_MANAGER.set" description="Check ADOBE_EXTENSION_MANAGER is a directory."> @@ -585,6 +620,9 @@ <!-- modules --> <antcall target="stage-modules"/> + <!-- tlf --> + <antcall target="stage-blazeds"/> + <!-- asdoc --> <copy todir="${basedir}/temp/asdoc" includeEmptyDirs="false"> <fileset dir="${basedir}/asdoc"> @@ -716,6 +754,15 @@ </copy> </target> + <!-- blazeds --> + <target name="stage-blazeds"> + <copy todir="${basedir}/temp/modules/flex-messaging-common/common" includeEmptyDirs="false"> + <fileset dir="${BLAZEDS_HOME}/modules/common"> + <include name="**/**"/> + </fileset> + </copy> + </target> + <target name="stage-bin"> <copy todir="${basedir}/temp/bin" includeEmptyDirs="false"> <fileset dir="${basedir}/bin"> @@ -1031,6 +1078,7 @@ There are no known issues. <include name="fdb.jar"/> <include name="fcsh.jar"/> <include name="flex-compiler-oem.jar"/> + <include name="flex-messaging-common.jar"/> <include name="mxmlc.jar"/> <include name="optimizer.jar"/> <include name="swcdepends.jar"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/629bd128/frameworks/downloads.xml ---------------------------------------------------------------------- diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml index 11dafec..f2847fa 100644 --- a/frameworks/downloads.xml +++ b/frameworks/downloads.xml @@ -63,7 +63,7 @@ </target> <target name="optional-downloads" - depends="blazeds-jar, font-jars, clean-adobe-flex-sdk" + depends="font-jars, clean-adobe-flex-sdk" description="Downloads, after prompt for each, the optional thirdparty JARs"/> <target name="clean" depends="pixelbender-clean,swfobject-clean,swfobject-fabridge-clean,clean-adobe-flex-sdk" @@ -217,22 +217,6 @@ </delete> </target> - <!-- - flex-messaging-common.jar - BlazeDS interface for -service compiler option. - --> - - <target name="blazeds-jar" depends="get-blazeds-jar" - description="Downloads and copies flex-messaging-common.jar to the optional lib directory."/> - - <target name="get-blazeds-jar"> - <available file="${download.dir}/flex-messaging-common.jar" type="file" - property="apache.flex.blazeds.exists"/> - - <antcall target="get-apache-flex-blazeds"/> - - <copy file="${download.dir}/flex-messaging-common.jar" - todir="${lib.dir}" verbose="true"/> - </target> <!--============================================================================= --> <!-- Optional Jars. Licenses are not compatible with Apache v2 license. --> @@ -341,13 +325,6 @@ <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"> <contains string="${server}" substring="mirrors.cgi" /> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/629bd128/modules/build.xml ---------------------------------------------------------------------- diff --git a/modules/build.xml b/modules/build.xml index 73117be..73a8351 100644 --- a/modules/build.xml +++ b/modules/build.xml @@ -83,6 +83,7 @@ <ant dir="${basedir}/antTasks" target="clean"/> <ant dir="${basedir}/asc/build/java" target="clean"/> <ant dir="${basedir}/thirdparty/xerces-patch" target="clean"/> + <ant dir="${basedir}/flex-messaging-common" target="clean"/> <delete includeemptydirs="true" failonerror="false"> <fileset dir="${FLEX_LIB}"> <include name="*" /> @@ -95,7 +96,7 @@ Build Java module JARs. --> - <target name="modules" depends="thirdparty,asc,swfutils,fxgutils,compiler,debugger,antTasks" description="Full build of all JARs"/> + <target name="modules" depends="thirdparty,asc,swfutils,fxgutils,compiler,debugger,antTasks,flex-messaging-common" description="Full build of all JARs"/> <!-- dev does not do a clean first and the batik and velocity libraries are not rebuilt. @@ -152,6 +153,10 @@ <ant dir="${basedir}/antTasks" target="dev"/> </target> + <target name="flex-messaging-common" description="build BlazeDS flex-messaging-common.jar"> + <ant dir="${basedir}/flex-messaging-common"/> + </target> + <target name="thirdparty" depends="xerces-patch,batik,velocity" /> <target name="xerces-patch" description="Build xercesPatch.jar based on xerces 2.9.1" > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/629bd128/modules/compiler/build.xml ---------------------------------------------------------------------- diff --git a/modules/compiler/build.xml b/modules/compiler/build.xml index 561711b..d96e7d5 100644 --- a/modules/compiler/build.xml +++ b/modules/compiler/build.xml @@ -59,7 +59,7 @@ <!-- Including Adobe proprietary font and license code. --> <property name="mxmlc.mpl_excludes.classpath" value="${opt.dir}/afe.jar ${opt.dir}/aglj40.jar ${opt.dir}/rideau.jar ${opt.dir}/flex-fontkit.jar "/> - <property name="mxmlc.adobe.classpath" value="${mxmlc.mpl_excludes.classpath} asc.jar ${ext.dir}/xml-apis.jar batik-all-flex.jar velocity-dep-1.4-flex.jar ${ext.dir}/commons-collections.jar ${ext.dir}/commons-discovery.jar ${ext.dir}/commons-logging.jar swfutils.jar fxgutils.jar ${opt.dir}/flex-messaging-common.jar ${localized.mxmlc.jars} ${ext.dir}/xalan.jar flex-tool-api.jar"/> + <property name="mxmlc.adobe.classpath" value="${mxmlc.mpl_excludes.classpath} asc.jar ${ext.dir}/xml-apis.jar batik-all-flex.jar velocity-dep-1.4-flex.jar ${ext.dir}/commons-collections.jar ${ext.dir}/commons-discovery.jar ${ext.dir}/commons-logging.jar swfutils.jar fxgutils.jar flex-messaging-common.jar ${localized.mxmlc.jars} ${ext.dir}/xalan.jar flex-tool-api.jar"/> <property name="mxmlc.classpath" value="${mxmlc.adobe.classpath} ${ext.dir}/xml-apis-ext.jar ${env.property.dir}"/> <property name="compc.main" value="flex2.tools.Compc"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/629bd128/modules/flex-messaging-common/build.xml ---------------------------------------------------------------------- diff --git a/modules/flex-messaging-common/build.xml b/modules/flex-messaging-common/build.xml new file mode 100644 index 0000000..630ed83 --- /dev/null +++ b/modules/flex-messaging-common/build.xml @@ -0,0 +1,95 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> + +<project name="flex-messaging-common" default="main" basedir="."> + <property name="FLEX_HOME" location="${basedir}/../.."/> + + <property file="${FLEX_HOME}/env.properties"/> + <property environment="env"/> + <property file="${FLEX_HOME}/local.properties"/> + <property file="${FLEX_HOME}/build.properties"/> + + <property name="output.file" value="${FLEX_HOME}/lib/flex-messaging-common.jar"/> + <property name="flexTasks.location" value="${FLEX_HOME}/lib/flexTasks.jar"/> + <property name="project.uri" value="library://ns.adobe.com/flashx/textLayout"/> + + <available file="${FLEX_HOME}/../flex-blazeds/modules/remoting" + type="dir" + property="BLAZEDS_HOME" + value="${FLEX_HOME}/../flex-blazeds" /> + + <available file="${FLEX_HOME}/../blazeds/modules/remoting" + type="dir" + property="BLAZEDS_HOME" + value="${FLEX_HOME}/../blazeds" /> + + <available file="${basedir}/common/src" + type="dir" + property="src.folder.exists"/> + + <available file="${basedir}/common/src" + type="dir" + property="BLAZEDS_HOME" + value="${basedir}/common" /> + + <target name="main" depends="check-blazeds-home,clean,compile,compile.external" description="Clean build of flex-messaging-common.jar"> + </target> + + <target name="check-blazeds-home" unless="BLAZEDS_HOME" + description="Check BLAZEDS_HOME is a directory."> + + <echo message="BLAZEDS_HOME is ${env.BLAZEDS_HOME}"/> + + <available file="${env.BLAZEDS_HOME}" + type="dir" + property="BLAZEDS_HOME" + value="${env.BLAZEDS_HOME}"/> + + <fail message="BLAZEDS_HOME must be set correctly for a release build" + unless="BLAZEDS_HOME"/> + + </target> + + + <target name="clean" depends="check-blazeds-home,clean-external" description="Deletes the jar"> + <delete failonerror="false"> + <fileset dir="${FLEX_HOME}/lib"> + <include name="flex-messaging-common.jar"/> + </fileset> + </delete> + </target> + + <target name="compile" description="Compiles flex-messaging-common.jar" if="src.folder.exists"> + <ant dir="${basedir}/common"> + <property name="lib.dir" value="${FLEX_HOME}/lib" /> + <property name="module.dir" value="${basedir}/common" /> + </ant> + </target> + + <target name="compile.external" description="Compile flex-messaging-common.jar in flex-blazeds repo" unless="src.folder.exists"> + <ant dir="${BLAZEDS_HOME}" target="common"/> + <copy file="${BLAZEDS_HOME}/lib/flex-messaging-common.jar" toDir="${FLEX_HOME}/lib" /> + </target> + + <target name="clean-external" description="clean in flex-blazeds repo" unless="src.folder.exists"> + <echo message="cleaning ${BLAZEDS_HOME}" /> + <ant dir="${BLAZEDS_HOME}" target="clean"/> + </target> + +</project>
