flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1430322 - /flex/sdk/branches/develop/frameworks/flex-config.xml
Date Tue, 08 Jan 2013 15:35:05 GMT
Author: cframpton
Date: Tue Jan  8 15:35:04 2013
New Revision: 1430322

URL: http://svn.apache.org/viewvc?rev=1430322&view=rev
Log:
Rollback bad merge of 1421347 but leave in Justin's updates to the metadata from 1429395.

Modified:
    flex/sdk/branches/develop/frameworks/flex-config.xml

Modified: flex/sdk/branches/develop/frameworks/flex-config.xml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/frameworks/flex-config.xml?rev=1430322&r1=1430321&r2=1430322&view=diff
==============================================================================
--- flex/sdk/branches/develop/frameworks/flex-config.xml (original)
+++ flex/sdk/branches/develop/frameworks/flex-config.xml Tue Jan  8 15:35:04 2013
@@ -61,7 +61,7 @@
       <!-- List of SWC files or directories to compile against but to omit from -->
       <!-- linking.                                                             -->
       <external-library-path>
-          <path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
+          <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
       </external-library-path>
 
       <!-- Turn on writing of generated/*.as files to disk. These files are generated
by -->
@@ -81,7 +81,7 @@
          <path-element>libs</path-element>
          <path-element>libs/mx</path-element>
          <path-element>locale/en_US</path-element>
-         <path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
+         <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
       </library-path>
 
       <namespaces>
@@ -357,7 +357,7 @@
       <!-- Framework SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/framework.swc</path-element>
-		<rsl-url>framework_4.9.0.0.swf</rsl-url>
+		<rsl-url>framework_${build.number}.swf</rsl-url>
 	</runtime-shared-library-path>
 	  
 	  <!-- TextLayout SWC -->
@@ -367,37 +367,37 @@
     -->
     <runtime-shared-library-path>
 		<path-element>libs/textLayout.swc</path-element>
-		<rsl-url>textLayout_4.9.0.0.swf</rsl-url>
+		<rsl-url>textLayout_${build.number}.swf</rsl-url>
 	</runtime-shared-library-path>
     
       <!-- Spark SWC-->
    	<runtime-shared-library-path>
 		<path-element>libs/spark.swc</path-element>
-		<rsl-url>spark_4.9.0.0.swf</rsl-url>
+		<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_4.9.0.0.swf</rsl-url>
+		<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_4.9.0.0.swf</rsl-url>
+		<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_4.9.0.0.swf</rsl-url>
+		<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_4.9.0.0.swf</rsl-url>
+		<rsl-url>spark_dmv_${build.number}.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- OSMF SWC -->
@@ -407,19 +407,19 @@
     -->
     <runtime-shared-library-path>
 		<path-element>libs/osmf.swc</path-element>
-		<rsl-url>osmf_4.9.0.0.swf</rsl-url>
+		<rsl-url>osmf_${build.number}.swf</rsl-url>
 	</runtime-shared-library-path>
       
       <!-- MX SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/mx/mx.swc</path-element>
-		<rsl-url>mx_4.9.0.0.swf</rsl-url>
+		<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_4.9.0.0.swf</rsl-url>
+		<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.-->
@@ -438,7 +438,7 @@
    <!-- Metadata added to SWFs via the SWF Metadata tag. -->
    <metadata>
       <title>Apache Flex Application</title>
-      <description>http://incubator.apache.org/flex</description>
+      <description>http://flex.apache.org/</description>
       <publisher>Apache Software Foundation</publisher>
       <creator>Apache Software Foundation</creator>
       <language>en_US</language>



Mime
View raw message