incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1352624 - in /incubator/flex/trunk: ./ bin/ frameworks/ frameworks/javascript/ frameworks/projects/automation_air/bundles/es_ES/ frameworks/projects/automation_dmv/bundles/es_ES/ frameworks/projects/automation_flashflexkit/bundles/es_ES/ f...
Date Thu, 21 Jun 2012 17:14:05 GMT
Author: cframpton
Date: Thu Jun 21 17:14:05 2012
New Revision: 1352624

URL: http://svn.apache.org/viewvc?rev=1352624&view=rev
Log:
More work on the bin kit.  The files look right now.  Still need to get build_framework.xml
working again.

Added:
    incubator/flex/trunk/bin/fontswf   (with props)
    incubator/flex/trunk/bin/fontswf.bat   (with props)
Removed:
    incubator/flex/trunk/frameworks/projects/automation_air/bundles/es_ES/
    incubator/flex/trunk/frameworks/projects/automation_dmv/bundles/es_ES/
    incubator/flex/trunk/frameworks/projects/automation_flashflexkit/bundles/es_ES/
    incubator/flex/trunk/frameworks/projects/mobilecomponents/src/spark/transitions/supportClasses/
Modified:
    incubator/flex/trunk/README
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/downloads.xml
    incubator/flex/trunk/frameworks/javascript/build.xml

Modified: incubator/flex/trunk/README
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/README?rev=1352624&r1=1352623&r2=1352624&view=diff
==============================================================================
--- incubator/flex/trunk/README (original)
+++ incubator/flex/trunk/README Thu Jun 21 17:14:05 2012
@@ -33,12 +33,6 @@ Getting the latest sources via Subversio
     svn co https://svn.apache.org/repos/asf/incubator/flex/trunk flex
 
     For further information visit http://incubator.apache.org/flex/source.html
-
-Building Apache Flex
-====================
-
-    Apache Flex is a large project and depends on several external libraries which
-    are downloaded as part of the build process.
     
 Building Apache Flex 4.8
 ========================
@@ -172,9 +166,13 @@ FlashPlayer Configuration
     
     and a FlashPlayerTrust file must allow local SWFs to access local files.
 
-Building the Source in a Source Distribution
---------------------------------------------
+Building the Source in the Source Distribution
+----------------------------------------------
 
+    The source for both the Flex compiler and the Flex framework is included in the
+    source distribution.  The compiler is in the modules directory and the framework
+    is in the frameworks directory.
+    
     When you have all the prerequisites in place and the environment variables set, use
 
         cd <flex.dir>
@@ -182,8 +180,7 @@ Building the Source in a Source Distribu
     
     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.  The thirdparty 
-    dependencies can be found in the "in" directory.
+    often, they are not cleaned with the regular clean target.
     
     To clean the build, of everything other than the downloaded third-party dependencies

     use
@@ -195,11 +192,11 @@ Building the Source in a Source Distribu
         
         ant super-clean (which is just thirdparty-clean followed by clean)
         
-    To generate a source distro and a binary distro use
+    To generate a source distribution package and a binary distribution package use
         
         ant release
     
-    The output distros can be found in the "out" subdirectory.
+    The packages can be found in the "out" subdirectory.
             
     To get a brief listing of all the targets type
     
@@ -208,18 +205,17 @@ Building the Source in a Source Distribu
 Building the Source in a Binary Distribution
 --------------------------------------------
 
-The source for the framework is included in the binary distribution.  It can be useful
-if you wish to debug and/or extend components.
+    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.
 
     When you have all the prerequisites in place and the environment variables set, use
 
-        cd frameworks
+        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.  The thirdparty 
-    dependencies can be found in the "in" directory.
+    often, they are not cleaned with the regular clean target.
     
     To clean the build, of everything other than the downloaded third-party dependencies

     use
@@ -229,4 +225,4 @@ if you wish to debug and/or extend compo
     To clean the build, of everything, including the downloaded third-party dependencies

     use
         
-        ant super-clean (which is just thirdparty-clean followed by clean)
\ No newline at end of file
+        ant super-clean (which is just thirdparty-clean followed by clean)

Added: incubator/flex/trunk/bin/fontswf
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/bin/fontswf?rev=1352624&view=auto
==============================================================================
--- incubator/flex/trunk/bin/fontswf (added)
+++ incubator/flex/trunk/bin/fontswf Thu Jun 21 17:14:05 2012
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+################################################################################
+##
+##  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.
+##
+################################################################################
+
+#
+# fontswf launch script for unix.  On windows, fontswf.bat is used instead.
+#
+
+case `uname` in
+		CYGWIN*)
+			OS="Windows"
+		;;
+		*)
+			OS=Unix
+esac
+
+if [ $OS = "Windows" ]; then
+	# set FLEX_HOME relative to fontswf if not set
+	test "$FLEX_HOME" = "" && {
+	FLEX_HOME=`dirname $0`/..
+    	FLEX_HOME=`cygpath -m $FLEX_HOME`
+	}
+
+elif [ $OS = "Unix" ]; then
+
+	# set FLEX_HOME relative to fontswf if not set
+	test "$FLEX_HOME" = "" && {
+	FLEX_HOME=`dirname $0`/..
+	}
+
+fi
+
+if [ -f $FLEX_HOME/lib/external/optional/flex-fontkit.jar ]; 
+then
+    VMARGS="-ea -Dapplication.home=$FLEX_HOME -Xms32m -Xmx512m"
+    java $VMARGS -jar "$FLEX_HOME/lib/external/optional/flex-fontkit.jar" "$@"
+else
+    echo "Apache Flex can optionally integrate with Adobe's embedded font support."
+    echo "This feature requires a few font jars from the Adobe Flex SDK."
+fi
\ No newline at end of file

Propchange: incubator/flex/trunk/bin/fontswf
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/flex/trunk/bin/fontswf.bat
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/bin/fontswf.bat?rev=1352624&view=auto
==============================================================================
--- incubator/flex/trunk/bin/fontswf.bat (added)
+++ incubator/flex/trunk/bin/fontswf.bat Thu Jun 21 17:14:05 2012
@@ -0,0 +1,24 @@
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements.  See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License.  You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+if "%FLEX_HOME%"=="" set FLEX_HOME=%~dp0\..
+
+if exist $FLEX_HOME\lib\external\optional\flex-fontkit.jar (
+    @java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -jar "%FLEX_HOME%\lib\external\optional\flex-fontkit.jar"
%*
+) else (
+    echo Apache Flex can optionally integrate with Adobe's embedded font support.
+    echo This feature requires a few font jars from the Adobe Flex SDK.
+)

Propchange: incubator/flex/trunk/bin/fontswf.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/bin/fontswf.bat
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1352624&r1=1352623&r2=1352624&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Thu Jun 21 17:14:05 2012
@@ -458,7 +458,7 @@
     <!-- 
         Packages the source distribution with TAR-GZIP.
     -->
-    <target name="source-package-tgz" unless="no.tgz">
+    <target name="source-package-tgz" unless="no.zip">
         <tar-gzip name="${source.kit}" />
     </target>
 
@@ -674,26 +674,25 @@
     <target name="binary-package"
         description="Package binary files in zip and tar-gzip file.">
 
+        <!-- don't include modules directory in stage-source -->
         <property name="no.modules" value="set" />
+        
+        <!-- don't include mustella or frameworks/tests in stage-source -->
         <property name="no.tests" value="set" />
         
         <antcall target="stage-source"/>
         
-        <!-- delete files from source distro that are not in binary distro -->
-
+        <!-- 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>
 
-        <!-- delete directories from source distro that are not in binary distro -->
-
-        <delete dir="${basedir}/temp/frameworks/tests" failonerror="false"/>
-        <delete dir="${basedir}/temp/mustella" failonerror="false"/>
-        
-        <!-- there are framework sources for debugging built with build_framework.xml
-->
-        
+        <!-- 
+            Some, but not all framework sources are included.
+            Need to include the sources required for build_framework.xml.
+        -->
         <delete dir="${basedir}/temp/frameworks" includeemptydirs="true">
             <include name="build_framework.xml"/>
             <include name="projects/*/.*/**"/>
@@ -753,14 +752,14 @@
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="flash-integration.swc"/>
-                <include name="osmf.swc"/>
                 <include name="rpc.swc"/>
                 <include name="sparkskins.swc"/>
-                <include name="textLayout.swc"/>
                 <include name="authoringsupport.swc"/>
                 <include name="charts.swc"/>
                 <include name="advancedgrids.swc"/>
                 <include name="spark_dmv.swc"/>
+                <exclude name="osmf.swc"/>
+                <exclude name="textLayout.swc"/>
             </fileset>
         </copy>
 
@@ -789,8 +788,8 @@
             <fileset dir="${basedir}/frameworks">
                 <include name="projects/*/bundles.properties"/>
                 <include name="projects/spark/manifest.xml"/>
+                <include name="projects/*/src/**/*.pbj"/>
                 <include name="themes/**/*.swc"/>
-                <include name="**/*.pbj"/>
             </fileset>
         </copy>
 
@@ -820,10 +819,11 @@
             </fileset>
         </copy>
 
-        <!-- swfobject templates -->
-        <copy todir="${basedir}/temp/templates">
-            <fileset dir="${basedir}/templates" >
-                <include name="swfobject/**"/>
+        <!-- swfobject templates except for downloaded files -->
+        <copy todir="${basedir}/temp/templates/swfobject">
+            <fileset dir="${basedir}/templates/swfobject">
+                <exclude name="**/expressInstall.swf"/>
+                <exclude name="**/swfobject.js"/>
             </fileset>
         </copy>
                 
@@ -854,10 +854,14 @@
                 <include name="swfutils.jar"/>
                 <include name="fxgutils.jar"/>
                 <include name="velocity-dep-1.4-flex.jar"/>
+                <exclude name="external/optional/**"/>
             </fileset>
         </copy>
 
-        <!-- external libraries - ie we don't have the sources to build them -->
+        <!-- 
+            external libraries
+            We don't have the sources to build them but they have compatible licenses.
+        -->
         <copy todir="${basedir}/temp/lib/external">
             <fileset dir="${basedir}/lib/external">
                 <include name="commons-collections.jar"/>
@@ -884,6 +888,7 @@
                 <include name="xml-apis.jar"/>
                 <include name="xml-batik-LICENSE*"/>
                 <include name="xml-batik-NOTICE*/**"/>
+                <exclude name="optional/**"/>
             </fileset>
         </copy>
     </target>
@@ -901,7 +906,7 @@
     <!-- 
         Packages the binary distribution with TAR-GZIP.         
     -->
-    <target name="binary-package-tgz" unless="no.tgz"
+    <target name="binary-package-tgz" unless="no.zip"
         description="Tar-Gzip up the files in the temp directory into the binary tgz file.">
         
         <tar-gzip name="${binary.kit}" />
@@ -965,6 +970,7 @@
         <copy todir="${basedir}/temp/frameworks/projects" includeEmptyDirs="false">
             <fileset dir="${basedir}/frameworks/projects">
                 <include name="*/bundles/**"/>
+                <exclude name="*/bundles/**/empty.properties"/>
                 <exclude name="*/bundles/**/docs/**"/>
                 <exclude name="*/bundles/*/*.xml"/>
                 <exclude name="*/bundles/*/packages.dita"/>
@@ -1499,7 +1505,6 @@
     
         <!-- Stage the src kit files in the temp directory. -->
         <property name="no.zip" value="set" />
-        <property name="no.tgz" value="set" />
         <antcall target="source-release"/>
         
         <!-- Run Rat on the staged files to check for license violations. -->

Modified: incubator/flex/trunk/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/downloads.xml?rev=1352624&r1=1352623&r2=1352624&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/downloads.xml (original)
+++ incubator/flex/trunk/frameworks/downloads.xml Thu Jun 21 17:14:05 2012
@@ -33,15 +33,18 @@
        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="osmf-download,swfobject-download,swfobject-fabridge-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="swfobject-clean,swfobject-fabridge-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"/-->
+            <fileset dir="${basedir}/libs">
+                <include name="osmf.swc"/>
+                <include name="textLayout.swc"/>
+            </fileset>
         </delete>
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${download.dir}">
@@ -140,7 +143,7 @@
         </unzip>
     </target>
 
-    <target name="swfobject-clean" description="Deletes the swfobject directory">
+    <target name="swfobject-clean" description="Deletes templates swfobject code.">
         <delete failonerror="false">
             <fileset dir="${FLEX_HOME}/templates/swfobject">
                 <include name="**/**"/>
@@ -150,6 +153,22 @@
         </delete>
     </target>
     
+    <!-- the copy of swfobject.js that is in javascript/fabridge -->
+    <target name="swfobject-fabridge-download" depends="swfobject-download" 
+        description="Copies swfobject.js from code.google.com to fabridge">
+        <mkdir dir="${basedir}/javascript/FABridge/samples/fabridge/swfobject"/>
+        <copy file="${FLEX_HOME}/templates/swfobject/swfobject.js" 
+            todir="${basedir}/javascript/FABridge/samples/fabridge/swfobject" />
+    </target>
+
+    <target name="swfobject-fabridge-clean" description="Deletes swobject.js from fabridge">
+        <delete failonerror="false" includeemptydirs="true">
+            <fileset dir="${basedir}/javascript/FABridge/samples/fabridge/swfobject">
+                <include name="swfobject.js"/>
+            </fileset>
+        </delete>
+    </target>
+
     <!-- 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-check" description="Checks if the Text Layout Framework has
been downloaded.">

Modified: incubator/flex/trunk/frameworks/javascript/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/javascript/build.xml?rev=1352624&r1=1352623&r2=1352624&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/javascript/build.xml (original)
+++ incubator/flex/trunk/frameworks/javascript/build.xml Thu Jun 21 17:14:05 2012
@@ -28,16 +28,19 @@
 		<delete includeemptydirs="true" failonerror="false">
 			<fileset dir="FABridge/samples">
 			    <include name="**/*.swf"/>
+			    <exclude name="**/swfobject.js"/>
 			</fileset>
-			<fileset dir="FABridge/samples/fabridge"/>
 		</delete>
   	</target>
 
+    <!-- 
+        thirdparty-downloads (swfobject-fabridge-download) copies swfobject.js to
+        FABridge/samples/fabridge/swfobject so that all thirdparty code is
+        centralized.
+    -->
 	<target name="samples" description="build samples" depends="compile-swfs">
 		<mkdir dir="FABridge/samples/fabridge/javascript"/>
-        <mkdir dir="FABridge/samples/fabridge/swfobject"/>
 		<copy file="FABridge/src/bridge/FABridge.js" todir="FABridge/samples/fabridge/javascript"
/>
-		<copy file="../../templates/swfobject/swfobject.js" todir="FABridge/samples/fabridge/swfobject"
/>
 	</target>
 	
     <macrodef name="compile-sample">



Mime
View raw message