Return-Path: 
 <commits-return-12883-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CDAB5116EC
	for <apmail-flex-commits-archive@www.apache.org>;
 Thu, 10 Jul 2014 04:34:20 +0000 (UTC)
Received: (qmail 12681 invoked by uid 500); 10 Jul 2014 04:34:20 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 12518 invoked by uid 500); 10 Jul 2014 04:34:20 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 12428 invoked by uid 99); 10 Jul 2014 04:34:20 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2014 04:34:20 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 0F01A9AA4DC; Thu, 10 Jul 2014 04:34:20 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aharui@apache.org
To: commits@flex.apache.org
Date: Thu, 10 Jul 2014 04:34:20 -0000
Message-Id: <04895044638044c0b76389f76098a7aa@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/5] git commit: [flex-asjs] [refs/heads/develop] - handle 14 beta
 in install script

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 32d97f6b8 -> 7307b520c


handle 14 beta in install script


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bce71d01
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bce71d01
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bce71d01

Branch: refs/heads/develop
Commit: bce71d0185e27fd7f360605eb83abc415e8e2079
Parents: 32d97f6
Author: Alex Harui <aharui@apache.org>
Authored: Thu Jul 3 08:06:04 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Jul 3 08:06:19 2014 -0700

----------------------------------------------------------------------
 build.properties |  2 +-
 installer.xml    | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce71d01/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 6f9579b..95a063a 100644
--- a/build.properties
+++ b/build.properties
@@ -34,7 +34,7 @@ build.number = 0
 playerglobal.version = 11.1
 
 # AIR version number
-air.version = 3.9
+air.version = 14.0
 
 # Default locale for the SDK
 locale = en_US

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce71d01/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index e6b1ea1..954ee90 100644
--- a/installer.xml
+++ b/installer.xml
@@ -55,8 +55,8 @@
     <property file="${FLEXJS_HOME}/installer.properties/en_US.properties"/>
     <property name="download.dir" value="${FLEXJS_HOME}/in"/>
     
-    <property name="air.sdk.version" value="13.0"/>
-    <property name="flash.sdk.version" value="13.0"/>
+    <property name="air.sdk.version" value="14.0"/>
+    <property name="flash.sdk.version" value="14.0"/>
     <property name="flex.sdk.version" value="4.12.1"/>
     <property name="flexjs.version" value="0.0.2"/>
     <property name="falcon.version" value="0.0.2"/>
@@ -134,33 +134,42 @@
         <property name="flash.sdk.url.md5" refid="${flash.sdk.url.md5.ref}" />	
 	</target>
 		
+    <condition property="air.sdk.version.ref" value="${air.sdk.versionID}" >
+        <isset property="air.sdk.versionID" />
+    </condition>
+    <property name="air.sdk.version.ref" value="${air.sdk.version}" />
+    <condition property="flash.sdk.version.ref" value="${flash.sdk.versionID}" >
+        <isset property="flash.sdk.versionID" />
+    </condition>
+    <property name="flash.sdk.version.ref" value="${flash.sdk.version}" />
+    
     <target name="get-data">
 		<tstamp />
 		<property name="ts" value="${DSTAMP}${TSTAMP}" />
 		<property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml?ts=${ts}" />
         <get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" />
         <xmlproperty file="${basedir}/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
-        <property name="air.sdk.url.server.ref" value="air.sdk.server.${platform}.${air.sdk.version}" />
+        <property name="air.sdk.url.server.ref" value="air.sdk.server.${platform}.${air.sdk.version.ref}" />
         <property name="air.sdk.url.server" refid="${air.sdk.url.server.ref}" />
-        <property name="air.sdk.url.folder.ref" value="air.sdk.folder.${platform}.${air.sdk.version}" />
+        <property name="air.sdk.url.folder.ref" value="air.sdk.folder.${platform}.${air.sdk.version.ref}" />
         <property name="air.sdk.url.folder" refid="${air.sdk.url.folder.ref}" />
-        <property name="air.sdk.url.file.ref" value="air.sdk.file.${platform}.${air.sdk.version}" />
+        <property name="air.sdk.url.file.ref" value="air.sdk.file.${platform}.${air.sdk.version.ref}" />
         <property name="air.sdk.url.file" refid="${air.sdk.url.file.ref}" />
-        <property name="air.sdk.url.md5.ref" value="air.sdk.md5.${platform}.${air.sdk.version}" />
+        <property name="air.sdk.url.md5.ref" value="air.sdk.md5.${platform}.${air.sdk.version.ref}" />
 		<condition property="air-has-md5">
 			<isreference refid="${air.sdk.url.md5.ref}" />
 		</condition>
-        <property name="flash.sdk.url.server.ref" value="flash.sdk.server.${flash.sdk.version}" />
+        <property name="flash.sdk.url.server.ref" value="flash.sdk.server.${flash.sdk.version.ref}" />
         <property name="flash.sdk.url.server" refid="${flash.sdk.url.server.ref}" />
-        <property name="flash.sdk.url.folder.ref" value="flash.sdk.folder.${flash.sdk.version}" />
+        <property name="flash.sdk.url.folder.ref" value="flash.sdk.folder.${flash.sdk.version.ref}" />
         <property name="flash.sdk.url.folder" refid="${flash.sdk.url.folder.ref}" />
-        <property name="flash.sdk.url.file.ref" value="flash.sdk.file.${flash.sdk.version}" />
+        <property name="flash.sdk.url.file.ref" value="flash.sdk.file.${flash.sdk.version.ref}" />
         <property name="flash.sdk.url.file" refid="${flash.sdk.url.file.ref}" />
-        <property name="flash.sdk.url.md5.ref" value="flash.sdk.md5.${flash.sdk.version}" />
+        <property name="flash.sdk.url.md5.ref" value="flash.sdk.md5.${flash.sdk.version.ref}" />
 		<condition property="flash-has-md5">
 			<isreference refid="${flash.sdk.url.md5.ref}" />
 		</condition>
-        <property name="flash.sdk.swfversion.ref" value="flash.sdk.swfversion.${flash.sdk.version}" />
+        <property name="flash.sdk.swfversion.ref" value="flash.sdk.swfversion.${flash.sdk.version.ref}" />
         <property name="flash.sdk.swfversion" refid="${flash.sdk.swfversion.ref}" />
         
         <property name="latest.sdk.version" value="${config.products.ApacheFlexSDK.latestVersion}" />