Return-Path: <commits-return-30541-archive-asf-public=cust-asf.ponee.io@flex.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id DF0A1200BAC
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 26 Oct 2016 15:54:15 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id DDAC3160B02; Wed, 26 Oct 2016 13:54:15 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 3811C160ACA
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 26 Oct 2016 15:54:15 +0200 (CEST)
Received: (qmail 63344 invoked by uid 500); 26 Oct 2016 13:54:14 -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 61790 invoked by uid 99); 26 Oct 2016 13:54:04 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2016 13:54:04 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 0488EF16BA; Wed, 26 Oct 2016 13:54:04 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: harbs@apache.org
To: commits@flex.apache.org
Date: Wed, 26 Oct 2016 13:54:17 -0000
Message-Id: <03b44523a275415f8d5deb6291409374@git.apache.org>
In-Reply-To: <764aeaf87fd6473b90c387de01079264@git.apache.org>
References: <764aeaf87fd6473b90c387de01079264@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [15/23] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Checks
 to see if a platform needs to be loaded and if so, uses Cordova to load it.
archived-at: Wed, 26 Oct 2016 13:54:16 -0000

Checks to see if a platform needs to be loaded and if so, uses Cordova to load it.


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

Branch: refs/heads/refactor-sprite
Commit: 02febf26d1c9234f52c9594a890437f7e87aa1e1
Parents: 78d3ff9
Author: Peter Ent <pent@apache.org>
Authored: Thu Oct 20 17:43:39 2016 -0400
Committer: Peter Ent <pent@apache.org>
Committed: Thu Oct 20 17:43:39 2016 -0400

----------------------------------------------------------------------
 cordova-build.xml | 62 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/02febf26/cordova-build.xml
----------------------------------------------------------------------
diff --git a/cordova-build.xml b/cordova-build.xml
index 58af158..5217dbc 100644
--- a/cordova-build.xml
+++ b/cordova-build.xml
@@ -106,22 +106,6 @@
 			<arg value="org.apache.flex.examples.${appname}" />
 			<arg value="${appname}" />
 		</exec>
-		
-		<echo>Adding in platform(s). This may take awhile.</echo>
-
-		<!-- add in the platforms -->
-		<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
-            <env key="PATH" path="${env.PATH}:${cordova.path}"/>
-			<arg value="platform" />
-			<arg value="add" />
-			<arg value="${platform.android}" />
-		</exec>
-		<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
-            <env key="PATH" path="${env.PATH}:${cordova.path}"/>
-			<arg value="platform" />
-			<arg value="add" />
-			<arg value="${platform.ios}" />
-		</exec>
     </target>
     
     <!-- Clean www directory -->
@@ -142,7 +126,43 @@
     </target>
     
     <!--
-    	Running the app on the platform
+    	Check to see if the Android platform needs to be loaded.
+    -->
+    
+    <target name="check-platform.android">
+    	<property name="android.platform" value="${projectdir}/app/${appname}/platforms/android" />
+    	<available file="${android.platform}" type="dir" property="platform.loaded" />
+    </target>
+    
+    <target name="load-platform.android" depends="check-platform.android" unless="platform.loaded">
+    	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
+            <env key="PATH" path="${env.PATH}:${cordova.path}"/>
+			<arg value="platform" />
+			<arg value="add" />
+			<arg value="${platform.android}" />
+		</exec>
+    </target>
+    
+    <!--
+    	Check to see if the iOS platform needs to be loaded.
+    -->
+    
+    <target name="check-platform.ios">
+    	<property name="android.ios" value="${projectdir}/app/${appname}/platforms/ios" />
+    	<available file="${ios.platform}" type="dir" property="platform.loaded" />
+    </target>
+    
+    <target name="load-platform.ios" depends="check-platform.ios" unless="platform.loaded">
+    	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
+            <env key="PATH" path="${env.PATH}:${cordova.path}"/>
+			<arg value="platform" />
+			<arg value="add" />
+			<arg value="${platform.ios}" />
+		</exec>
+    </target>
+    
+    <!-- 
+    	Check to see if the Cordova File Plugin is needed and if so, load it.
     -->
     
     <target name="check-fileplugin">
@@ -160,7 +180,11 @@
     	</exec>
 	</target>
     
-    <target name="run.android" depends="find.cordova.mac,load-fileplugin" description="Runs the Cordova application on the specified platform">
+    <!--
+    	Running the app on the platform
+    -->
+    
+    <target name="run.android" depends="find.cordova.mac,load-platform.android,load-fileplugin" description="Runs the Cordova application on the specified platform">
     	<echo message="Launching ${appname} on platform ${platform.android}" />
     	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
             <env key="PATH" path="${env.PATH}:${cordova.path}"/>
@@ -169,7 +193,7 @@
     	</exec>
     </target>
     
-    <target name="run.ios" depends="find.cordova.mac,load-fileplugin" description="Runs the Cordova application on the specified platform">
+    <target name="run.ios" depends="find.cordova.mac,load-platform.ios,load-fileplugin" description="Runs the Cordova application on the specified platform">
     	<echo message="Launching ${appname} on platform ${platform.ios}" />
     	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
             <env key="PATH" path="${env.PATH}:${cordova.path}"/>