You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/06/27 22:28:07 UTC
svn commit: r1354709 - in /incubator/flex/trunk: NOTICE build.xml
frameworks/air-config.xml frameworks/downloads.xml frameworks/flex-config.xml
Author: cframpton
Date: Wed Jun 27 20:28:06 2012
New Revision: 1354709
URL: http://svn.apache.org/viewvc?rev=1354709&view=rev
Log:
- add the <runtime-shared-library-path><path-element> tags back to flex-config.xml and air-config.xml. Even though <static-link-runtime-shared-libraries> is true, it turns out that FlashBuilder uses these for flex library projects to determine if the Link Type can be external (vs merged into code).
- osmf.swf and textLayout.swf should not be in the binary kit. You can, cd to frameworks and run 'ant thirdparty-downloads' to get these, and swfobject, or you can use one of the tools to make an SDK for an IDE.
- remove information about FlexContentHolderThumbnail.swc from the NOTICE file since we no longer include this file
Modified:
incubator/flex/trunk/NOTICE
incubator/flex/trunk/build.xml
incubator/flex/trunk/frameworks/air-config.xml
incubator/flex/trunk/frameworks/downloads.xml
incubator/flex/trunk/frameworks/flex-config.xml
Modified: incubator/flex/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/NOTICE?rev=1354709&r1=1354708&r2=1354709&view=diff
==============================================================================
--- incubator/flex/trunk/NOTICE (original)
+++ incubator/flex/trunk/NOTICE Wed Jun 27 20:28:06 2012
@@ -29,6 +29,3 @@ The Open Source Media Framework used by
The Adobe Text Layout Framework used by the Spark text components is licensed under the
Mozilla Public License Version 1.1. The source code can be found here:
http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip
-
-The Flash authoring support uses FlexContentHolderThumbnail.swc which is licensed under
- under the Mozilla Public License Version 1.1.
Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1354709&r1=1354708&r2=1354709&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Wed Jun 27 20:28:06 2012
@@ -753,6 +753,21 @@
<!-- locales -->
<antcall target="stage-locales"/>
+ <!-- generated files in frameworks excepts libs and rsls -->
+ <copy todir="${basedir}/temp/frameworks">
+ <fileset dir="${basedir}/frameworks">
+ <include name="projects/*/bundles.properties"/>
+ <include name="projects/spark/manifest.xml"/>
+ <include name="**/*.pbj"/>
+ <include name="**/*.swc"/>
+ <include name="**/*.swf"/>
+ <exclude name="libs/**"/>
+ <exclude name="rsls/**"/>
+ <exclude name="tests/**"/>
+ </fileset>
+ </copy>
+
+
<!-- frameworks/libs -->
<copy todir="${basedir}/temp/frameworks/libs">
<fileset dir="${basedir}/frameworks/libs">
@@ -796,18 +811,6 @@
<fileset dir="${basedir}/frameworks/rsls"/>
</copy>
- <!-- generated files in frameworks -->
- <copy todir="${basedir}/temp/frameworks">
- <fileset dir="${basedir}/frameworks">
- <include name="projects/*/bundles.properties"/>
- <include name="projects/spark/manifest.xml"/>
- <include name="**/*.pbj"/>
- <include name="**/*.swc"/>
- <include name="**/*.swf"/>
- <exclude name="tests/**"/>
- </fileset>
- </copy>
-
<!-- the jar files -->
<antcall target="stage-lib"/>
Modified: incubator/flex/trunk/frameworks/air-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/air-config.xml?rev=1354709&r1=1354708&r2=1354709&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/air-config.xml (original)
+++ incubator/flex/trunk/frameworks/air-config.xml Wed Jun 27 20:28:06 2012
@@ -332,6 +332,82 @@
<!-- 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_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- TextLayout SWC -->
+ <!--
+ Even though there is no textLayout rsl leave this in so that in a FlashBuilder
+ Flex Library project, FlashBuilder will allow "Link Type" to be external.
+ -->
+ <runtime-shared-library-path>
+ <path-element>libs/textLayout.swc</path-element>
+ </runtime-shared-library-path>
+
+ <!-- Spark SWC-->
+ <runtime-shared-library-path>
+ <path-element>libs/spark.swc</path-element>
+ <rsl-url>spark_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Sparkskins SWC-->
+ <runtime-shared-library-path>
+ <path-element>libs/sparkskins.swc</path-element>
+ <rsl-url>sparkskins_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- RPC SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/rpc.swc</path-element>
+ <rsl-url>rpc_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Charts SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/charts.swc</path-element>
+ <rsl-url>charts_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Spark_dmv SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/spark_dmv.swc</path-element>
+ <rsl-url>spark_dmv_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- OSMF SWC -->
+ <!--
+ Even though there is no OSMF rsl leave this in so that in a FlashBuilder
+ Flex Library project, FlashBuilder will allow "Link Type" to be external.
+ -->
+ <runtime-shared-library-path>
+ <path-element>libs/osmf.swc</path-element>
+ </runtime-shared-library-path>
+
+ <!-- MX SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/mx/mx.swc</path-element>
+ <rsl-url>mx_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Advancedgrids SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/advancedgrids.swc</path-element>
+ <rsl-url>advancedgrids_${build.number}.swf</rsl-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>true</static-link-runtime-shared-libraries>
Modified: incubator/flex/trunk/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/downloads.xml?rev=1354709&r1=1354708&r2=1354709&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/downloads.xml (original)
+++ incubator/flex/trunk/frameworks/downloads.xml Wed Jun 27 20:28:06 2012
@@ -89,7 +89,7 @@
Notify before downloading file with MPL1.1 license.
-->
<target name="ask-osmf" unless="build.noprompt">
- <echo message="The Open Source Media Framework used by the video components"/>
+ <echo message="The Open Source Media Framework (OSMF) used by the video components"/>
<echo message="is licensed under the Mozilla Public License Version 1.1."/>
<antcall target="echo-mpl1.1-license"/>
<property name="do.osmf.install" value="set" />
@@ -179,7 +179,7 @@
Notify before downloading file with MPL1.1 license.
-->
<target name="ask-tlf" unless="build.noprompt">
- <echo message="The Adobe Text Layout Framework used by the Spark text components"/>
+ <echo message="The Adobe Text Layout Framework (TLF) used by the Spark text components"/>
<echo message="is licensed under the Mozilla Public License Version 1.1."/>
<antcall target="echo-mpl1.1-license"/>
</target>
Modified: incubator/flex/trunk/frameworks/flex-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/flex-config.xml?rev=1354709&r1=1354708&r2=1354709&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/flex-config.xml (original)
+++ incubator/flex/trunk/frameworks/flex-config.xml Wed Jun 27 20:28:06 2012
@@ -324,6 +324,94 @@
</compiler>
+ <!-- compute-digest: writes a digest to the catalog.xml of a library. Use this when the library will be used as a
+ cross-domain rsl.-->
+ <!-- compute-digest usage:
+ <compute-digest>boolean</compute-digest>
+ -->
+
+ <!-- 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_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- TextLayout SWC -->
+ <!--
+ Even though there is no textLayout rsl leave this in so that in a FlashBuilder
+ Flex Library project, FlashBuilder will allow "Link Type" to be external.
+ -->
+ <runtime-shared-library-path>
+ <path-element>libs/textLayout.swc</path-element>
+ </runtime-shared-library-path>
+
+ <!-- Spark SWC-->
+ <runtime-shared-library-path>
+ <path-element>libs/spark.swc</path-element>
+ <rsl-url>spark_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Sparkskins SWC-->
+ <runtime-shared-library-path>
+ <path-element>libs/sparkskins.swc</path-element>
+ <rsl-url>sparkskins_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- RPC SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/rpc.swc</path-element>
+ <rsl-url>rpc_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Charts SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/charts.swc</path-element>
+ <rsl-url>charts_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Spark_dmv SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/spark_dmv.swc</path-element>
+ <rsl-url>spark_dmv_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- OSMF SWC -->
+ <!--
+ Even though there is no OSMF rsl leave this in so that in a FlashBuilder
+ Flex Library project, FlashBuilder will allow "Link Type" to be external.
+ -->
+ <runtime-shared-library-path>
+ <path-element>libs/osmf.swc</path-element>
+ </runtime-shared-library-path>
+
+ <!-- MX SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/mx/mx.swc</path-element>
+ <rsl-url>mx_${build.number}.swf</rsl-url>
+ </runtime-shared-library-path>
+
+ <!-- Advancedgrids SWC -->
+ <runtime-shared-library-path>
+ <path-element>libs/advancedgrids.swc</path-element>
+ <rsl-url>advancedgrids_${build.number}.swf</rsl-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>true</static-link-runtime-shared-libraries>
+
<!-- target-player: specifies the version of the player the application is targeting.
Features requiring a later version will not be compiled into the application.
The minimum value supported is "9.0.0".-->