incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1397186 - in /incubator/flex/sdk/branches/develop: ./ frameworks/ frameworks/projects/textLayout/
Date Thu, 11 Oct 2012 17:36:13 GMT
Author: cframpton
Date: Thu Oct 11 17:36:12 2012
New Revision: 1397186

URL: http://svn.apache.org/viewvc?rev=1397186&view=rev
Log:
Upgrade from TLF 2.0.232 to TLF 3.0.33.

Modified:
    incubator/flex/sdk/branches/develop/build.xml
    incubator/flex/sdk/branches/develop/frameworks/flex-config.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/   (props changed)
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.actionScriptProperties
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.flexLibProperties
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml

Modified: incubator/flex/sdk/branches/develop/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.xml?rev=1397186&r1=1397185&r2=1397186&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.xml (original)
+++ incubator/flex/sdk/branches/develop/build.xml Thu Oct 11 17:36:12 2012
@@ -402,6 +402,8 @@
     </macrodef>
 
 	<target name="frameworks-rsls" description="Build signed framework RSLs">
+		<!-- textLayout RSL -->
+		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs"
swc-name="textLayout" build-number="${release.version}.${build.number}"/>
 		<!-- framework RSL -->
 		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs"
swc-name="framework" build-number="${release.version}.${build.number}"/>
 		<!-- mx RSL -->

Modified: incubator/flex/sdk/branches/develop/frameworks/flex-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/flex-config.xml?rev=1397186&r1=1397185&r2=1397186&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/flex-config.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/flex-config.xml Thu Oct 11 17:36:12 2012
@@ -361,10 +361,6 @@
 	</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>
 		<rsl-url>textLayout_${build.number}.swf</rsl-url>

Propchange: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Oct 11 17:36:12 2012
@@ -1 +1,2 @@
 2.0.232 https://svn.apache.org/repos/asf/incubator/flex/tlf/branches/2.0/textLayout
+3.0.33 https://svn.apache.org/repos/asf/incubator/flex/tlf/branches/3.0/textLayout

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.actionScriptProperties
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.actionScriptProperties?rev=1397186&r1=1397185&r2=1397186&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.actionScriptProperties
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.actionScriptProperties
Thu Oct 11 17:36:12 2012
@@ -18,7 +18,7 @@
 
 -->
 <actionScriptProperties mainApplicationPath="textLayout.as" projectUUID="6e0a86e3-55a2-44ed-b0e9-d213da179436"
version="6">
-  <compiler additionalCompilerArguments="-define=CONFIG::release,true -define=CONFIG::debug,false
-namespace=library://ns.adobe.com/flashx/textLayout,../manifest.xml -include-namespaces=library://ns.adobe.com/flashx/textLayout
-compute-digest=true -static-link-runtime-shared-libraries=true -library-path= -locale=en_US"
autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false"
htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true"
includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0"
useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="false">
+  <compiler additionalCompilerArguments="-define=CONFIG::release,true -define=CONFIG::debug,false
-namespace=library://ns.adobe.com/flashx/textLayout,../manifest.xml -include-namespaces=library://ns.adobe.com/flashx/textLayout
-compute-digest=true -static-link-runtime-shared-libraries=true -library-path= -locale=en_US"
autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false"
htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true"
includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="3.0.33/src" strict="true"
targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true"
warn="false">
     <compilerSourcePath/>
     <libraryPath defaultLinkType="0">
       <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/player/11.1/playerglobal.swc"
useDefaultLinkType="false"/>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.flexLibProperties
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.flexLibProperties?rev=1397186&r1=1397185&r2=1397186&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.flexLibProperties
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/.flexLibProperties
Thu Oct 11 17:36:12 2012
@@ -25,6 +25,6 @@
   </includeClasses>
   <includeResources/>
   <namespaceManifests>
-    <namespaceManifestEntry manifest="../manifest.xml" namespace="library://ns.adobe.com/flashx/textLayout"/>
+    <namespaceManifestEntry manifest="../3.0.33/manifest.xml" namespace="library://ns.adobe.com/flashx/textLayout"/>
   </namespaceManifests>
 </flexLibProperties>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml?rev=1397186&r1=1397185&r2=1397186&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml Thu Oct 11
17:36:12 2012
@@ -24,7 +24,8 @@
     <property environment="env"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
-    <property name="tlf.version" value="2.0.232"/>
+    <!--property name="tlf.version" value="2.0.232"/-->
+    <property name="tlf.version" value="3.0.33"/>
     
     <property name="source.dir" value="${basedir}/${tlf.version}"/>
 	<property name="output.file" value="${FLEX_HOME}/frameworks/libs/textLayout.swc"/>
@@ -190,6 +191,7 @@
 		<taskdef resource="flexTasks.tasks" classpath="${flexTasks.location}"/>
 		<compc fork="true"
 			   output="${output.file}"
+			   show-actionscript-warnings="false"
 			   compute-digest="true"
 			   include-classes="flashx.textLayout.CoreClasses flashx.textLayout.EditClasses flashx.textLayout.ConversionClasses">
 			<jvmarg line="${compc.jvm.args}"/>



Mime
View raw message