incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1350720 - in /incubator/flex/trunk: build.xml frameworks/downloads.xml frameworks/projects/authoringsupport/libs/FlexContentHolderThumbnail.swc ide/flashbuilder/flashbuilder-config.xml modules/downloads.xml
Date Fri, 15 Jun 2012 17:59:56 GMT
Author: cframpton
Date: Fri Jun 15 17:59:55 2012
New Revision: 1350720

URL: http://svn.apache.org/viewvc?rev=1350720&view=rev
Log:
FlexContentHolderThumbnail.swc needs to be downloaded.  Add notifications for all downloaded
code covered by the MPL1.1 license - these require a 'y' response or just hit enter to accept
the default which is 'y'.  ant release will now prompt again.  Use -Dbuild.nopromt to turn
off prompts for the build machine or when doing release management.  If this property is set,
no optional components will be downloaded (currently BlazeDS integration and Adobe embedded
font support) and the MPL1.1 notices will not be displayed.

Removed:
    incubator/flex/trunk/frameworks/projects/authoringsupport/libs/FlexContentHolderThumbnail.swc
Modified:
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/downloads.xml
    incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml
    incubator/flex/trunk/modules/downloads.xml

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1350720&r1=1350719&r2=1350720&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Fri Jun 15 17:59:55 2012
@@ -96,14 +96,13 @@
     -->
     <target name="thirdparty-downloads" description="Downloads all the required thirdparty
code.">
         <ant dir="${basedir}/modules" target="thirdparty-downloads"/>
-        <!-- don't ask again about these since we just did if these weren't already set
-->	    
-	    <property name="blazeds.donot.ask" value="set" />
-        <property name="font.donot.ask" value="set"/>
-
         <ant dir="${basedir}/frameworks" target="thirdparty-downloads"/>        
+        <!-- don't ask again about these since we just did if these weren't already set
-->	    
+	    <property name="build.noprompt" value="set" />
     </target>
 
-    <target name="prebuild" depends="check-compile-env,create-description,thirdparty-downloads"
description="stuff that needs to be done before any builds" />
+    <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-pixelbender-home"
         description="Check for the required environment variables for compilation."/>
@@ -212,10 +211,6 @@
         description="Set properties needed to turn on features for release sdk">
         <!-- generate localized compiler message jars -->
 	    <property name="localized.jars" value="true" />
-        <!-- don't ask to download blazeds from Adobe Flex SDK -->	    
-	    <property name="blazeds.donot.ask" value="set" />
-        <!-- don't ask to download font jars from Adobe Flex SDK -->	    
-        <property name="font.donot.ask" value="set"/>
     </target>
     
     <!--

Modified: incubator/flex/trunk/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/downloads.xml?rev=1350720&r1=1350719&r2=1350720&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/downloads.xml (original)
+++ incubator/flex/trunk/frameworks/downloads.xml Fri Jun 15 17:59:55 2012
@@ -25,6 +25,7 @@
 	<property file="${FLEX_HOME}/build.properties"/>
 
 	<property name="download.dir" value="${FLEX_HOME}/in"/>
+	<property name="authoring.swc" value="frameworks/projects/authoringsupport/libs/FlexContentHolderThumbnail.swc"/>
 	
     <!-- Download thirdparty code -->
     
@@ -33,12 +34,12 @@
        clean does not remove these since they don't change often and the downloads take time.
     -->
     <target name="main" 
-        depends="osmf-download,swfobject-download,textLayout-download" 
+        depends="authoring-download,osmf-download,swfobject-download,textLayout-download"

         description="Copies third-party software into place for build">
         <echo message="Use thirdparty-clean or super-clean to remove these."/> 
     </target>
     
-    <target name="clean" depends="swfobject-clean" description="Cleans thirdparty downloaded
files.">
+    <target name="clean" depends="authoring-clean,swfobject-clean" description="Cleans
thirdparty downloaded files.">
         <delete failonerror="false">
             <fileset dir="${basedir}/libs" includes="osmf.swc,textLayout.swc"/>
             <!--fileset dir="${basedir}/libs/player" includes="**/playerglobal.swc"/-->
@@ -51,50 +52,91 @@
         </delete>
      </target>
 
-    <target name="osmf-check" description="Checks if the Open Source Media Framework has
been downloaded.">
-        <available file="${basedir}/libs/osmf.swc" property="osmf.swc.present"/>
-    </target>
-   
    <target name="swfobject-check" description="Checks if SWFObject has been downloaded.">
         <available file="${basedir}/../templates/swfobject/swfobject.js" property="swfobject.js.present"/>
     </target>
 
-    <target name="textLayout-check" description="Checks if the Text Layout Framework has
been downloaded.">
-        <available file="${basedir}/libs/textLayout.swc" property="textLayout.swc.present"/>
+	<!--
+        MPL 1.1 Licesense Notification
+    -->
+    <target name="echo-mpl1.1-license">       
+        <echo message="Mozilla Public License Version 1.1:
+            ${line.separator}
+            ${line.separator}The contents of this file(s) are subject to the Mozilla Public
License Version 1.1.
+            ${line.separator}You may not use this file(s) except in compliance with the License.

+            ${line.separator}You may obtain a copy of the License here:
+            ${line.separator}    http://www.mozilla.org/MPL/. 
+            ${line.separator}By downloading, modifying, distributing, using and/or accessing
this file(s), 
+            ${line.separator}you agree to the terms and conditions of the applicable license
agreement."/>
+        
+        <input
+            message="${line.separator}I have read the MPL1.1 license information above?"
+            validargs="y"
+            defaultvalue="y"/>
+    </target>
+       
+	<!--
+        authoringsupport/libs/FlexContentHolderThumbnail.swc
+    -->
+        
+    <target name="authoring-check">        
+        <available file="${FLEX_HOME}/${authoring.swc}" property="authoring.swc.present"/>
     </target>
     
-    <!-- osmf.swc (Version 1.0) -->
-    <!-- Because this requires a network connection it downloads OSMF only if it doesn't
already exist. -->
-    <!-- The swc at the top-level has lots of trace statements in it.  Use the one in
the source zip. -->
-    <target name="osmf-download" depends="osmf-check,get-osmf" description="Copies OSMF
from Sourceforge"/>    
-
+    <!-- 
+        Notify before downloading.
+        See http://www.apache.org/legal/3party.html#labeling-reciprocity
+    -->
+    <target name="ask-authoring" unless="build.noprompt"
+        description="Notify the user before downloading the authoring swc.">
+ 
+        <echo message="The Flash authoring support uses FlexContentHolderThumbnail.swc"/>
+        <echo message="which is licensed under the Mozilla Public License Version 1.1."/>
+        <antcall target="echo-mpl1.1-license"/>
+    </target>
+    
+    <target name="authoring-download" depends="authoring-check" unless="authoring.swc.present">
+        <antcall target="ask-authoring"/>
+        <get src="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/${authoring.swc}"

+            dest="${FLEX_HOME}/${authoring.swc}"/>            
+    </target>
+    
+    <target name="authoring-clean">
+        <delete file="${FLEX_HOME}/${authoring.swc}"/>
+    </target>
+    
+	<!--
+        osmf.swc (Version 1.0)
+        The swc at the top-level has lots of trace statements in it.  Use the one in the
source zip.
+    -->
+    <target name="osmf-check" description="Checks if the Open Source Media Framework has
been downloaded.">
+        <available file="${basedir}/libs/osmf.swc" property="osmf.swc.present"/>
+    </target>
+   
     <!-- Prompt before downloading OSMF.  -->
-    <target name="ask-osmf" unless="osmf.swc.present" description="Prompt the user before
downloading OSMF">
-        <!--input
-            message="Do you want to download OSMF ....FIXME... ?"
-            validargs="y,n"
-            defaultvalue="n"
-            addproperty="input.osmf.download"/>
-        <condition property="do.osmf.install">
-            <or>
-                <equals arg1="y" arg2="${input.osmf.download}"/>
-                <equals arg1="Y" arg2="${input.osmf.download}"/>
-            </or>
-        </condition-->
+    <target name="ask-osmf" unless="build.noprompt">
+        <echo message="The Open Source Media Framework used by the video components"/>
+        <echo message="is licensed under the Mozilla Public License Version 1.1."/>
+        <antcall target="echo-mpl1.1-license"/>
         <property name="do.osmf.install" value="set" />
     </target>
     
-    <!--target name="get-osmf" depends="ask-osmf" if="do.osmf.install"-->
-    <target name="get-osmf" depends="ask-osmf" if="do.osmf.install">
+    <target name="osmf-download" depends="osmf-check" unless="osmf.swc.present">
+        <antcall target="ask-osmf"/>        
+        <available file="${download.dir}/OSMF_1.0.zip" type="file" property="osmf.zip.exists"/>
+        <antcall target="download-osmf-zip" />
         <mkdir dir="${download.dir}/OSMF_1.0"/>
-        <get src="http://sourceforge.net/projects/osmf.adobe/files/OSMF%201.0%20%28final%20source%2C%20ASDocs%2C%20PDF%20guides%2C%20and%20release%20notes%29/OSMF_1.0.zip/download"

-            dest="${download.dir}/OSMF_1.0.zip" 
-            verbose="false"/>
         <unzip dest="${download.dir}/OSMF_1.0" src="${download.dir}/OSMF_1.0.zip" />
         <unzip dest="${download.dir}/OSMF_1.0/osmf_source_v1-0" src="${download.dir}/OSMF_1.0/osmf_source_v1-0.zip"
/>
         <copy file="${download.dir}/OSMF_1.0/osmf_source_v1-0/OSMF.swc" tofile="${basedir}/libs/osmf.swc"/>
         <delete dir="${download.dir}/OSMF_1.0" failonerror="false"/>
     </target>
+
+    <target name="download-osmf-zip" unless="osmf.zip.exists">
+        <get src="http://sourceforge.net/projects/osmf.adobe/files/OSMF%201.0%20%28final%20source%2C%20ASDocs%2C%20PDF%20guides%2C%20and%20release%20notes%29/OSMF_1.0.zip/download"

+            dest="${download.dir}/OSMF_1.0.zip" 
+            verbose="false"/>
+    </target>
     
     <!-- swfobject.js (Version 2.2) -->
     <!-- Because this requires a network connection it downloads SWFObject only if it
doesn't already exist. -->
@@ -121,13 +163,28 @@
     
     <!-- textLayout.swc (Version 2.0.232) -->
     <!-- Because this requires a network connection it downloads TLF only if it doesn't
already exist. -->
-    <target name="textLayout-download" depends="textLayout-check" unless="textLayout.swc.present"
description="Copies Text Layout Framework from Sourceforge">
+    <target name="textLayout-check" description="Checks if the Text Layout Framework has
been downloaded.">
+        <available file="${basedir}/libs/textLayout.swc" property="textLayout.swc.present"/>
+    </target>
+
+    <!-- 
+        Notify before downloading.
+        See http://www.apache.org/legal/3party.html#labeling-reciprocity
+    -->
+    <target name="ask-tlf" unless="build.noprompt">
+        <echo message="The Adobe Text Layout Framework used by the Spark text components"/>
+        <echo message="is licensed under the Mozilla Public License Version 1.1."/>
+        <antcall target="echo-mpl1.1-license"/>
+    </target>
+
+    <target name="textLayout-download" depends="textLayout-check" unless="textLayout.swc.present">
+        <antcall target="ask-tlf"/>
+        <available file="${download.dir}/textLayout_build.zip" type="file" property="tlf.zip.exists"/>
+        <antcall target="download-tlf-zip" />
         <mkdir dir="${download.dir}/textLayout_build"/>
-        <get src="http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip/download"

-            dest="${download.dir}/textLayout_build.zip" 
-            verbose="false"/>
         <unzip dest="${download.dir}/textLayout_build" src="${download.dir}/textLayout_build.zip"
/>
         <copy file="${download.dir}/textLayout_build/libs/textLayout.swc" todir="${basedir}/libs"/>
+        <!-- Source code useful for debugging text components -->
         <!--copy todir="${basedir}/projects/textLayout">
             <fileset dir="${download.dir}/textLayout_build">
                 <include name="**/**"/>
@@ -139,6 +196,12 @@
         <delete dir="${download.dir}/textLayout_build" failonerror="false"/>
     </target>
 
+    <target name="download-tlf-zip" unless="tlf.zip.exists">
+        <get src="http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip/download"

+            dest="${download.dir}/textLayout_build.zip" 
+            verbose="false"/>
+    </target>
+    
     <!-- FixMe: should this be removed? -->
     <target name="ide-clean" depends="airsdk-clean" 
         description="Delete AIR SDK and playerglobal files copied into FLEX_HOME.">

Modified: incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml?rev=1350720&r1=1350719&r2=1350720&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml (original)
+++ incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml Fri Jun 15 17:59:55 2012
@@ -19,5 +19,6 @@
 -->
 <flashbuilder-config>
     <!-- Specifies the express install swf that will be used in the HTML file generated.
-->
+    <!-- The implied path is templates/swfobject. -->
    <express-install-swf>expressInstall.swf</express-install-swf>
 </flashbuilder-config>
\ No newline at end of file

Modified: incubator/flex/trunk/modules/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/downloads.xml?rev=1350720&r1=1350719&r2=1350720&view=diff
==============================================================================
--- incubator/flex/trunk/modules/downloads.xml (original)
+++ incubator/flex/trunk/modules/downloads.xml Fri Jun 15 17:59:55 2012
@@ -37,7 +37,8 @@
     <property name="lib.opt.dir" value="${lib.ext.dir}/optional"/>
 
 	<property name="download.dir" value="${FLEX_HOME}/in"/>
-    <property name="adobe.flex.sdk" value="adobe_flex_sdk_4.6"/>
+    <property name="adobe.flex.dir" value="adobe_flex_sdk_4.6"/>
+    <property name="adobe.flex.zip.file" value="flex_sdk_4.6.0.23201B.zip"/>
 
     <property name="batik.zip.dir" value="batik-1.6"/>
     <property name="batik.dir" value="thirdparty/batik"/>
@@ -270,7 +271,7 @@
     </target>
 
 	<target name="batik-jars-clean">
-        <delete includeEmptyDirs="true">
+        <delete includeEmptyDirs="true" failonerror="fasle">
             <fileset dir="${basedir}/${batik.dir}/lib">
                 <include name="**/**"/>
             </fileset>            
@@ -465,7 +466,7 @@
     </target>
     
 	<target name="velocity-jars-clean">
-        <delete includeEmptyDirs="true">
+        <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${basedir}/${velocity.dir}/build/lib">
                 <include name="**/**"/>
             </fileset>            
@@ -555,6 +556,9 @@
     <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" 
@@ -583,14 +587,14 @@
         
     <target name="get-blazeds-jar" depends="ask-blazeds" if="do.blazeds.install">
 
-        <available file="${download.dir}/${adobe.flex.sdk}" type="dir"
+        <available file="${download.dir}/${adobe.flex.dir}" type="dir"
             property="adobe.flex.sdk.exists"/>
         
         <antcall target="get-adobe-flex-sdk"/>
 
-        <copy file="${download.dir}/${adobe.flex.sdk}/lib/flex-messaging-common.jar" 
+        <copy file="${download.dir}/${adobe.flex.dir}/lib/flex-messaging-common.jar" 
             todir="${lib.opt.dir}" verbose="true"/>
-        <copy file="${download.dir}/${adobe.flex.sdk}/license-adobesdk.htm" 
+        <copy file="${download.dir}/${adobe.flex.dir}/license-adobesdk.htm" 
             tofile="${lib.opt.dir}/flex-messaging-common-LICENSE.htm" verbose="true"/>
     </target>
 
@@ -609,6 +613,9 @@
                 <available file="${lib.opt.dir}/rideau.jar"/>
             </and>
         </condition>
+        <condition property="font.donot.ask">
+            <isset property="build.noprompt"/>
+        </condition>
     </target>
     
     <target name="font-jars" depends="font-jars-check,get-font-jars" 
@@ -637,13 +644,13 @@
     
     <target name="get-font-jars" depends="ask-font" if="do.font.install">
         
-        <available file="${download.dir}/${adobe.flex.sdk}" type="dir"
+        <available file="${download.dir}/${adobe.flex.dir}" type="dir"
             property="adobe.flex.sdk.exists"/>
         
         <antcall target="get-adobe-flex-sdk"/>
         
         <copy todir="${lib.opt.dir}" verbose="true">
-            <fileset dir="${download.dir}/${adobe.flex.sdk}/lib">
+            <fileset dir="${download.dir}/${adobe.flex.dir}/lib">
                 <include name="adt.jar" />
                 <include name="afe.jar" />
                 <include name="aglj40.jar" />
@@ -652,20 +659,19 @@
             </fileset>
         </copy>
         
-        <copy file="${download.dir}/${adobe.flex.sdk}/license-adobesdk.htm" 
+        <copy file="${download.dir}/${adobe.flex.dir}/license-adobesdk.htm" 
             tofile="${lib.opt.dir}/flex-fontkit-LICENSE.htm" verbose="true"/>
-        <copy file="${download.dir}/${adobe.flex.sdk}/license-adobesdk.htm" 
+        <copy file="${download.dir}/${adobe.flex.dir}/license-adobesdk.htm" 
             tofile="${lib.opt.dir}/adt-LICENSE.htm" verbose="true"/>
-        <copy file="${download.dir}/${adobe.flex.sdk}/license-adobesdk.htm" 
+        <copy file="${download.dir}/${adobe.flex.dir}/license-adobesdk.htm" 
             tofile="${lib.opt.dir}/afe-LICENSE.htm" verbose="true"/>
-        <copy file="${download.dir}/${adobe.flex.sdk}/license-adobesdk.htm" 
+        <copy file="${download.dir}/${adobe.flex.dir}/license-adobesdk.htm" 
             tofile="${lib.opt.dir}/aglj40-LICENSE.htm" verbose="true"/>
-        <copy file="${download.dir}/${adobe.flex.sdk}/license-adobesdk.htm" 
+        <copy file="${download.dir}/${adobe.flex.dir}/license-adobesdk.htm" 
             tofile="${lib.opt.dir}/rideau.jar-LICENSE.htm" verbose="true"/>
     </target>
         	
-    <target name="echo-adobe-flex-sdk-license">
-        
+    <target name="echo-adobe-flex-sdk-license">       
         <echo message="Adobe Flex SDK License Agreement:
             ${line.separator}
             ${line.separator}All files contained in this Adobe Flex SDK download are subject
to and governed by the
@@ -683,18 +689,19 @@
         description="Downloads the Adobe Flex 4.6 SDK">
         
         <!--antcall target="download-zip">
-          <param name="download.dir" value="${download.dir}/${adobe.flex.sdk}"/>
+          <param name="download.dir" value="${download.dir}/${adobe.flex.dir}"/>
           <param name="srcUrl" value="http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6"/>
           <param name="zipFile" value="flex_sdk_4.6.0.23201B.zip"/>
         </antcall-->
         
-        <property name="zipFile" value="flex_sdk_4.6.0.23201B.zip"/>
         <mkdir dir="${download.dir}"/>        
-        <available file="${download.dir}/${zipFile}" type="file"
+        <available file="${download.dir}/${adobe.flex.zip.file}" type="file"
             property="adobe.flex.sdk.download.exists"/>
+            
         <antcall target="download-adobe-flex-sdk" />
         
-        <unzip src="${download.dir}/${zipFile}" dest="${download.dir}/${adobe.flex.sdk}">
+        <unzip src="${download.dir}/${adobe.flex.zip.file}" 
+            dest="${download.dir}/${adobe.flex.dir}">
             <patternset>
                 <include name="license-adobesdk.htm"/>
                 <include name="lib/flex-messaging-common.jar"/>
@@ -708,12 +715,12 @@
     </target>
     
     <target name="download-adobe-flex-sdk" unless="adobe.flex.sdk.download.exists" >
-        <get src="http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/${zipFile}"

-            dest="${download.dir}/${zipFile}"/>
+        <get src="http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/${adobe.flex.zip.file}"

+            dest="${download.dir}/${adobe.flex.zip.file}"/>
     </target>
     
     <target name="clean-adobe-flex-sdk">
-        <delete dir="${download.dir}/${adobe.flex.sdk}"/>
+        <delete dir="${download.dir}/${adobe.flex.dir}"/>
     </target>
 
 	<!--



Mime
View raw message