flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1352695 - in /incubator/flex/trunk: README build.xml frameworks/downloads.xml modules/downloads.xml
Date Thu, 21 Jun 2012 21:17:35 GMT
Author: cframpton
Date: Thu Jun 21 21:17:35 2012
New Revision: 1352695

URL: http://svn.apache.org/viewvc?rev=1352695&view=rev
Log:
Add software dependencies section to README and delete expanded directories from downloaded
zips.

Modified:
    incubator/flex/trunk/README
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/downloads.xml
    incubator/flex/trunk/modules/downloads.xml

Modified: incubator/flex/trunk/README
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/README?rev=1352695&r1=1352694&r2=1352695&view=diff
==============================================================================
--- incubator/flex/trunk/README (original)
+++ incubator/flex/trunk/README Thu Jun 21 21:17:35 2012
@@ -40,8 +40,9 @@ Building Apache Flex 4.8
     Apache Flex 4.8 is a parity release from Apache of Adobe Flex 4.6.
     
     Apache Flex is a large project. It requires some build tools which must be installed
-    prior to building Flex and it depends on some external libraries which
-    are downloaded as part of the build process.
+    prior to building Flex and it depends on some external software which
+    are downloaded as part of the build process.  See the Software Dependencies
+    section for more information on the external software dependencies.
     
     From Apache's perspective, the Adobe Flash Player and Adobe AIR have excluded
     licenses so they can not be bundled with the Apache Flex binaries.  They must be
@@ -166,6 +167,78 @@ FlashPlayer Configuration
     
     and a FlashPlayerTrust file must allow local SWFs to access local files.
 
+ Software Dependencies
+----------------------
+
+    Apache Flex uses some third-party code that will be downloaded as part of the Apache
+    Flex build.  In addition, there is some optional third-party code that you can choose
+    to download if you would like to take advantage of the features offered.  
+    
+    Per the Apache licensing guidelines, if a software dependency has a license which 
+    Apache considers a reciprocal license you will be prompted to acknowledge the license
+    before the software is downloaded to your system and if a software dependency has a 
+    license which Apache considers to be not compatible with the Apache v2 license you 
+    will be prompted to confirm the download before the software is downloaded to your 
+    system.  The following dependencies fall into one of these categories.
+    
+    osmf.swc            
+        frameworks/libs
+        
+        Open Source Media Framework v1.0 used for video components
+    
+        This file is extracted from:
+        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
+        
+        This software is released under the Mozilla Public License Version 1.1:
+        <http://www.mozilla.org/MPL/>
+        
+        You will need to acknowledge that you are aware of this reciprocal license.
+         
+    textLayout.swc
+        framework/libs
+        
+        Text Layout Format v2.0 used for text in Spark components
+    
+        This file is extracted from:
+        http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip/download
+
+        This software is released under the Mozilla Public License Version 1.1:
+        <http://www.mozilla.org/MPL/>
+        
+        You will need to acknowledge that you are aware of this reciprocal license.
+
+    flex-messaging-common.jar
+        libs/external/optional                
+        
+        Provides integration with Adobe BlazeDs.
+               
+        This files are extracted from: 
+        http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/flex_sdk_4.6.0.23201B.zip
+       
+        This software is released under an Adobe license:
+        <http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf>
+        
+        This feature is optional.  You will need to confirm that you are aware of its
+        license and would download this software.
+                    
+    flex-fontkit.jar
+    afe.jar, adt.jar
+    aglj40.jar
+    rideau.jar
+        lib/external/optional
+        
+        This feature is optional. Adobe proprietary software which provides embedded font

+        support.
+       
+        These jars are extracted from:
+        http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/flex_sdk_4.6.0.23201B.zip
+       
+        This software is released under an Adobe license:
+        <http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf>
+
+        This feature is optional.  You will need to confirm that you are aware of its
+        license and would download this software.
+                    
 Building the Source in the Source Distribution
 ----------------------------------------------
 
@@ -178,9 +251,10 @@ Building the Source in the Source Distri
         cd <flex.dir>
         ant main        (or just ant since the default target is main)
     
-    to download the thirdparty dependencies and build the source.  Since the 
-    thirdparty dependencies take a little while to download and they don't change very 
-    often, they are not cleaned with the regular clean target.
+    to download the thirdparty dependencies and build the source.  You may be prompted
+    to acknowledge and/or confirm some of the downloads.  Since the third-party 
+    dependencies take a little while to download and they don't change very often, they 
+    are not cleaned with the regular clean target.
     
     To clean the build, of everything other than the downloaded third-party dependencies

     use
@@ -202,8 +276,8 @@ Building the Source in the Source Distri
     
         ant -projecthelp
 
-Building the Source in a Binary Distribution
---------------------------------------------
+Building the Framework in a Binary Distribution
+-----------------------------------------------
 
     The source for most of the framework is included in the binary distribution.  
     It can be useful if you wish to debug and/or extend components.
@@ -213,9 +287,10 @@ Building the Source in a Binary Distribu
         cd <flex.dir>/frameworks
         ant main        (or just ant since the default target is main)
     
-    to download the thirdparty dependencies and build the Flex framework.  Since the 
-    thirdparty dependencies take a little while to download and they don't change very 
-    often, they are not cleaned with the regular clean target.
+    to download the thirdparty dependencies and build the Flex framework.  You may be 
+    prompted to acknowledge  some of the downloads.  Since the third-party dependencies 
+    take a little while to download and they don't change very often, they are not 
+    cleaned with the regular clean target.
     
     To clean the build, of everything other than the downloaded third-party dependencies

     use
@@ -226,3 +301,9 @@ Building the Source in a Binary Distribu
     use
         
         ant super-clean (which is just thirdparty-clean followed by clean)
+
+
+Thanks for using Apache Flex.
+
+                                          The Apache Flex Project
+                                          <http://incubator.apache.org/flex/>

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1352695&r1=1352694&r2=1352695&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Thu Jun 21 21:17:35 2012
@@ -685,7 +685,6 @@
         
         <!-- Delete files from source distro that are not in binary distro. -->   
    
         <delete dir="${basedir}/temp/">
-            <include name="build.properties"/>
             <include name="**/build.xml"/>
             <exclude name="asdoc/build.xml"/>
         </delete>
@@ -792,6 +791,7 @@
                 <include name="**/*.pbj"/>
                 <include name="**/*.swc"/>
                 <include name="**/*.swf"/>
+                <exclude name="tests/**"/>
             </fileset>
         </copy>
 
@@ -962,7 +962,7 @@
     <target name="stage-locales"
         description="Stage all the locale swc's built">
         
-        <copy todir="${basedir}/temp/frameworks/locale" verbose="true">
+        <copy todir="${basedir}/temp/frameworks/locale" includeEmptyDirs="false">
             <fileset dir="${basedir}/frameworks/locale">
                 <include name="**/*.swc"/>
             </fileset>

Modified: incubator/flex/trunk/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/downloads.xml?rev=1352695&r1=1352694&r2=1352695&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/downloads.xml (original)
+++ incubator/flex/trunk/frameworks/downloads.xml Thu Jun 21 21:17:35 2012
@@ -130,7 +130,6 @@
     <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present"

         description="Copies SWFObject from code.google.com">
         
-        <mkdir dir="${download.dir}/swfobject"/>
         <get src="http://swfobject.googlecode.com/files/swfobject_2_2.zip" 
             dest="${download.dir}/swfobject_2_2.zip" 
             verbose="false"/>

Modified: incubator/flex/trunk/modules/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/downloads.xml?rev=1352695&r1=1352694&r2=1352695&view=diff
==============================================================================
--- incubator/flex/trunk/modules/downloads.xml (original)
+++ incubator/flex/trunk/modules/downloads.xml Thu Jun 21 21:17:35 2012
@@ -249,15 +249,16 @@
         </condition>
     </target>
     
-    <target name="batik-jars" depends="batik-download-zip,batik-jars-check" 
-        unless="batik.jars.exists"
+    <target name="batik-jars" depends="batik-jars-check" unless="batik.jars.exists"
         description="Copies the batik jars to the batik build directory.">
 
+        <antcall target="batik-download-zip"/>
         <copy todir="${basedir}/${batik.dir}/lib" failonerror="true">
             <fileset dir="${download.dir}/${batik.zip.dir}/lib">
                 <include name="**/**"/>
             </fileset>            
         </copy>
+        <delete dir="${download.dir}/${batik.zip.dir}"/>
     </target>
     
     <target name="batik-download-zip" depends="batik-zip-check" unless="batik.zip.exists"
@@ -313,6 +314,7 @@
             </fileset>            
             <globmapper from="*" to="commons-collections-*"/>
         </copy>
+        <delete dir="${download.dir}/${commons-collections.name}"/>
     </target>
 
     <!--
@@ -340,6 +342,7 @@
             </fileset>            
             <globmapper from="*" to="commons-discovery-*"/>
         </copy>
+        <delete dir="${download.dir}/${commons-discovery.name}"/>
     </target>
 	
     <!--
@@ -368,6 +371,7 @@
             </fileset>            
             <globmapper from="*" to="commons-logging-*"/>
         </copy>
+        <delete dir="${download.dir}/${commons-logging.name}"/>
     </target>
 
 	<!--
@@ -397,6 +401,7 @@
             </fileset>            
             <globmapper from="*" to="javacc-*"/>
         </copy>
+        <delete dir="${download.dir}/javacc-5.0"/>
     </target>
 
 	<!--
@@ -422,6 +427,8 @@
         <copy todir="${lib.ext.dir}/saxon9-NOTICES">
             <fileset dir="${download.dir}/${saxon9.jar.dir}/notices" includes="**"/>
         </copy>
+        
+        <delete dir="${download.dir}/${saxon9.jar.dir}"/>
     </target>
     	
     <!--
@@ -446,15 +453,15 @@
         </condition>
     </target>
     
-	<target name="velocity-jars" depends="velocity-download-zip,velocity-jars-check" 
-	    unless="velocity.jars.exists" 
+	<target name="velocity-jars" depends="velocity-jars-check" unless="velocity.jars.exists"

         description="Copies the velocity build jars.">
-                
+        <antcall target="velocity-download-zip"/>
         <copy todir="${basedir}/${velocity.dir}/build/lib" failonerror="true">
             <fileset dir="${download.dir}/${velocity.zip.dir}/build/lib">
                 <include name="**/**"/>
             </fileset>            
         </copy>
+        <delete dir="${download.dir}/${velocity.zip.dir}"/>
     </target>
     
     <target name="velocity-download-zip" depends="velocity-zip-check" unless="velocity.zip.exists">
@@ -503,6 +510,7 @@
             </fileset>            
             <globmapper from="*" to="xalan-*"/>
         </copy>
+        <delete dir="${download.dir}/xalan-j_2_6_0"/>
     </target>
 
     <!--
@@ -543,6 +551,7 @@
             </fileset>            
             <globmapper from="*" to="xerces-LICENSE/*"/>
         </copy>
+        <delete dir="${download.dir}/${xerces.dir}"/>
     </target>
 	
 	<!--============================================================================= -->



Mime
View raw message