incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1350355 - in /incubator/flex/trunk/ide/flashbuilder: README_integration_with_Adobe_FlashBuilder.txt build.xml makeApacheFlexForFlashBuilder.bat makeApacheFlexForFlashBuilder.sh
Date Thu, 14 Jun 2012 18:14:23 GMT
Author: cframpton
Date: Thu Jun 14 18:14:23 2012
New Revision: 1350355

URL: http://svn.apache.org/viewvc?rev=1350355&view=rev
Log:
flashbuilder-config.xml will live in ide/flashbuilder, not root, in a Flex SDK for FlashBuilder.

Modified:
    incubator/flex/trunk/ide/flashbuilder/README_integration_with_Adobe_FlashBuilder.txt
    incubator/flex/trunk/ide/flashbuilder/build.xml
    incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
    incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh

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=1350355&r1=1350354&r2=1350355&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 Thu
Jun 14 18:14:23 2012
@@ -34,7 +34,7 @@ Flash Builder verifies the validity of t
 	mxml-manifest.xml
 	templates
 
-* The following files and folders must be present in the /frameworks folder of the Flex SDK:
+* The following files and folders must be present in the frameworks folder of the Flex SDK:
 	air-config.xml
 	airmobile-config.xml
 	spark-manifest.xml
@@ -44,7 +44,7 @@ Flash Builder verifies the validity of t
 	libs\player
 	libs\air
 
-* The following JAR files must be present in the /lib folder of the Flex SDK:
+* The following JAR files must be present in the lib folder of the Flex SDK:
 	flex-compiler-oem.jar
 	mxmlc.jar
 	adt.jar
@@ -52,7 +52,10 @@ Flash Builder verifies the validity of t
 Additional checks made by Adobe FlashBuildder v4.7+
 ---------------------------------------------------
 
-* The following XML file must be present in the root directory of the Flex SDK:
+* The following XML file must be present in ide/flashbuilder folder 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
+
+* flex-sdk-description.xml file - <version> is Apache Flex 4.8.0 or higher
+    
+

Modified: incubator/flex/trunk/ide/flashbuilder/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/build.xml?rev=1350355&r1=1350354&r2=1350355&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/build.xml (original)
+++ incubator/flex/trunk/ide/flashbuilder/build.xml Thu Jun 14 18:14:23 2012
@@ -41,7 +41,6 @@
 
     <target name="clean">
         <delete dir="${basedir}/config" failonerror="false" />
-        <delete file="${FLEX_HOME}/flashbuilder-config.xml" failonerror="false" verbose="true"/>
     </target>
     
     <!-- For testing.  Run this to integrate this SDK (in-place) with playerglobal.swc
and
@@ -105,9 +104,6 @@
         <copy todir="${frameworks.dir}" verbose="true">
             <fileset dir="${basedir}/config"/> 
         </copy>
-        <copy todir="${FLEX_HOME}" verbose="true">
-            <fileset file="${basedir}/flashbuilder-config.xml"/> 
-        </copy>
     </target>
     
     <target name="install-playerglobal">

Modified: incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat?rev=1350355&r1=1350354&r2=1350355&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat (original)
+++ incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat Thu Jun 14 18:14:23
2012
@@ -96,8 +96,6 @@ REM
 echo Installing frameworks config files configured for use with Adobe Flash Builder
 copy /y "%FLEX_HOME%"\ide\flashbuilder\config\*-config.xml "%FLEX_HOME%\frameworks"
 if %errorlevel% neq 0 goto errorExit
-copy /y "%FLEX_HOME%"\ide\flashbuilder\flashbuilder-config.xml "%FLEX_HOME%"
-if %errorlevel% neq 0 goto errorExit
 
 REM
 REM         Remove zipped kits.

Modified: incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh?rev=1350355&r1=1350354&r2=1350355&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh (original)
+++ incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh Thu Jun 14 18:14:23
2012
@@ -77,7 +77,6 @@ curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_SW
 # copy the config files formatted for Flash Builder to frameworks 
 echo "Installing the frameworks config files configured for use with Adobe Flash Builder"
 cp -p -v "$FLEX_HOME"/ide/flashbuilder/config/*-config.xml "$FLEX_HOME/frameworks"
-cp -p -v "$FLEX_HOME"/ide/flashbuilder/flashbuilder-config.xml "$FLEX_HOME"
 
 # remove the zipped kits
 rm -rf "$tempDir"
\ No newline at end of file



Mime
View raw message