svn commit: r1366015 - /incubator/flex/trunk/build.xml

[cf...@apache.org]

Author: cframpton
Date: Thu Jul 26 14:25:46 2012
New Revision: 1366015

URL: http://svn.apache.org/viewvc?rev=1366015&view=rev
Log:
In check-air-home, check that ${env.AIR_HOME} is a directory as well as that ${env.AIR_HOME}/bin/adt exists to make sure the directory is one that most likely contains an AIR SDK.  Also in thirdparty-downloads, call frameworks, before modules, so that the license prompts are nearer to the beginning of the build.

Modified:
    incubator/flex/trunk/build.xml

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1366015&r1=1366014&r2=1366015&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Thu Jul 26 14:25:46 2012
@@ -111,8 +111,8 @@
        clean does not remove these since they don't change often and the downloads take time.
     -->
     <target name="thirdparty-downloads" description="Downloads all the required thirdparty code.">
-        <ant dir="${basedir}/modules" target="thirdparty-downloads"/>
         <ant dir="${basedir}/frameworks" target="thirdparty-downloads"/>        
+        <ant dir="${basedir}/modules" target="thirdparty-downloads"/>
         <!-- don't ask again about these since we just did if these weren't already set -->	    
 	    <property name="build.noprompt" value="set" />
     </target>
@@ -158,6 +158,7 @@
             <and>
                 <length string="${env.AIR_HOME}" when="greater" length="0" />
                 <available file="${env.AIR_HOME}" type="dir"/>
+                <available file="${env.AIR_HOME}/bin/adt" type="file"/>
             </and>
         </condition>