svn commit: r1354570 - in /incubator/flex/trunk: build.xml frameworks/ frameworks/projects/flash-integration/build.xml

[cf...@apache.org]

Author: cframpton
Date: Wed Jun 27 15:10:45 2012
New Revision: 1354570

URL: http://svn.apache.org/viewvc?rev=1354570&view=rev
Log:
For release build, check that ADOBE_EXTENSION_MANAGER is defined (needed by frameworks/projects/flash-integration).  The flash-integration build script just skips building the .mxp file if the extension manager isn't there but we don't want to fail rather than skip the step for a release build.  Fix flash-integration clean which was leaving a file and a directory behind.

Modified:
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/   (props changed)
    incubator/flex/trunk/frameworks/projects/flash-integration/build.xml

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1354570&r1=1354569&r2=1354570&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Wed Jun 27 15:10:45 2012
@@ -64,7 +64,7 @@
         to build additional targets as part of a release.
     -->    
     <target name="release" 
-        depends="check-compile-env,check-runtime-env,source-release,binary-release"
+        depends="check-compile-env,check-runtime-env,check-adobe-extension-manager-env,source-release,binary-release"
         description="Creates source and binary kits for Apache Flex."/>
         
     <target name="source-release" 
@@ -176,7 +176,21 @@
             unless="pbutil.exe.exists"/>
     </target>
 
+    <target name="check-adobe-extension-manager-env" unless="ADOBE_EXTENSION_MANAGER.set"
+        description="Check ADOBE_EXTENSION_MANAGER is a directory.">
+        
+        <echo message="ADOBE_EXTENSION_MANAGER is ${env.ADOBE_EXTENSION_MANAGER}"/>
+
+        <available file="${env.ADOBE_EXTENSION_MANAGER}" 
+            type="file" 
+            property="ADOBE_EXTENSION_MANAGER.set"/>
+
+        <fail message="ADOBE_EXTENSION_MANAGER must be set correctly for a release build" 
+            unless="ADOBE_EXTENSION_MANAGER.set"/>
+    </target>
+
     <target name="create-description" description="Generate flex-sdk-description.xml">
+        <echo message="build.number is ${build.number}"/>
         <echo file="${basedir}/flex-sdk-description.xml">&lt;?xml version="1.0"?&gt;
 &lt;!--
 

Propchange: incubator/flex/trunk/frameworks/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 27 15:10:45 2012
@@ -1,3 +1,4 @@
+flash-integration
 libs
 rsls
 *Fonts.ser

Modified: incubator/flex/trunk/frameworks/projects/flash-integration/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/flash-integration/build.xml?rev=1354570&r1=1354569&r2=1354570&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/build.xml Wed Jun 27 15:10:45 2012
@@ -101,17 +101,14 @@
 			<fileset dir="${basedir}">
 			    <include name="bundles.properties"/>
 			    <include name="bundles/*/empty.properties"/>
+			    <include name="libs/flash-integration.swc"/>
 			    <exclude name="bundles/en_US/empty.properties"/>
 			</fileset>
 			<fileset dir="${FLEX_HOME}/frameworks/libs">
 				<include name="flash-integration.swc"/>
 				<include name="flash-integration.swc.incr"/>
 			</fileset>
-		</delete>
-		<delete failonerror="false">
-			<fileset dir="${FLEX_HOME}/frameworks/flash-integration">
-				<include name="*/FlexComponentKit.mxp"/>
-			</fileset>
+			<fileset dir="${FLEX_HOME}/frameworks/flash-integration"/>
 		</delete>
 	</target>
 	
@@ -166,7 +163,7 @@
         
         <!-- need to copy the file produced over so that the MXI 
              can refer to the flash-integration.swc -->
-        <copy todir="${basedir}/libs">
+        <copy todir="${basedir}/libs" verbose="true">
 			<fileset dir="${FLEX_HOME}/frameworks/libs">
 				<include name="flash-integration.swc"/>
 			</fileset>
@@ -191,7 +188,7 @@
     </target>
     
     <target name="PackageMXP" if="ADOBE_EXTENSION_MANAGER.set" >
-        <echo message="Creating MXP file" />
+        <echo message="Creating MXP file ${FLEX_HOME}/frameworks/flash-integration/FlexComponentKit.mxp" />
         <exec executable="${env.ADOBE_EXTENSION_MANAGER}" dir="${basedir}" failonerror="true">
             <arg value="-suppress" />
             <arg value="-package" />