You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/10/21 09:08:00 UTC
[47/49] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - assume path to npm and
cordova on mac. FB can't always find it since it might be started without the
bash environment. Might need improving upon for when the path isn't r
assume path to npm and cordova on mac. FB can't always find it since it might be started without the bash environment. Might need improving upon for when the path isn't right
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/78d3ff9e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/78d3ff9e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/78d3ff9e
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 78d3ff9e5de116dd711c815bcbc18425a3553a92
Parents: fa6e062
Author: Alex Harui <ah...@apache.org>
Authored: Thu Oct 20 09:11:48 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Oct 20 09:12:35 2016 -0700
----------------------------------------------------------------------
cordova-build.xml | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/78d3ff9e/cordova-build.xml
----------------------------------------------------------------------
diff --git a/cordova-build.xml b/cordova-build.xml
index 1f78da8..58af158 100644
--- a/cordova-build.xml
+++ b/cordova-build.xml
@@ -39,7 +39,7 @@
-->
- <target name="main" depends="create, copyfiles" description="Creates the Cordova app if needed, compiles the FlexJS app, copies the results to Cordova app">
+ <target name="main" depends="find.cordova.mac,create, copyfiles" description="Creates the Cordova app if needed, compiles the FlexJS app, copies the results to Cordova app">
</target>
<!-- Set up properties and conditions -->
@@ -75,11 +75,6 @@
</not>
</condition>
- <condition property="cordova.executable" value="cordova">
- <not>
- <isset property="isWindows" />
- </not>
- </condition>
<condition property="cordova.executable" value="cordova.cmd">
<isset property="isWindows" />
</condition>
@@ -87,6 +82,14 @@
<property name="cordova.target.dir" value="${projectdir}/app/${appname}" />
<available file="${cordova.target.dir}" type="dir" property="app.dir.exists"/>
+ <target name="find.cordova.mac" unless="isWindows">
+ <condition property="cordova.executable" value="/usr/local/bin/cordova">
+ <available file="/usr/local/bin/cordova" type="file"/>
+ </condition>
+ <condition property="cordova.path" value="/usr/local/bin">
+ <available file="/usr/local/bin/cordova" type="file"/>
+ </condition>
+ </target>
<!-- Create the Cordova template project unless it already exists -->
@@ -97,6 +100,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="${env.PATH}:${cordova.path}"/>
<arg value="create" />
<arg value="${appname}" />
<arg value="org.apache.flex.examples.${appname}" />
@@ -107,11 +111,13 @@
<!-- 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}" />
@@ -144,26 +150,29 @@
<available file="${storage.file}" type="file" property="file.plugin.needed" />
</target>
- <target name="load-fileplugin" depends="check-fileplugin" if="file.plugin.needed">
+ <target name="load-fileplugin" depends="find.cordova.mac,check-fileplugin" if="file.plugin.needed">
<echo message="Loading cordova file-plugin" />
- <exec executable="cordova" dir="${cordova.target.dir}">
+ <exec executable="${cordova.executable}" dir="${cordova.target.dir}">
+ <env key="PATH" path="${env.PATH}:${cordova.path}"/>
<arg value="plugin" />
<arg value="add" />
<arg value="cordova-plugin-file" />
</exec>
</target>
- <target name="run.android" depends="load-fileplugin" description="Runs the Cordova application on the specified platform">
+ <target name="run.android" depends="find.cordova.mac,load-fileplugin" description="Runs the Cordova application on the specified platform">
<echo message="Launching ${appname} on platform ${platform.android}" />
- <exec executable="cordova" dir="${cordova.target.dir}">
+ <exec executable="${cordova.executable}" dir="${cordova.target.dir}">
+ <env key="PATH" path="${env.PATH}:${cordova.path}"/>
<arg value="run" />
<arg value="${platform.android}" />
</exec>
</target>
- <target name="run.ios" depends="load-fileplugin" description="Runs the Cordova application on the specified platform">
+ <target name="run.ios" depends="find.cordova.mac,load-fileplugin" description="Runs the Cordova application on the specified platform">
<echo message="Launching ${appname} on platform ${platform.ios}" />
- <exec executable="cordova" dir="${cordova.target.dir}">
+ <exec executable="${cordova.executable}" dir="${cordova.target.dir}">
+ <env key="PATH" path="${env.PATH}:${cordova.path}"/>
<arg value="run" />
<arg value="${platform.ios}" />
</exec>