Return-Path: 
 <flex-commits-return-814-apmail-incubator-flex-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 99BBDDC07
	for <apmail-incubator-flex-commits-archive@minotaur.apache.org>;
 Fri, 29 Jun 2012 19:34:50 +0000 (UTC)
Received: (qmail 86265 invoked by uid 500); 29 Jun 2012 19:34:50 -0000
Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org
Received: (qmail 86242 invoked by uid 500); 29 Jun 2012 19:34:50 -0000
Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:flex-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:flex-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:flex-commits@incubator.apache.org>
List-Id: <flex-commits.incubator.apache.org>
Reply-To: flex-dev@incubator.apache.org
Delivered-To: mailing list flex-commits@incubator.apache.org
Received: (qmail 86235 invoked by uid 99); 29 Jun 2012 19:34:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2012 19:34:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2012 19:34:49 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 22A0923889D5;
	Fri, 29 Jun 2012 19:34:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1355523 - in /incubator/flex/trunk:
 frameworks/build_framework.xml frameworks/downloads.xml
 ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
Date: Fri, 29 Jun 2012 19:34:28 -0000
To: flex-commits@incubator.apache.org
From: cframpton@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120629193429.22A0923889D5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cframpton
Date: Fri Jun 29 19:34:27 2012
New Revision: 1355523

URL: http://svn.apache.org/viewvc?rev=1355523&view=rev
Log:
Make env.properties work with build_frameworks.xml which becomes frameworks/build.xml in the bin kit.   Fix the bat file so it will prompt for the optional components.

Modified:
    incubator/flex/trunk/frameworks/build_framework.xml
    incubator/flex/trunk/frameworks/downloads.xml
    incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat

Modified: incubator/flex/trunk/frameworks/build_framework.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build_framework.xml?rev=1355523&r1=1355522&r2=1355523&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build_framework.xml (original)
+++ incubator/flex/trunk/frameworks/build_framework.xml Fri Jun 29 19:34:27 2012
@@ -29,9 +29,13 @@
     -->
 
     <property name="FLEX_HOME" value="${basedir}/.."/>
-    <property name="build.number" value="0"/>
 
-    <property environment="env"/>    
+    <property file="${FLEX_HOME}/env.properties"/>
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/local.properties"/>
+    <property file="${FLEX_HOME}/build.properties"/>
+
+    <property name="build.number" value="0"/>
     <property name="playerglobal.version" value="11.1"/>
     <property name="playerglobal.dir" value="${env.PLAYERGLOBAL_HOME}/${playerglobal.version}"/>
     <property name="airsdk.dir" value="${env.AIR_HOME}"/>

Modified: incubator/flex/trunk/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/downloads.xml?rev=1355523&r1=1355522&r2=1355523&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/downloads.xml (original)
+++ incubator/flex/trunk/frameworks/downloads.xml Fri Jun 29 19:34:27 2012
@@ -356,8 +356,6 @@
         <available file="${download.dir}/${adobe.flex.zip.file}" type="file"
             property="adobe.flex.sdk.download.exists"/>
         
-        <echo message="${download.dir}/${adobe.flex.zip.file} property ${adobe.flex.sdk.download.exists}"/>
-        
         <antcall target="download-adobe-flex-sdk" />
         
         <unzip src="${download.dir}/${adobe.flex.zip.file}" 

Modified: incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat?rev=1355523&r1=1355522&r2=1355523&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat (original)
+++ incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat Fri Jun 29 19:34:27 2012
@@ -27,10 +27,6 @@ REM     into the directory structure.  T
 REM     modified to reflect this.  The AIR_HOME and PLAYERGLOBAL_HOME environment 
 REM     variables are not required because the locations of these pieces are known.
 REM
-REM     Note: This script does not install the optional Adobe BlazeDS integration
-REM     or the Adobe embedded font support nor osmf.swc, textLayout.swc and
-REM     the swfobject files.
-REM
 REM     Usage: makeApacheFlexForFlashBuilder [sdk directory]
 REM
 
@@ -78,6 +74,11 @@ cscript //B //nologo winUtil.vbs "%APACH
 if %errorlevel% neq 0 goto errorExit
 
 REM
+REM the third-party downloads, including the optional components
+REM
+ant -f "%FLEX_HOME%/frameworks/downloads.xml"
+
+REM
 REM     Download AIR Runtime Kit for Windows
 REM
 echo Downloading and unzipping Adobe AIR Runtime Kit for Windows from "%ADOBE_AIR_SDK_WIN_URL%" to "%FLEX_HOME%"
@@ -105,7 +106,7 @@ REM
 REM         Remove zipped kits.
 REM
 rmdir /s /q "%tempDir%"
-
+rmdir /s /q "%FLEX_HOME/in%"
 goto :eof
 
 :errorExit