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/06/01 06:51:11 UTC

[1/2] git commit: [flex-asjs] [refs/heads/release0.8.0] - MapSearch doesn't use Cordova

Repository: flex-asjs
Updated Branches:
  refs/heads/release0.8.0 ec58f56e6 -> 71d7d8b5b


MapSearch doesn't use Cordova


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

Branch: refs/heads/release0.8.0
Commit: 73a6a102cb0a6374d5977e86f1ba3fef8a23a673
Parents: ec58f56
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 21:44:46 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 21:44:46 2017 -0700

----------------------------------------------------------------------
 examples/flexjs/MapSearch/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/73a6a102/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index c15f803..589da05 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -53,7 +53,7 @@
 
     <include file="${basedir}/../../build_example.xml" />
 
-    <target name="main" depends="clean,build_example.compile,build_example.compile.cordova" description="Clean build of ${example}">
+    <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
     </target>
     
     <target name="clean">


[2/2] git commit: [flex-asjs] [refs/heads/release0.8.0] - MobileMap output to cordova

Posted by ah...@apache.org.
MobileMap output to cordova


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

Branch: refs/heads/release0.8.0
Commit: 71d7d8b5b80e281692f53575371d689494b901c1
Parents: 73a6a10
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 21:50:00 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 21:50:00 2017 -0700

----------------------------------------------------------------------
 examples/flexjs/MobileMap/build.xml                    | 9 ++++++++-
 examples/flexjs/MobileMap/src/main/flex/MobileMap.mxml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/71d7d8b5/examples/flexjs/MobileMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/build.xml b/examples/flexjs/MobileMap/build.xml
index f50c4b7..ce1fe68 100644
--- a/examples/flexjs/MobileMap/build.xml
+++ b/examples/flexjs/MobileMap/build.xml
@@ -36,6 +36,13 @@
     <include file="${basedir}/../../build_example.xml" />
 
     <target name="main" depends="clean,build_example.compile,build_example.compile.cordova" description="Clean build of ${example}">
+        <antcall target="cordova-plugins" />
+    </target>
+    
+    <target name="cordova-plugins" if="has.cordova" >
+        <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="load-plugin" >
+            <property name="plugin" value="cordova-plugin-geolocation"/>
+        </ant>
     </target>
     
     <target name="cordova" description="Executes the Cordova build script to create Cordova app">
@@ -43,7 +50,7 @@
     </target>
     
     <target name="run" description="Executes the Cordova build script to run the app on a device.">
-    	<ant antfile="../../../cordova-build.xml" target="run" />
+    	<ant antfile="../../../cordova-build.xml" target="run.android" />
     </target>
     
     <target name="all" depends="main, cordova" description="Builds the app then runs the Cordova script">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/71d7d8b5/examples/flexjs/MobileMap/src/main/flex/MobileMap.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/src/main/flex/MobileMap.mxml b/examples/flexjs/MobileMap/src/main/flex/MobileMap.mxml
index 1a68662..2e63648 100644
--- a/examples/flexjs/MobileMap/src/main/flex/MobileMap.mxml
+++ b/examples/flexjs/MobileMap/src/main/flex/MobileMap.mxml
@@ -27,7 +27,7 @@ limitations under the License.
     </js:valuesImpl>
     <fx:Script>
         <![CDATA[
-        	import org.apache.cordova.geolocation.Geolocation;
+        	import org.apache.flex.cordova.geolocation.Geolocation;
         	import google.maps.LatLng;
         	
             private function onDeviceReady():void {