incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1331520 - in /incubator/flex/trunk: ./ bin/ frameworks/ frameworks/locale/ frameworks/locale/da_DK/ frameworks/locale/de_DE/ frameworks/locale/en_US/ frameworks/locale/es_ES/ frameworks/locale/fi_FI/ frameworks/locale/fr_FR/ frameworks/loc...
Date Fri, 27 Apr 2012 17:53:33 GMT
Author: cframpton
Date: Fri Apr 27 17:53:29 2012
New Revision: 1331520

URL: http://svn.apache.org/viewvc?rev=1331520&view=rev
Log:
Another swag at the binary kit - the AIR distribution is not included as long as no.air.integraton is set which it currently is in build.xml.  Change the version to Apache Flex 4.8.0.  Add ignore properties for the files generated by the build so they don't show up as unversioned.

Modified:
    incubator/flex/trunk/   (props changed)
    incubator/flex/trunk/bin/   (props changed)
    incubator/flex/trunk/build.properties
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/air-config.xml
    incubator/flex/trunk/frameworks/build.xml
    incubator/flex/trunk/frameworks/build_framework.xml
    incubator/flex/trunk/frameworks/flex-config.xml
    incubator/flex/trunk/frameworks/locale/   (props changed)
    incubator/flex/trunk/frameworks/locale/da_DK/   (props changed)
    incubator/flex/trunk/frameworks/locale/de_DE/   (props changed)
    incubator/flex/trunk/frameworks/locale/en_US/   (props changed)
    incubator/flex/trunk/frameworks/locale/es_ES/   (props changed)
    incubator/flex/trunk/frameworks/locale/fi_FI/   (props changed)
    incubator/flex/trunk/frameworks/locale/fr_FR/   (props changed)
    incubator/flex/trunk/frameworks/locale/it_IT/   (props changed)
    incubator/flex/trunk/frameworks/locale/ja_JP/   (props changed)
    incubator/flex/trunk/frameworks/locale/ko_KR/   (props changed)
    incubator/flex/trunk/frameworks/locale/nb_NO/   (props changed)
    incubator/flex/trunk/frameworks/locale/nl_NL/   (props changed)
    incubator/flex/trunk/frameworks/locale/pt_BR/   (props changed)
    incubator/flex/trunk/frameworks/locale/ru_RU/   (props changed)
    incubator/flex/trunk/frameworks/locale/sv_SE/   (props changed)
    incubator/flex/trunk/frameworks/locale/zh_CN/   (props changed)
    incubator/flex/trunk/frameworks/locale/zh_TW/   (props changed)
    incubator/flex/trunk/frameworks/projects/   (props changed)
    incubator/flex/trunk/frameworks/projects/advancedgrids/   (props changed)
    incubator/flex/trunk/frameworks/projects/advancedgrids/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/airframework/   (props changed)
    incubator/flex/trunk/frameworks/projects/airframework/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/airspark/   (props changed)
    incubator/flex/trunk/frameworks/projects/airspark/src/spark/core/Version.as
    incubator/flex/trunk/frameworks/projects/authoringsupport/   (props changed)
    incubator/flex/trunk/frameworks/projects/automation/   (props changed)
    incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_dmv/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as
    incubator/flex/trunk/frameworks/projects/charts/   (props changed)
    incubator/flex/trunk/frameworks/projects/charts/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/core/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/bundles/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/bundles/de_DE/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/bundles/en_US/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/bundles/fr_FR/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/bundles/ja_JP/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/bundles/ru_RU/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/bundles/zh_CN/   (props changed)
    incubator/flex/trunk/frameworks/projects/framework/   (props changed)
    incubator/flex/trunk/frameworks/projects/framework/src/mx/core/FlexVersion.as
    incubator/flex/trunk/frameworks/projects/framework/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/halo/   (props changed)
    incubator/flex/trunk/frameworks/projects/mobilecomponents/   (props changed)
    incubator/flex/trunk/frameworks/projects/mobiletheme/   (props changed)
    incubator/flex/trunk/frameworks/projects/mx/   (props changed)
    incubator/flex/trunk/frameworks/projects/mx/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/rpc/   (props changed)
    incubator/flex/trunk/frameworks/projects/rpc/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/spark/   (props changed)
    incubator/flex/trunk/frameworks/projects/spark/src/spark/core/Version.as
    incubator/flex/trunk/frameworks/projects/spark_dmv/   (props changed)
    incubator/flex/trunk/frameworks/projects/spark_dmv/src/spark/core/Version.as
    incubator/flex/trunk/frameworks/projects/sparkskins/   (props changed)
    incubator/flex/trunk/frameworks/projects/wireframe/   (props changed)
    incubator/flex/trunk/frameworks/themes/Halo/   (props changed)
    incubator/flex/trunk/frameworks/themes/Mobile/   (props changed)
    incubator/flex/trunk/frameworks/themes/Wireframe/   (props changed)
    incubator/flex/trunk/modules/antTasks/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/abc/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/binding/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/genext/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/managed/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/reflect/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/asdoc/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/config/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/extensions/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/fxg/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/i18n/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/io/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/analyzer/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/builder/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/dom/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/gen/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/lang/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/reflect/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/rep/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/rep/decl/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/rep/init/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/swc/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/swc/catalog/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/swc/zip/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/   (props changed)
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/graph/   (props changed)
    incubator/flex/trunk/modules/debugger/   (props changed)
    incubator/flex/trunk/modules/fxgutils/   (props changed)
    incubator/flex/trunk/modules/swfutils/   (props changed)
    incubator/flex/trunk/modules/swfutils/build.xml
    incubator/flex/trunk/modules/thirdparty/batik/   (props changed)
    incubator/flex/trunk/modules/thirdparty/velocity/   (props changed)
    incubator/flex/trunk/modules/thirdparty/xerces-patch/   (props changed)
    incubator/flex/trunk/templates/   (props changed)

Propchange: incubator/flex/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -1,7 +1,9 @@
+AIR SDK license.pdf
+AIR SDK Readme.txt
+flex-sdk-description.xml
 asdoc-output
 in
 lib
 out
+runtimes
 temp
-Adobe AIR SDK license.pdf
-AIR SDK license.pdf

Propchange: incubator/flex/trunk/bin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1,4 @@
+adl
+adl.exe
+adt
+adt.bat

Modified: incubator/flex/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.properties?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/build.properties (original)
+++ incubator/flex/trunk/build.properties Fri Apr 27 17:53:29 2012
@@ -18,8 +18,8 @@
 ################################################################################
 
 # flex-sdk-description values
-release = Apache Flex 4.6.0
-release.version = 4.6.0
+release = Apache Flex 4.8.0
+release.version = 4.8.0
 
 # determines frameworks/libs/player/${global.playerglobal.version}/playerglobal.swc
 # some file define a local.playerglobal.version string to override this value,

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Fri Apr 27 17:53:29 2012
@@ -43,8 +43,11 @@
     <property name="kit.prefix" value="apache-flex-sdk-${release.version}-incubating"/>
     <property name="source.kit" value="${kit.prefix}-src.zip"/>
     <property name="binary.kit" value="${kit.prefix}-bin.zip"/>
-    <property name="no.doc" value="true"/>
-    <property name="no.additional" value="true"/>
+    
+    <property name="no.doc-packages" value="set"/>
+    <property name="no.additional-packages" value="set"/>
+    <property name="no.doc" value="set"/>
+    <property name="no.air.integration" value="set"/>
     
     <!-- Paths to the debug standalone flashplayer. -->
     <condition property="flash.player" value="${FLEX_HOME}/in/player/${target.player}/win/FlashPlayerDebugger.exe">
@@ -98,16 +101,25 @@
 
     <target name="dev" depends="modules-dev" description="Runs src.depend build for development"/>
 
-    <target name="release" depends="source-release,binary-release"
+    <target name="release" 
+        depends="source-release,binary-release"
         description="Creates source and binary kits for Apache Flex."/>
         
-    <target name="source-release" depends="clean,create-description,source-distro" 
+    <target name="source-release" 
+        depends="clean,create-description,source-distro" 
         description="Packages the source release kit which is the official Apache release."/>
         
-    <target name="binary-release" depends="main,checkintests,asdoc,doc,other.locales,package" 
+    <target name="binary-release" 
+        depends="main,checkintests,doc,other.locales,binary-distro,doc-packages,additional-packages" 
         description="Builds and packages the binary kit which is provided as a convenience."/>    
-    <target name="package" depends="binary-distro,additional-packages" 
-        description="Zips up various packages"/>
+
+    <target name="doc-packages" 
+        depends="asdoc-package,javadocs"
+        description="Build and package the asdocs for the framework clases and the javadocs."/>
+                
+    <target name="additional-packages"
+        depends="locale-package,ja-locale-samples,antTasks-package" 
+        description="Package locales, locale-samples and antTasks."/>
 
     <target name="help">
         <echo message="run ant -projecthelp to see the available targets"/>
@@ -254,7 +266,7 @@
         <ant dir="${basedir}/samples/themes/zen" target="main" />
     </target>
 
-    <target name="javadocs" unless="no.doc"
+    <target name="javadocs" unless="no.doc-packages"
         description="Build javadoc for compiler oem interface">
         <javadoc destdir="${basedir}/javadoc" useexternalfile="yes" maxmemory="128m">
             <classpath>
@@ -307,16 +319,12 @@
     </target>
 
     <!--
-        Build the ASDoc tool.
+        Build the ASDoc html pages.
     -->
     <target name="asdoc" description="asdoc">
         <ant dir="${basedir}/asdoc" />
     </target>
 
-    <target name="additional-packages" 
-        depends="locale-package,ja-locale-samples,antTasks-package,asdoc-package,javadocs" 
-        unless="no.additional"/>
-    
     <!--
         Package up the Apache Flex sources.  Do not include empty directories.
         
@@ -325,12 +333,22 @@
         
         FixMe: clean needs to clean - add code to detect unversioned files
     -->
-    <target name="source-distro" depends="clean-temp"
+    <target name="source-distro" depends="stage-source"
         description="Package source files required to build in zip file">
+        
+        <antcall target="zip-source-distro"/>
+    </target>
 
-        <!-- frameworks -->
+    <target name="zip-source-distro" unless="no.zip">
+        <mkdir dir="${basedir}/out"/>
+        <zip destfile="${basedir}/out/${source.kit}" basedir="${basedir}/temp"/>
+    </target>
+
+    <target name="stage-source"
+        description="Package source files required to build in zip file">
 
-        <mkdir dir="${basedir}/temp"/>
+        <antcall target="clean-temp"/>
+        
         <copy todir="${basedir}/temp" includeEmptyDirs="false">
             <fileset dir="${basedir}">
                 <include name="build.*"/>
@@ -344,46 +362,84 @@
                 <include name="setup.sh"/>
                 <include name="bin/*.bat"/>
                 <include name="bin/*.sh"/>
+                <exclude name="bin/adl*"/>
+                <exclude name="bin/adt*"/>
                 <include name="asdocs/**"/>
-                <include name="frameworks/**"/>
-                <exclude name="frameworks/automation*/**"/>
-                <exclude name="frameworks/libs/**"/>
-                <exclude name="frameworks/test*/**"/>
-                <include name="modules/**"/>
-                <exclude name="modules/*/test/**"/>
-                <exclude name="modules/antTasks/**"/>
-                <include name="templates/swfobject/**"/>
-                <exclude name="lib/**"/>
-                <exclude name="modules/thirdparty/*/merged/**"/>
-                <exclude name="out/**"/>
             </fileset>
         </copy>  
 
-        <!-- now that air-config.xml and flex-config.xml are in temp, fix them up for release. -->
-        <antcall target="fix-config-files"/>
+        <!-- frameworks -->
+        <antcall target="stage-frameworks"/>
+
+        <!-- modules -->
+        <antcall target="stage-modules"/>
         
-        <!-- ant -->
-        <copy file="${basedir}/modules/antTasks/build.xml-distro"
-              tofile="${basedir}/temp/ant/build.xml"/>
-        <copy file="${basedir}/modules/antTasks/flexTasks.tasks"
-              todir="${basedir}/temp/ant"/>
-        <copy file="${basedir}/modules/antTasks/README.txt"
-              tofile="${basedir}/temp/ant/README.txt"/>
-        <copy todir="${basedir}/temp/ant/src">
-            <fileset dir="${basedir}/modules/antTasks/src/"
-                 includes="flex/**/*.java"
-                 excludes="flex/ant/AscTasks.java"/>
-        </copy>
+        <!-- asdoc -->
+        <copy todir="${basedir}/temp/asdoc" includeEmptyDirs="false">
+            <fileset dir="${basedir}/asdoc"/>
+        </copy>  
 
+        <!-- templates -->
+        <copy todir="${basedir}/temp/templates">
+            <fileset dir="${basedir}/templates" >
+                <include name="swfobject/**"/>
+                <exclude name="**/*.swf"/>
+                <exclude name="**/swfobject.js"/>
+            </fileset>
+        </copy>
+                
         <chmod dir="${basedir}/temp" perm="755" includes="bin/*, **/*.bat, **/*.sh, **/*.linux" />
-        
-        <antcall target="zip-source-distro"/>        
     </target>
     
-    <target name="zip-source-distro" unless="kit.debug">
-        <mkdir dir="${basedir}/out"/>
-        <zip destfile="${basedir}/out/${source.kit}" basedir="${basedir}/temp"/>
-        <antcall target="clean-temp"/>
+    <target name="stage-frameworks">
+        <!-- frameworks -->
+        <copy todir="${basedir}/temp/frameworks" includeEmptyDirs="false">
+            <fileset dir="${basedir}/frameworks">
+                <include name="**"/>
+                <exclude name="**/libs/**"/>
+                <exclude name="**/*.swc"/>
+                <exclude name="**/bundles/**/empty.properties"/>
+                <exclude name="test*/**"/>
+                <exclude name="projects/automation*/**"/>
+                <exclude name="projects/air/**"/>
+                <exclude name="projects/textLayout/**"/>
+                <exclude name="projects/spark/manifest.xml"/>
+                <exclude name="projects/**/bundles.properties"/>
+            </fileset>
+        </copy>
+
+        <!-- frameworks/textLayout -->
+        <copy todir="${basedir}/temp/frameworks/projects/textLayout" includeEmptyDirs="false">
+            <fileset dir="${basedir}/frameworks/projects/textLayout">
+                <include name="build.xml"/>
+                <include name=".settings/**"/>
+            </fileset>
+        </copy>
+          
+        <!-- now that air-config.xml and flex-config.xml are in temp, fix them up for release. -->
+        <fix-config-file file="${basedir}/temp/frameworks/air-config.xml" />
+        <fix-config-file file="${basedir}/temp/frameworks/flex-config.xml" />
+    </target>
+
+    <target name="stage-modules" unless="no.modules">
+        <!-- modules -->
+        <copy todir="${basedir}/temp/modules" includeEmptyDirs="false">
+            <fileset dir="${basedir}/modules">
+                <include name="**"/>
+                <exclude name="**/*.jar"/>
+                <exclude name="**/*.vms"/>
+                <exclude name="*/test/**"/>
+                <exclude name="compiler/src/java/velocity.log"/>
+                <exclude name="compiler/**/ParseException.java"/>
+                <exclude name="compiler/**/Parser.java"/>
+                <exclude name="compiler/**/ParserConstants.java"/>
+                <exclude name="compiler/**/Token.java"/>
+                <exclude name="compiler/**/TokenManager.java"/>
+                <exclude name="compiler/**/TokenMgrError.java"/>
+                <exclude name="thirdparty/*/merged/**"/>
+                <exclude name="**/classes/**"/>
+            </fileset>
+        </copy>  
     </target>
     
     <!-- 
@@ -397,40 +453,70 @@
             lib/mxmlc.jar
     -->
 
-    <target name="binary-distro" depends="clean-temp" description="Package binary files in zip file.">
-    
-        <!-- also makes parent ${basedir}/temp  -->
-        <mkdir dir="${basedir}/temp/licenses"/>
+    <target name="binary-distro"
+        description="Package binary files in zip file.">
+
+        <property name="no.modules" value="set" />
+        <antcall target="stage-source"/>
         
-        <copy file="${basedir}/AIR SDK license.pdf" 
-            tofile="${basedir}/temp/licenses/Adobe AIR SDK license.pdf"/>
+        <!-- delete file from source distro that are not in binary distro -->
 
-        <copy todir="${basedir}/temp">
-            <fileset dir="${basedir}">
-                <include name="flex-sdk-description.xml"/>
-                <include name="KEYS"/>
-                <include name="CHANGES"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
-                <include name="README"/>
-                <include name="RELEASE_NOTES"/>
+        <delete dir="${basedir}/temp/">
+            <include name="build.properties"/>
+            <include name="**/build.xml"/>
+            <exclude name="asdoc/build.xml"/>
+        </delete>
+
+        <!-- there are framework sources for debugging built with build_framework.xml -->
+        
+        <delete dir="${basedir}/temp/frameworks" includeemptydirs="true">
+            <include name="build_framework.xml"/>
+            <include name="projects/*/.*/**"/>
+            <include name="projects/*/asdoc/**"/>
+            <include name="projects/*/bundles/*/docs/**"/>
+            <include name="projects/flash-integration/**"/>
+            <exclude name="projects/flash-integration/src/**"/>
+            <exclude name="projects/flash-integration/manifest.xml"/>
+            <include name="projects/playerglobal/**"/>
+        </delete>
+        
+        <!-- remove some of the themes and all the src for the themes -->
+        <delete dir="${basedir}/temp/frameworks/themes" includeemptydirs="true">
+            <include name="Ice/**"/>
+            <include name="Institutional/**"/>
+            <include name="Smoke/**"/>
+            <include name="Wooden/**"/>
+            <include name="**/src/**"/>
+        </delete>
+        
+        <!-- there are no compiler sources in the bin kit -->
+        <!--delete dir="${basedir}/temp/modules"/-->
+        
+        <!-- delete any left-over empty directories -->
+        <delete includeemptydirs="true">
+            <fileset dir="${basedir}/temp/frameworks">
+                <and>
+                    <size value="0"/>
+                    <type type="dir"/>
+                </and>
             </fileset>
-        </copy>
+        </delete>
+
+        <!-- these files are in addition to the remaining source files -->
+        
+        <!--copy file="${basedir}/flex-sdk-description.xml" todir="${basedir}/temp"/-->
 
         <!-- concat the license file with the binary license file for the 3rd party deps -->
         <concat destfile="${basedir}/temp/LICENSE">
             <filelist dir="${FLEX_HOME}" files="LICENSE,LICENSE.bin"/>
         </concat>
         
-        <!-- ant -->
-        <copy file="${basedir}/modules/antTasks/flexTasks.tasks"
-              todir="${basedir}/temp/ant"/>
-        <!-- FixMe: README files were excluded from initial modules donation -->
-        <!--copy file="${basedir}/modules/antTasks/README.txt"
-              tofile="${basedir}/temp/ant/README.txt"/-->
-        <copy todir="${basedir}/temp/ant/lib">
-            <fileset dir="${basedir}/lib" includes="flexTasks.jar"/>
-        </copy>
+        <!-- use this to build frameworks -->
+        <copy file="${basedir}/frameworks/build_framework.xml" 
+            tofile="${basedir}/temp/frameworks/build.xml"/>
+
+        <!-- ant is pre-built and in FLEX_HOME/ant rather than modules/antTasks -->
+        <antcall target="stage-antTasks"/>
 
         <!-- bin -->
         <copy todir="${basedir}/temp/bin">
@@ -464,19 +550,9 @@
                 <include name="swfdump.bat"/>
             </fileset>
         </copy>
-        <mkdir dir="${basedir}/temp/bin"/>
-        <fixcrlf eol="unix" srcdir="${basedir}/temp/bin" includes="acompc,amxmlc,asdoc,compc,copylocale,fdb,mxmlc,fcsh,optimizer,digest,fontswf"/>
-
-        <!-- frameworks/javascript -->
-        <!-- not currently in Apache Flex -->
-        <!--
-        <copy todir="${basedir}/temp/frameworks/javascript/fabridge">
-            <fileset dir="${basedir}/frameworks/javascript/FABridge">
-                <exclude name="build.*"/>
-                <exclude name="readme.txt"/>
-            </fileset>
-        </copy>
-        -->
+        <fixcrlf eol="unix" 
+            srcdir="${basedir}/temp/bin" 
+            includes="acompc,amxmlc,asdoc,compc,copylocale,fdb,mxmlc,fcsh,optimizer,digest,fontswf"/>
         
         <!-- frameworks/libs -->
         <copy todir="${basedir}/temp/frameworks/libs">
@@ -501,8 +577,6 @@
 				<include name="player/11.1/playerglobal.swc"/>
             </fileset>
         </copy>
-
-        <!-- automation swcs -->
         
         <!-- not currently in Apache Flex (formerly qtp and qtp_air) -->
         <!--
@@ -524,45 +598,13 @@
             </fileset>
         </copy>
         -->
-        
-        <!-- frameworks/locale -->
-        <copy todir="${basedir}/temp/frameworks/locale">
-            <fileset dir="${basedir}/frameworks/locale">
-                <include name="**/*.swc"/>
-                <include name="**/metadata.properties"/>
-            </fileset>
-        </copy>
-
-        <!-- frameworks -->
+           
+        <!-- generated files in frameworks -->
         <copy todir="${basedir}/temp/frameworks">
             <fileset dir="${basedir}/frameworks">
-				<include name="air-config.xml"/>
-				<include name="airmobile-config.xml"/>
-                <include name="flash-unicode-table.xml"/>
-                <include name="flex-config.xml"/>
-                <include name="metadata.xml"/>
-                <include name="mxml-manifest.xml"/>
-                <!-- required by FlashBuilder -->
-				<include name="localFonts.ser"/>
-				<include name="macFonts.ser"/>
-				<include name="winFonts.ser"/>
-				<include name="mxml-2009-manifest.xml"/>
-				<include name="spark-manifest.xml"/>
-				<include name="mx-manifest.xml"/>
-            </fileset>
-        </copy>
-
-        <!-- now that air-config.xml and flex-config.xml are in temp, fix them up for release. -->
-        <antcall target="fix-config-files" />
-        
-        <!-- frameworks/themes -->
-        <copy todir="${basedir}/temp/frameworks/themes" includeEmptyDirs="false">
-            <fileset dir="${basedir}/frameworks/themes">
-                <exclude name="**/HaloClassic/*"/>
-                <exclude name="**/Institutional/*"/>
-                <exclude name="**/Ice/*"/>
-                <exclude name="**/Smoke/*"/>
-                <exclude name="**/Wooden/*"/>
+                <include name="projects/*/bundles.properties"/>
+                <include name="projects/spark/manifest.xml"/>
+                <include name="themes/**/*.swc"/>
             </fileset>
         </copy>
 
@@ -615,24 +657,24 @@
             </fileset>
         </copy>
 
-        <!-- templates -->
+        <!-- locale swcs -->
+        <copy todir="${basedir}/temp/frameworks/locale">
+            <fileset dir="${basedir}/frameworks/locale">
+                <include name="**/*.swc"/>
+            </fileset>
+        </copy>
+
+        <!-- swfobject templates -->
         <copy todir="${basedir}/temp/templates">
             <fileset dir="${basedir}/templates" >
                 <include name="swfobject/**"/>
-                <exclude name="swfobject/readme.txt"/>
-            </fileset>
-        </copy>
-        
-        <!-- sample themes -->
-        <copy todir="${basedir}/temp">
-            <fileset dir="${basedir}">
-                <include name="samples/themes/**" />
             </fileset>
         </copy>
-        
+                
         <!-- 
-            Add AIR SDK Files. Runtime files not included since they weren't in 
-            Adobe Flex MPL kit. 
+            Add AIR SDK Files. 
+            
+            Note: bin/adl and templates/air are needed to create a mobile project in FlashBuilder.
         -->
         <antcall target="air-package"/>
     
@@ -640,37 +682,43 @@
         
         <antcall target="zip-binary-distro"/>        
     </target>
-    
-    <target name="zip-binary-distro" unless="kit.debug">
+        
+    <target name="zip-binary-distro" unless="no.zip"
+        description="Zips up the files in the temp directory into the binary zipfile.">
         <mkdir dir="${basedir}/out"/>
         <zip destfile="${basedir}/out/${binary.kit}" basedir="${basedir}/temp"/>
-        <antcall target="clean-temp"/>
     </target>
+   
+    <!-- FixMe: do we have the right license to include these in our binary distro? -->
+    <target name="air-package" unless="no.air.integration"
+        description="Add the AIR SDK files to the binary distro">
     
+        <copy file="${basedir}/AIR SDK license.pdf" 
+            tofile="${basedir}/temp/licenses/Adobe AIR SDK license.pdf"/>
 
-    <target name="air-package" description="Add the AIR SDK files to the binary distro">
-    
-        <move file="${basedir}/AIR SDK license.pdf" tofile="${basedir}/Adobe AIR SDK license.pdf"/>
-
+        <!-- FixMe: symlinks are broken -->
         <copy todir="${basedir}/temp">
             <fileset dir="${basedir}">
                 <include name="include/**"/>
                 <include name="install/**"/>
+                <include name="runtimes/**"/>
+                <exclude name="runtimes/air/win/**"/>
             </fileset>
         </copy>
 
         <copy todir="${basedir}/temp/bin">
             <fileset dir="${basedir}/bin">
-                <include name="bin/adl*"/>
-                <include name="bin/adt*"/>
+                <include name="adl*"/>
+                <include name="adt*"/>
             </fileset>
         </copy>
 
+        <chmod dir="${basedir}/temp" perm="755" includes="bin/*" />
+
         <copy todir="${basedir}/temp/frameworks/libs/air">
             <fileset dir="${basedir}/frameworks/libs/air"/>
         </copy>
         
-        <!-- FixMe: does this go in a binary kit? -->
         <copy todir="${basedir}/temp/frameworks/projects/air">
             <fileset dir="${basedir}/frameworks/projects/air"/>
         </copy>
@@ -680,6 +728,7 @@
                 <include name="adt.jar" />
                 <include name="android/**" />
                 <include name="aot/**" />
+                <include name="nai/**" />
             </fileset>
         </copy>
         
@@ -688,43 +737,42 @@
                 <include name="FlashRuntimeExtensions.lib" />
             </fileset>
         </copy>
-        
-        <!-- FixMe: where are these files -->
-        
-        <!-- sample themes -->
-        <copy todir="${basedir}/temp/samples/themes" failonerror="false">
-            <fileset dir="${basedir}/samples/themes"/>
-        </copy>
 
+        <!-- samples -->
+        <copy todir="${basedir}/temp/samples">
+            <fileset dir="${basedir}/samples">
+                <include name="badge/**" />
+                <include name="icons/**" />
+                <include name="descriptor-sample.xml" />
+            </fileset>
+        </copy>
+        
         <!-- templates -->
         <copy todir="${basedir}/temp/templates">
             <fileset dir="${basedir}/templates" >
+                <include name="air/**"/>
                 <include name="extensions/**"/>
             </fileset>
         </copy>    
     </target>
     
-    <target name="fix-config-files">
-		<replace file="${basedir}/temp/frameworks/flex-config.xml">
-			<replacefilter
-				token="&lt;warn-no-explicit-super-call-in-constructor&gt;true"
-				value="&lt;warn-no-explicit-super-call-in-constructor&gt;false"/>
-			<replacefilter
-				token="$${build.number}"
-				value="${release.version}.${build.number}"/>
-		</replace>
-		<replace file="${basedir}/temp/frameworks/air-config.xml">
-			<replacefilter
-				token="&lt;warn-no-explicit-super-call-in-constructor&gt;true"
-				value="&lt;warn-no-explicit-super-call-in-constructor&gt;false"/>
-			<replacefilter
-				token="$${build.number}"
-				value="${release.version}.${build.number}"/>
-		</replace>
-    </target>
+    <macrodef name="fix-config-file">
+        <attribute name="file"/>
+            <sequential>
+                <replace file="@{file}">
+                    <replacefilter
+                        token="&lt;warn-no-explicit-super-call-in-constructor&gt;true"
+                        value="&lt;warn-no-explicit-super-call-in-constructor&gt;false"/>
+                    <replacefilter
+                        token="$${build.number}"
+                        value="${release.version}.${build.number}"/>
+                </replace>
+        </sequential>
+    </macrodef>	
     
-    <target name="locale-package" depends="clean-temp"
-        description="Package all the locale swc's built">
+    <!-- ToDo: this just stages the files but doesn't zip them?? -->
+    <target name="locale-package" unless="no.additional-packages"
+        description="Stage all the locale swc's built">
         
         <copy todir="${basedir}/temp/frameworks/locale" verbose="true">
             <fileset dir="${basedir}/frameworks/locale">
@@ -836,7 +884,8 @@
         </copy>
     </target>
 
-    <target name="ja-locale-samples" depends="clean-temp">
+    <target name="ja-locale-samples" unless="no.additional-packages">
+        <antcall target="clean-temp"/>
         <!--
         <copy todir="${basedir}/temp/samples_ja">
             <fileset dir="${basedir}/samples/ja_JP">
@@ -846,27 +895,15 @@
         </copy>
         <mkdir dir="${basedir}/out"/>
         <zip file="${basedir}/out/${kit.prefix}-locales.zip" basedir="${basedir}/temp" includes="**"/>
-        <antcall target="clean-temp"/>
         -->
     </target>
+ 
+    <target name="antTasks-package" unless="no.additional-packages">
 
-    <target name="antTasks-package" depends="antTasks,clean-temp">
-        <copy file="${basedir}/modules/antTasks/build.xml-distro"
-              tofile="${basedir}/temp/build.xml"/>
-        <copy file="${basedir}/modules/antTasks/flexTasks.tasks"
-              todir="${basedir}/temp"/>
-
-        <!-- lib -->
-        <copy todir="${basedir}/temp/lib">
-            <fileset dir="${basedir}/lib" includes="flexTasks.jar"/>
-        </copy>
-
-        <!-- src -->
-        <copy todir="${basedir}/temp/src">
-            <fileset dir="${basedir}/modules/antTasks/src/"
-                 includes="flex2/**/*.java"
-                 excludes="flex2/ant/AscTasks.java"/>
-        </copy>
+        <antcall target="antTasks"/>
+        <antcall target="clean-temp"/>
+        
+        <antcall target="stage-antTasks"/>
 
         <!-- templates -->
         <copy todir="${basedir}/temp/templates">
@@ -883,8 +920,32 @@
         <antcall target="clean-temp"/>
     </target>
 
-    <target name="asdoc-package" depends="clean-temp" unless="no.doc"
-        description="Package the asdocs">
+    <target name="stage-antTasks" description="Stage antTask binaries.">
+        
+        <copy file="${basedir}/modules/antTasks/build.xml-distro"
+              tofile="${basedir}/temp/ant/build.xml"/>
+        <copy file="${basedir}/modules/antTasks/README.txt"
+              tofile="${basedir}/temp/ant/README.txt"/>
+        <copy file="${basedir}/modules/antTasks/flexTasks.tasks"
+              todir="${basedir}/temp/ant"/>
+
+        <!-- lib -->
+        <copy todir="${basedir}/temp/ant/lib">
+            <fileset dir="${basedir}/lib" includes="flexTasks.jar"/>
+        </copy>
+
+        <!-- src -->
+        <copy todir="${basedir}/temp/ant/src">
+            <fileset dir="${basedir}/modules/antTasks/src/">
+                 <include name="flex/**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+    
+    <target name="asdoc-package" unless="no.doc-packages" description="Package the asdocs">      
+        <antcall target="clean-temp"/>
+        <antcall target="asdoc"/>
+        
         <copy todir="${basedir}/temp/asdoc">
             <fileset dir="${basedir}/asdoc-output"/>
         </copy>
@@ -935,7 +996,7 @@
         <delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
     </target>
 
-    <!-- Builds the asdoc for the framework classes. -->
+    <!-- Builds fat swcs. -->
     <target name="doc" unless="no.doc">
         <ant dir="${basedir}/frameworks" target="doc" />
     </target>

Modified: incubator/flex/trunk/frameworks/air-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/air-config.xml?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/air-config.xml (original)
+++ incubator/flex/trunk/frameworks/air-config.xml Fri Apr 27 17:53:29 2012
@@ -330,88 +330,8 @@
 
    <!-- remove-unused-rsls: remove RSLs that are not being used by the application-->
    <remove-unused-rsls>true</remove-unused-rsls>
-
-   <!-- A list of runtime shared library URLs to be loaded before applications start. -->
-   <!-- not set -->
-   <!--
-   <runtime-shared-libraries>
-      <url>string</url>
-      <url>string</url>
-   </runtime-shared-libraries>
-   -->
-   
- 	<!-- runtime-shared-library-path: specifies a SWC or directory to link against and an RSL URL to load with optional failover URLs -->
-      <!-- Framework SWC -->
-	<runtime-shared-library-path>
-		<path-element>libs/framework.swc</path-element>
-		<rsl-url>framework_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-   
-	<!-- TextLayout SWC -->
-      <runtime-shared-library-path>
-		<path-element>libs/textLayout.swc</path-element>
-		<rsl-url>textLayout_2.0.0.232.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-    
-      <!-- Spark SWC-->
-   	<runtime-shared-library-path>
-		<path-element>libs/spark.swc</path-element>
-		<rsl-url>spark_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-	
-      <!-- Sparkskins SWC-->
-   	<runtime-shared-library-path>
-		<path-element>libs/sparkskins.swc</path-element>
-		<rsl-url>sparkskins_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-	 
-	<!-- RPC SWC -->
-	<runtime-shared-library-path>
-		<path-element>libs/rpc.swc</path-element>
-		<rsl-url>rpc_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-    	
-      <!-- Charts SWC -->
-	<runtime-shared-library-path>
-		<path-element>libs/charts.swc</path-element>
-		<rsl-url>charts_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-
-      <!-- Spark_dmv SWC -->
-	<runtime-shared-library-path>
-		<path-element>libs/spark_dmv.swc</path-element>
-		<rsl-url>spark_dmv_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-
-      <!-- OSMF SWC -->
-     <runtime-shared-library-path>
-		<path-element>libs/osmf.swc</path-element>
-		<rsl-url>osmf_1.0.0.16316.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-      
-      <!-- MX SWC -->
-	<runtime-shared-library-path>
-		<path-element>libs/mx/mx.swc</path-element>
-		<rsl-url>mx_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
-   
-      <!-- Advancedgrids SWC -->
-	<runtime-shared-library-path>
-		<path-element>libs/advancedgrids.swc</path-element>
-		<rsl-url>advancedgrids_4.6.0.0.swf</rsl-url>
-		<policy-file-url></policy-file-url>
-	</runtime-shared-library-path>
 	
-	<!-- static-link-runtime-shared-libraries: statically link the libraries specified by the -runtime-shared-libraries-path option.-->
+    <!-- static-link-runtime-shared-libraries: statically link the libraries specified by the -runtime-shared-libraries-path option.-->
 	<static-link-runtime-shared-libraries>true</static-link-runtime-shared-libraries>
    
    <!-- target-player: specifies the version of the player the application is targeting. 
@@ -426,9 +346,9 @@
    
    <!-- Metadata added to SWFs via the SWF Metadata tag. -->
    <metadata>
-      <title>Adobe Flex 4 Application</title>
+      <title>Apache Flex 4 Application</title>
       <description>http://www.adobe.com/products/flex</description>
-      <publisher>unknown</publisher>
+      <publisher>Apache Software Founcation</publisher>
       <creator>unknown</creator>
       <language>EN</language>
    </metadata>

Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Fri Apr 27 17:53:29 2012
@@ -210,7 +210,8 @@
 
     <target name="airsdk-clean" description="Delete files copied from the AIR SDK">
         <!-- Delete AIR files and directories from 'prepare' target -->
-        <delete file="${FLEX_HOME}/AIR SDK*.pdf"/>
+        <delete file="${FLEX_HOME}/AIR SDK license.pdf"/>
+        <delete file="${FLEX_HOME}/AIR SDK Readme.txt"/>
         <delete file="${FLEX_HOME}/bin/adl"/>
         <delete file="${FLEX_HOME}/bin/adl.exe"/>
         <delete file="${FLEX_HOME}/bin/adt"/>
@@ -232,7 +233,7 @@
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${FLEX_HOME}/templates">
                 <include name="air/**" />
-                <include name="extenstions/**" />
+                <include name="extensions/**" />
             </fileset>
         </delete>
     </target>
@@ -273,32 +274,20 @@ tar -xjf "AIR Integration Kit.tbz2" 
         <unzip src="${FLEX_HOME}/in/air/win/AIR Integration Kit.zip" dest="${FLEX_HOME}"/>
     </target>
 
-    <!-- 
-        FixMe:
-        For development can we just download the flavor that matches the system and
-        download the missing ones if/when building a binary kit?
-    -->
     <target name="airsdk-prepare" depends="airsdk-prepare-mac,airsdk-prepare-win" 
         description="Prepares for building framework SWCs">
         
-        <!--
-            FixMe: Most of these files seem to be in the Adobe MPL kit.  If they should go in the
-            Apache binary distro they shouldn't be deleted here.
-        -->        
-        <!-- Delete AIK files that we don't put in the SDK -->
+        <!-- Delete AIK files that we don't put in the Open Source SDK -->
         <!--
         <delete file="${FLEX_HOME}/frameworks/libs/air/AIRAliases.js"/>
         <delete file="${FLEX_HOME}/frameworks/libs/air/airglobal.abc"/>
         <delete file="${FLEX_HOME}/frameworks/libs/air/servicemonitor.swf"/>
-        -->
         <delete file="${FLEX_HOME}/AIR SDK Readme.txt"/>
         <delete dir="${FLEX_HOME}/lib/aot/bin/as"/>
         <delete dir="${FLEX_HOME}/lib/aot/bin/strip"/>
         <delete dir="${FLEX_HOME}/lib/aot/lib/gcc"/>
         <delete dir="${FLEX_HOME}/lib/nai"/>
-        
-        <!-- Delete AIR files for 3.x support -->
-        <delete dir="${FLEX_HOME}/frameworks/libs/air/flex3" quiet="true" />
+        -->
     </target>
 
     <!-- Download thirdparty code -->

Modified: incubator/flex/trunk/frameworks/build_framework.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build_framework.xml?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build_framework.xml (original)
+++ incubator/flex/trunk/frameworks/build_framework.xml Fri Apr 27 17:53:29 2012
@@ -29,6 +29,8 @@
     -->
 
     <property name="FLEX_HOME" value="${basedir}/.."/>
+    <property name="build.number" value="0"/>
+    
     <property name="locale" value="en_US"/>
     <property name="projects.dir" value="${FLEX_HOME}/frameworks/projects"/>
     <property name="airframework.dir" value="${projects.dir}/airframework"/>
@@ -54,34 +56,14 @@
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
 
 	<!-- This does not contain the automation jars but they could be added.  -->
-    <target name="main" depends="clean,thirdparty-downloads,prepare,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,authoringsupport,bundles,themes,sparkskins,spark_dmv"/>
+    <target name="main" depends="clean,thirdparty-downloads,prepare,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,bundles,themes,sparkskins,spark_dmv"/>
 
     <target name="bundles" depends="framework_rb,mx_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb"/>
     
-    <target name="prepare" depends="create-description" description="Copies manifests to project directories so the IDE can find them">
+    <target name="prepare" description="Copies manifests to project directories so the IDE can find them">
         <copy file="${FLEX_HOME}/frameworks/spark-manifest.xml" tofile="${FLEX_HOME}/frameworks/projects/spark/manifest.xml" overwrite="true"/>
     </target>
     
-    <!--
-       This is typically generated by the top-level build.xml.  
-       Temporarily do it here while we are just building frameworks.
-
-    -->
-    
-    <property name="release" value="Apache Flex 4.6.0"/>    
-    <property name="release.version" value="4.6.0"/>    
-    <property name="build.number" value="0"/>    
-
-    <target name="create-description" description="This file is used by FlashBuilder to identify the SDK">
-        <echo file="${FLEX_HOME}/flex-sdk-description.xml">&lt;?xml version="1.0"?&gt;
-&lt;flex-sdk-description&gt;
-&lt;name&gt;${release}&lt;/name&gt;
-&lt;version&gt;${release.version}&lt;/version&gt;
-&lt;build&gt;${build.number}&lt;/build&gt;
-&lt;/flex-sdk-description&gt;
-        </echo>
-    </target>
-
     <target name="advancedgrids" description="Builds advancedgrids.swc">
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="" 
             accessible="true" show-deprecation-warnings="false"

Modified: incubator/flex/trunk/frameworks/flex-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/flex-config.xml?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/flex-config.xml (original)
+++ incubator/flex/trunk/frameworks/flex-config.xml Fri Apr 27 17:53:29 2012
@@ -338,21 +338,10 @@
    <!-- Metadata added to SWFs via the SWF Metadata tag. -->
    <metadata>
       <title>Apache Flex Application</title>
-      <description>http://www.adobe.com/products/flex</description>
-      <publisher>unknown</publisher>
+      <description>http://incubator.apache.org/flex</description>
+      <publisher>Apache Software Foundation</publisher>
       <creator>unknown</creator>
       <language>EN</language>
    </metadata>
-
-   <!-- licenses: specifies a list of product and serial number pairs. -->
-   <!-- not set -->
-   <!--
-   <licenses>
-      <license>
-         <product>string</product>
-         <serial-number>number</serial-number>
-      </license>
-   </licenses>
-   -->
-
+   
 </flex-config>

Propchange: incubator/flex/trunk/frameworks/locale/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/da_DK/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/de_DE/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/en_US/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/es_ES/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/fi_FI/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/fr_FR/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/it_IT/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/ja_JP/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/ko_KR/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/nb_NO/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/nl_NL/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/pt_BR/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/ru_RU/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/sv_SE/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/zh_CN/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/locale/zh_TW/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.swc

Propchange: incubator/flex/trunk/frameworks/projects/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+air

Propchange: incubator/flex/trunk/frameworks/projects/advancedgrids/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/advancedgrids/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/advancedgrids/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/advancedgrids/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/advancedgrids/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/airframework/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/airframework/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airframework/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airframework/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/airframework/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/airspark/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/airspark/src/spark/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airspark/src/spark/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airspark/src/spark/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/airspark/src/spark/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/authoringsupport/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/projects/automation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Modified: incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Modified: incubator/flex/trunk/frameworks/projects/automation_dmv/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_dmv/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_dmv/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_dmv/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Modified: incubator/flex/trunk/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -24,4 +24,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Modified: incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Modified: incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/charts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/charts/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/charts/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/charts/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/charts/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1,2 @@
+libs
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/bundles/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+empty.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/bundles/de_DE/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+empty.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/bundles/en_US/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+empty.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/bundles/fr_FR/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+empty.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/bundles/ja_JP/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+empty.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/bundles/ru_RU/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+empty.properties

Propchange: incubator/flex/trunk/frameworks/projects/flash-integration/bundles/zh_CN/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+empty.properties

Propchange: incubator/flex/trunk/frameworks/projects/framework/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/core/FlexVersion.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/core/FlexVersion.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/core/FlexVersion.as (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/core/FlexVersion.as Fri Apr 27 17:53:29 2012
@@ -56,7 +56,21 @@ public class FlexVersion 
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    public static const CURRENT_VERSION:uint = 0x04060000;
+    public static const CURRENT_VERSION:uint = 0x04080000;
+
+    /** 
+     *  The <code>compatibilityVersion</code> value of Flex 4.8,
+     *  encoded numerically as a <code>uint</code>.
+     *  Code can compare this constant against
+     *  the <code>compatibilityVersion</code>
+     *  to implement version-specific behavior.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 11
+     *  @playerversion AIR 3
+     *  @productversion Apache Flex 4.8
+     */
+    public static const VERSION_4_8:uint = 0x04080000;
 
     /** 
      *  The <code>compatibilityVersion</code> value of Flex 4.6,

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/halo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/projects/mobilecomponents/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/projects/mobiletheme/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/projects/mx/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/mx/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mx/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mx/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/mx/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/rpc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/rpc/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/rpc/src/mx/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/rpc/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/rpc/src/mx/core/Version.as Fri Apr 27 17:53:29 2012
@@ -22,4 +22,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/spark/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1,2 @@
+bundles.properties
+manifest.xml

Modified: incubator/flex/trunk/frameworks/projects/spark/src/spark/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/src/spark/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/src/spark/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/spark/src/spark/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/spark_dmv/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/spark_dmv/src/spark/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark_dmv/src/spark/core/Version.as?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark_dmv/src/spark/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/spark_dmv/src/spark/core/Version.as Fri Apr 27 17:53:29 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/sparkskins/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/projects/wireframe/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+bundles.properties

Propchange: incubator/flex/trunk/frameworks/themes/Halo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+halo.swc

Propchange: incubator/flex/trunk/frameworks/themes/Mobile/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+mobile.swc

Propchange: incubator/flex/trunk/frameworks/themes/Wireframe/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+wireframe.swc

Propchange: incubator/flex/trunk/modules/antTasks/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+classes

Propchange: incubator/flex/trunk/modules/compiler/src/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+velocity.log

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/abc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/binding/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/genext/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/managed/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/reflect/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/asdoc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/config/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/extensions/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/fxg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/i18n/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/io/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/analyzer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/dom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/gen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/lang/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/reflect/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/rep/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/rep/decl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/rep/init/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/swc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/swc/catalog/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/swc/zip/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/graph/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+*.vms

Propchange: incubator/flex/trunk/modules/debugger/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+classes

Propchange: incubator/flex/trunk/modules/fxgutils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+classes

Propchange: incubator/flex/trunk/modules/swfutils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+classes

Modified: incubator/flex/trunk/modules/swfutils/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/swfutils/build.xml?rev=1331520&r1=1331519&r2=1331520&view=diff
==============================================================================
--- incubator/flex/trunk/modules/swfutils/build.xml (original)
+++ incubator/flex/trunk/modules/swfutils/build.xml Fri Apr 27 17:53:29 2012
@@ -84,9 +84,7 @@
         <delete failonerror="false" includeEmptyDirs="true">
             <fileset file="${lib.dir}/swfutils.jar"/>
             <fileset file="${lib.dir}/swfdump.jar"/>
-            <fileset dir="${module.classes}">
-                <include name="**/*"/>
-            </fileset>
+            <fileset dir="${module.classes}"/>
         </delete>
     </target>
 

Propchange: incubator/flex/trunk/modules/thirdparty/batik/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+merged

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+merged

Propchange: incubator/flex/trunk/modules/thirdparty/xerces-patch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -0,0 +1 @@
+classes

Propchange: incubator/flex/trunk/templates/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 27 17:53:29 2012
@@ -1 +1,2 @@
+air
 extensions



Mime
View raw message