You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/07/24 22:07:42 UTC

[1/4] git commit: [flex-asjs] [refs/heads/cordova] - I think we don't need these anymore

Repository: flex-asjs
Updated Branches:
  refs/heads/cordova dc8ca2154 -> b74d89053


I think we don't need these anymore


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

Branch: refs/heads/cordova
Commit: b7f73fc402d87eeee6bcf7d487d8ee647fc933b5
Parents: dc8ca21
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jul 24 15:04:52 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jul 24 15:04:52 2017 -0700

----------------------------------------------------------------------
 ide/flashbuilder/FlexJS (Cordova Build).launch  | 37 --------------------
 .../FlexJS (FalconJX Debug Build).launch        | 28 ---------------
 ...JS (FalconJX Debug and Release Build).launch | 28 ---------------
 ide/flashbuilder/FlexJS (JS COMPC).launch       | 28 ---------------
 4 files changed, 121 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b7f73fc4/ide/flashbuilder/FlexJS (Cordova Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (Cordova Build).launch b/ide/flashbuilder/FlexJS (Cordova Build).launch
deleted file mode 100644
index 0bfe2fb..0000000
--- a/ide/flashbuilder/FlexJS (Cordova Build).launch	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
-<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
-</listAttribute><listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="PATH" value="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_HIDE_INTERNAL_TARGETS" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="$FLEXJS_HOME/cordova-build.xml"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dprojectdir=&quot;${project_loc}&quot;"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b7f73fc4/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch b/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch
deleted file mode 100644
index 96f8cfc..0000000
--- a/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<launchConfiguration type='org.eclipse.ui.externaltools.ProgramLaunchConfigurationType'>
-<booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='false'/>
-<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
-<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
-</listAttribute>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$FLEXJS_HOME/js/bin/$MXMLC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-debug=true -fb &quot;${project_loc}&quot;'/>
-</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b7f73fc4/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch b/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch
deleted file mode 100644
index 2da874d..0000000
--- a/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<launchConfiguration type='org.eclipse.ui.externaltools.ProgramLaunchConfigurationType'>
-<booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='false'/>
-<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
-<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
-</listAttribute>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$FLEXJS_HOME/js/bin/$MXMLC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-debug=false -fb &quot;${project_loc}&quot;'/>
-</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b7f73fc4/ide/flashbuilder/FlexJS (JS COMPC).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (JS COMPC).launch b/ide/flashbuilder/FlexJS (JS COMPC).launch
deleted file mode 100644
index 7a30637..0000000
--- a/ide/flashbuilder/FlexJS (JS COMPC).launch	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<launchConfiguration type='org.eclipse.ui.externaltools.ProgramLaunchConfigurationType'>
-<booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='false'/>
-<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
-<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
-</listAttribute>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='${project}'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$FLEXJS_HOME/js/bin/$COMPC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-fb &quot;${project_loc}&quot;' />
-</launchConfiguration>


[4/4] git commit: [flex-asjs] [refs/heads/cordova] - remove Weinre. It isn't used much anymore

Posted by ah...@apache.org.
remove Weinre.  It isn't used much anymore


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

Branch: refs/heads/cordova
Commit: b74d89053c7dc9169c25f3f7c4d4d9d1ece317b3
Parents: c807b6f
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jul 24 15:07:29 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jul 24 15:07:29 2017 -0700

----------------------------------------------------------------------
 .../CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml    | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b74d8905/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml b/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml
index 7c2d5db..94c7634 100644
--- a/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml
+++ b/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml
@@ -33,6 +33,5 @@
 	</cordova:initialView>
 	<cordova:beads>
 		<js:MixinManager />
-		<cordova:Weinre guid="aharui" />
 	</cordova:beads>
 </cordova:Application>


[2/4] git commit: [flex-asjs] [refs/heads/cordova] - add Cordova template and fix up cordova handling for Cordova Publishing

Posted by ah...@apache.org.
add Cordova template and fix up cordova handling for Cordova Publishing


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

Branch: refs/heads/cordova
Commit: c4fc6e840434593f09d1073a6f60e1dfe100aa4b
Parents: b7f73fc
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jul 24 15:06:00 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jul 24 15:06:00 2017 -0700

----------------------------------------------------------------------
 ...lex Project to FlexJS Cordova Project.launch | 39 ++++++++++++++++++++
 .../FlexJS (Cordova Run Android).launch         |  2 +-
 ide/flashbuilder/antscripts.xml                 |  8 +++-
 3 files changed, 47 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4fc6e84/ide/flashbuilder/Convert New Flex Project to FlexJS Cordova Project.launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/Convert New Flex Project to FlexJS Cordova Project.launch b/ide/flashbuilder/Convert New Flex Project to FlexJS Cordova Project.launch
new file mode 100644
index 0000000..7b9bbfc
--- /dev/null
+++ b/ide/flashbuilder/Convert New Flex Project to FlexJS Cordova Project.launch	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
+<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
+</listAttribute><listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="ANT_HOME" value="/Applications/Adobe Flash Builder 4.7/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300"/>
+<mapEntry key="PATH" value="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="convert_project_cordova,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_HIDE_INTERNAL_TARGETS" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="$FLEXJS_HOME/ide/flashbuilder/antscripts.xml"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DprojectDir=&quot;${project_loc}&quot;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4fc6e84/ide/flashbuilder/FlexJS (Cordova Run Android).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (Cordova Run Android).launch b/ide/flashbuilder/FlexJS (Cordova Run Android).launch
index 1e05b80..11aa5b1 100644
--- a/ide/flashbuilder/FlexJS (Cordova Run Android).launch	
+++ b/ide/flashbuilder/FlexJS (Cordova Run Android).launch	
@@ -34,6 +34,6 @@
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="run.android,"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_HIDE_INTERNAL_TARGETS" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="$FLEXJS_HOME/cordova-build.xml"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dprojectdir=&quot;${project_loc}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dprojectdir=&quot;${project_loc}&quot; -Dcordova.target.dir=&quot;${project_loc}/bin/js-debug/app&quot;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
 </launchConfiguration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4fc6e84/ide/flashbuilder/antscripts.xml
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/antscripts.xml b/ide/flashbuilder/antscripts.xml
index 5efc7f7..74e5611 100644
--- a/ide/flashbuilder/antscripts.xml
+++ b/ide/flashbuilder/antscripts.xml
@@ -55,6 +55,12 @@
         <antcall target="makeAIRvisible" />
     </target>
 
+    <target name="convert_project_cordova" depends="check_params, cutpath"  description="Replaces the files in a new Flex project folder with a basic FlexJS Cordova project">
+        <copy file="${basedir}/../../examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml" tofile="${projectDir}/src/${projectName}.mxml" overwrite="true" />
+        <copy file="${basedir}/../../examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml" tofile="${projectDir}/src/MyInitialView.mxml" overwrite="true" />
+        <antcall target="makeAIRvisible" />
+    </target>
+
     <target name="cutpath" >
         <basename file="${projectDir}" property="projectName" />
         <echo>projectDir: ${projectDir}</echo>
@@ -72,4 +78,4 @@
         <replace file="${projectDir}/src/${projectName}-app.xml" token="&lt;visible&gt;false&lt;/visible&gt;" value="&lt;visible&gt;true&lt;/visible&gt;" />
     </target>
     
-</project>
\ No newline at end of file
+</project>


[3/4] git commit: [flex-asjs] [refs/heads/cordova] - cordova need gradle which isn't always in the path when FlashBuilder launches

Posted by ah...@apache.org.
cordova need gradle which isn't always in the path when FlashBuilder launches


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

Branch: refs/heads/cordova
Commit: c807b6f577a5c2bd90b4bfd78ca9e2f73da913ef
Parents: c4fc6e8
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jul 24 15:07:07 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jul 24 15:07:07 2017 -0700

----------------------------------------------------------------------
 cordova-build.xml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c807b6f5/cordova-build.xml
----------------------------------------------------------------------
diff --git a/cordova-build.xml b/cordova-build.xml
index f9101ff..5b3870e 100644
--- a/cordova-build.xml
+++ b/cordova-build.xml
@@ -99,6 +99,13 @@
         </condition>
     </target>
 	
+    <target name="find.gradle.mac" unless="isWindows">
+        <property name="gradle-version" value="3.5" />
+        <condition property="gradle.path" value="/opt/gradle/gradle-${gradle-version}/bin">
+            <available file="/opt/gradle/gradle-${gradle-version}/bin/gradle" type="file"/>
+        </condition>
+    </target>
+    
 	<condition property="app.path" value="${env.Path}">
 	    <isset property="env.Path" />
 	</condition>
@@ -113,7 +120,7 @@
 	<target name="create" unless="app.dir.exists" depends="makedir" description="Creates the Cordova application template">
     	<!-- create the project -->
 		<exec executable="${cordova.executable}" dir="${projectdir}/app">
-            <env key="PATH" path="${app.path}:${cordova.path}"/>
+            <env key="PATH" path="${app.path}:${cordova.path}:${gradle.path}"/>
 			<arg value="create" />
 			<arg value="${appname}" />
 			<arg value="org.apache.flex.examples.${appname}" />
@@ -147,9 +154,9 @@
     	<available file="${android.platform}" type="dir" property="platform.loaded" />
     </target>
     
-    <target name="load-platform.android" depends="find.cordova.mac,check-platform.android" unless="platform.loaded">
+    <target name="load-platform.android" depends="find.cordova.mac,find.gradle.mac,check-platform.android" unless="platform.loaded">
     	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
-            <env key="PATH" path="${app.path}:${cordova.path}"/>
+            <env key="PATH" path="${app.path}:${cordova.path}:${gradle.path}"/>
 			<arg value="platform" />
 			<arg value="add" />
 			<arg value="${platform.android}" />
@@ -165,9 +172,9 @@
     	<available file="${ios.platform}" type="dir" property="platform.loaded" />
     </target>
     
-    <target name="load-platform.ios" depends="find.cordova.mac,check-platform.ios" unless="platform.loaded">
+    <target name="load-platform.ios" depends="find.cordova.mac,find.gradle.mac,check-platform.ios" unless="platform.loaded">
     	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
-            <env key="PATH" path="${app.path}:${cordova.path}"/>
+            <env key="PATH" path="${app.path}:${cordova.path}:${gradle.path}"/>
 			<arg value="platform" />
 			<arg value="add" />
 			<arg value="${platform.ios}" />
@@ -186,7 +193,7 @@
     <target name="load-fileplugin" depends="find.cordova.mac,check-fileplugin" if="file.plugin.needed">
     	<echo message="Loading cordova file-plugin" />
     	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
-            <env key="PATH" path="${app.path}:${cordova.path}"/>
+            <env key="PATH" path="${app.path}:${cordova.path}:${gradle.path}"/>
     		<arg value="plugin" />
     		<arg value="add" />
     		<arg value="cordova-plugin-file" />
@@ -197,7 +204,7 @@
     	<echo message="Loading cordova plugin ${plugin}" />
 	<echo message="target dir = ${cordova.target.dir}" />
     	<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
-            <env key="PATH" path="${app.path}:${cordova.path}"/>
+            <env key="PATH" path="${app.path}:${cordova.path}:${gradle.path}"/>
     		<arg value="plugin" />
     		<arg value="add" />
     		<arg value="${plugin}" />
@@ -211,7 +218,7 @@
     <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="${app.path}:${cordova.path}"/>
+            <env key="PATH" path="${app.path}:${cordova.path}:${gradle.path}"/>
     		<arg value="run" />
     		<arg value="${platform.android}" />
     	</exec>
@@ -220,7 +227,7 @@
     <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="${app.path}:${cordova.path}"/>
+            <env key="PATH" path="${app.path}:${cordova.path}:${gradle.path}"/>
     		<arg value="run" />
     		<arg value="${platform.ios}" />
     	</exec>