svn commit: r1398445 - in /incubator/flex/sdk/branches/develop/ide: constructFlexForIDE.sh flashbuilder/build.xml

[cf...@apache.org]

Author: cframpton
Date: Mon Oct 15 18:47:10 2012
New Revision: 1398445

URL: http://svn.apache.org/viewvc?rev=1398445&view=rev
Log:
Update the make-sdk target in build.xml to make sure the rsls directory is in place.  This target can be used to integrate this directory structure with all the IDE pieces in-place using the standard build environment variables to locate the various pieces.  This allows you to debug the latest code at all times but the danger is that you commit the config changes so you must be careful if you chose to use this.

Modified:
    incubator/flex/sdk/branches/develop/ide/constructFlexForIDE.sh
    incubator/flex/sdk/branches/develop/ide/flashbuilder/build.xml

Modified: incubator/flex/sdk/branches/develop/ide/constructFlexForIDE.sh
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/ide/constructFlexForIDE.sh?rev=1398445&r1=1398444&r2=1398445&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/ide/constructFlexForIDE.sh (original)
+++ incubator/flex/sdk/branches/develop/ide/constructFlexForIDE.sh Mon Oct 15 18:47:10 2012
@@ -70,7 +70,7 @@ copyFileOrDirectory()
     fi
 
     if [ -d "${ADOBE_FLEX_SDK_DIR}/$f" ] ; then
-        rsync --archive --ignore-existing "${ADOBE_FLEX_SDK_DIR}/$f" "${dir}"
+        rsync --archive --ignore-existing --force "${ADOBE_FLEX_SDK_DIR}/$f" "${dir}"
     fi
 }
 
@@ -102,6 +102,15 @@ then
     exit 1;
 fi
 
+# FlashBuilder requires the frameworks/rsls directory.
+
+if [ ! -d "${IDE_SDK_DIR}/frameworks/rsls" ]
+then
+    echo ${IDE_SDK_DIR} does not appear to be a Apache Flex distribution with rsls.
+    echo If this is a source distribution of Apache Flex you must first build the rsls.
+    exit 1;
+fi
+
 if [ "$2" = "" ]
 then
     #  Look for installed FlashBuilder versions 4.5, 4.6 and 4.7.

Modified: incubator/flex/sdk/branches/develop/ide/flashbuilder/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/ide/flashbuilder/build.xml?rev=1398445&r1=1398444&r2=1398445&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/ide/flashbuilder/build.xml (original)
+++ incubator/flex/sdk/branches/develop/ide/flashbuilder/build.xml Mon Oct 15 18:47:10 2012
@@ -41,15 +41,17 @@
 
     <target name="clean">
         <delete dir="${basedir}/config" failonerror="false" />
+        <delete file="${basedir}/FlashBuilderProjectFiles.zip" failonerror="false" />
     </target>
     
     <!-- For testing.  Run this to integrate this SDK (in-place) with playerglobal.swc and
          AIR, and modify the framework config files to be the format FB expects.  Only
          the AIR kit for the platform specified by AIR_HOME will be incorporated.
+         FlashBuilder also expects frameworks/rsls to exist.
          
          There is no clean for this operation.
     -->
-    <target name="make-sdk" depends="install-config,install-playerglobal,install-air"
+    <target name="make-sdk" depends="check-rsls,install-config,install-playerglobal,install-air"
         description="Converts this SDK into the layout FlashBuilder expects."/>
     
     <target name="create-config-files" 
@@ -102,6 +104,12 @@
                 </replace>
         </sequential>
     </macrodef>	
+
+    <target name="check-rsls">
+        <available file="${frameworks.dir}/rsls" type="dir" property="rsls.dir.exists"/>
+        <fail message="The ${frameworks.dir}/rsls directory must be created. Use the frameworks-rsls ant target in ${FLEX_HOME}." 
+            unless="rsls.dir.exists"/>
+    </target>
     
     <target name="install-config">
         <copy todir="${frameworks.dir}" verbose="true">
@@ -123,4 +131,13 @@
         <chmod dir="${basedir}" perm="755" includes="bin/*, **/*.bat, **/*.sh" />
     </target>
 
+    <target name="zip-project-files">
+        <zip destfile="${basedir}/FlashBuilderProjectFiles.zip">
+            <zipfileset dir="${FLEX_HOME}" prefix="${release.version}">
+                <include name="**/.*"/>
+                <exclude name="mustella/**/.*"/>
+                <exclude name="temp/**/.*"/>
+            </zipfileset> 
+        </zip>    
+    </target>
 </project>