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/08 21:34:57 UTC

svn commit: r1348203 - in /incubator/flex/trunk: ide/flashbuilder/README_integration_with_Adobe_FlashBuilder.txt modules/compiler/build.xml

Author: cframpton
Date: Fri Jun  8 19:34:57 2012
New Revision: 1348203

URL: http://svn.apache.org/viewvc?rev=1348203&view=rev
Log:
Reword README but still have a few questions to get answered by FB team.  Cleanup a strangler localized jar.

Modified:
    incubator/flex/trunk/ide/flashbuilder/README_integration_with_Adobe_FlashBuilder.txt
    incubator/flex/trunk/modules/compiler/build.xml

Modified: incubator/flex/trunk/ide/flashbuilder/README_integration_with_Adobe_FlashBuilder.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/README_integration_with_Adobe_FlashBuilder.txt?rev=1348203&r1=1348202&r2=1348203&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/README_integration_with_Adobe_FlashBuilder.txt (original)
+++ incubator/flex/trunk/ide/flashbuilder/README_integration_with_Adobe_FlashBuilder.txt Fri Jun  8 19:34:57 2012
@@ -21,35 +21,15 @@ Integrating Apache Flex SDK with Adobe F
 ----------------------------------------------------
 
 Adobe Flash Builder performs several checks on the Apache SDK to ensure compatibility of 
-the SDK with Flash Builder.
-
-Identifying the configuration file
-----------------------------------
-
---This section applies to Adobe FlashBuilder v4.7 which is currently in development at 
-  Adobe as of June 2012.--
- 
-Flash Builder searches for the flashbuilder-config.xml configuration file in the root 
-directory of the installed SDK. Once the flashbuilder-config.xml configuration file is 
-found, the SDK is recognized as a version of the Apache Flex SDK.
-
-**Note: The flashbuilder-config.xml configuration file specifies configuration data about 
-the express Install SWF file. The express Install SWF file is used if Adobe Flash Player 
-is not installed.
-
+the SDK with Flash Builder.  
 
 Verifying the validity of the Apache Flex SDK
 ---------------------------------------------
 
---This section applies to the Adobe FlashBuilder v4.6 which has been released as well as
-  to Adobe FlashBuilder v4.7 which is currently in development at Adobe as of June 2012.--
-
 Flash Builder verifies the validity of the Apache Flex SDK by checking for the following:
 
-* The Apache Flex SDK version must be specified in the flex-sdk-description.xml file. 
-  The specified version must be 4.8.0 or higher.
-
 * The following XML files and folders must be present in the root directory of the Flex SDK:
+    flex-sdk-description.xml
 	flex-config.xml
 	mxml-manifest.xml
 	templates
@@ -67,4 +47,12 @@ Flash Builder verifies the validity of t
 * The following JAR files must be present in the /lib folder of the Flex SDK:
 	flex-compiler-oem.jar
 	mxmlc.jar
-	adt.jar
\ No newline at end of file
+	adt.jar
+	
+Additional checks made by Adobe FlashBuildder v4.7+
+---------------------------------------------------
+
+* The following XML file must be present in the root directory of the Flex SDK:
+    flashbuilder-config.xml - <express-install-swf> tag required with path to 
+                              expressInstall.swf 
+    flex-sdk-description.xml file - <version> is Apache Flex 4.8.0 or higher

Modified: incubator/flex/trunk/modules/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/build.xml?rev=1348203&r1=1348202&r2=1348203&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/build.xml (original)
+++ incubator/flex/trunk/modules/compiler/build.xml Fri Jun  8 19:34:57 2012
@@ -441,6 +441,7 @@
 				<include name="mxmlc_nb.jar"/>
 				<include name="mxmlc_nl.jar"/>
 				<include name="mxmlc_pt.jar"/>
+				<include name="mxmlc_ru.jar"/>
 				<include name="mxmlc_sv.jar"/>
 				<include name="mxmlc_zh_CN.jar"/>
 				<include name="mxmlc_zh_TW.jar"/>