Return-Path: 
 <flex-commits-return-576-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 3F230C414
	for <apmail-incubator-flex-commits-archive@minotaur.apache.org>;
 Thu, 17 May 2012 20:18:23 +0000 (UTC)
Received: (qmail 33327 invoked by uid 500); 17 May 2012 20:18:23 -0000
Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org
Received: (qmail 33292 invoked by uid 500); 17 May 2012 20:18:22 -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 33282 invoked by uid 99); 17 May 2012 20:18:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2012 20:18:22 +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; Thu, 17 May 2012 20:18:21 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AD6E92388865;
	Thu, 17 May 2012 20:18:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1339843 - in /incubator/flex/trunk: asdoc/build.xml
 build.xml
Date: Thu, 17 May 2012 20:18:01 -0000
To: flex-commits@incubator.apache.org
From: cframpton@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120517201801.AD6E92388865@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cframpton
Date: Thu May 17 20:18:01 2012
New Revision: 1339843

URL: http://svn.apache.org/viewvc?rev=1339843&view=rev
Log:
Use AIR_HOME env variable in asdoc build.xml and turn on building doc packages by default for release builds.  They can be turned off with -Dno.doc-packages=true on the command line.


Modified:
    incubator/flex/trunk/asdoc/build.xml
    incubator/flex/trunk/build.xml

Modified: incubator/flex/trunk/asdoc/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/asdoc/build.xml?rev=1339843&r1=1339842&r2=1339843&view=diff
==============================================================================
--- incubator/flex/trunk/asdoc/build.xml (original)
+++ incubator/flex/trunk/asdoc/build.xml Thu May 17 20:18:01 2012
@@ -16,6 +16,9 @@
 	<property name="lenient" value="true"/>
 	<property name="flexlib" location="${FLEX_HOME}/frameworks"/>
 
+    <property file="${FLEX_HOME}/env.properties"/>
+    <property environment="env"/>
+
 	<target name="main" depends="clean,doc" description="Clean build of all ASDocs"/>
 
 	<target name="clean" description="Cleans all ASDocs">
@@ -108,9 +111,9 @@
 			<namespace uri="library://ns.adobe.com/flex/spark-dmv" manifest="${flexlib}/projects/spark_dmv/manifest_spark_dmv.xml"/>
 
 			<library-path/>
-			<external-library-path dir="${flexlib}/libs/air">
-		    	<include name="airglobal.swc" />
-		    </external-library-path>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
 			<external-library-path dir="${flexlib}/libs">
 		    	<include name="framework.swc" />
 		    	<!-- if no osfm sources -->

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1339843&r1=1339842&r2=1339843&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Thu May 17 20:18:01 2012
@@ -46,7 +46,7 @@
     <property name="source.kit" value="${kit.prefix}-src.zip"/>
     <property name="binary.kit" value="${kit.prefix}-bin.zip"/>
     
-    <property name="no.doc-packages" value="set"/>
+    <!--property name="no.doc-packages" value="set"/-->
     <property name="no.additional-packages" value="set"/>
     <property name="no.doc" value="set"/>
     <property name="no.air.integration" value="set"/>