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/06 17:55:20 UTC
git commit: [flex-asjs] [refs/heads/cordova] - setup for Cordova
Publishing
Repository: flex-asjs
Updated Branches:
refs/heads/cordova [created] dc8ca2154
setup 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/dc8ca215
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dc8ca215
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dc8ca215
Branch: refs/heads/cordova
Commit: dc8ca21545097355d723d74d75c91ab1e63382d0
Parents: 18992c5
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jul 6 10:54:55 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jul 6 10:54:55 2017 -0700
----------------------------------------------------------------------
examples/build_example.xml | 10 --------
examples/flexjs/CordovaCameraExample/build.xml | 15 ++---------
.../src/main/config/compile-app-config.xml | 26 ++++++++++++++++++++
examples/flexjs/MobileMap/build.xml | 16 +-----------
.../src/main/config/compile-app-config.xml | 4 +++
examples/flexjs/MobileStocks/build.xml | 2 +-
.../src/main/config/compile-app-config.xml | 4 +++
examples/flexjs/MobileTrader/build.xml | 2 +-
.../src/main/config/compile-app-config.xml | 6 +++++
examples/flexjs/StorageExample/build.xml | 2 +-
.../src/main/config/compile-app-config.xml | 4 +++
11 files changed, 50 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index d97398a..a733d46 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -383,16 +383,6 @@
</exec>
</target>
- <target name="compile.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova">
- <property name="mobile.platform" value="android" />
- <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="main" >
- <property name="projectdir" value="${basedir}" />
- </ant>
- <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="load-platform.${mobile.platform}" >
- <property name="projectdir" value="${basedir}" />
- </ant>
- </target>
-
<target name="run.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova">
<property name="mobile.platform" value="android" />
<ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="run.${mobile.platform}" >
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/CordovaCameraExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/build.xml b/examples/flexjs/CordovaCameraExample/build.xml
index 55bd7ae..06abb8f 100644
--- a/examples/flexjs/CordovaCameraExample/build.xml
+++ b/examples/flexjs/CordovaCameraExample/build.xml
@@ -35,25 +35,14 @@
<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-camera"/>
- </ant>
- </target>
-
- <target name="cordova" description="Executes the Cordova build script to create Cordova app">
- <ant antfile="../../../cordova-build.xml" />
+ <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
</target>
<target name="run-android" description="Executes the Cordova build script to run the app on a device.">
<ant antfile="../../../cordova-build.xml" target="run.android" />
</target>
- <target name="all" depends="main, cordova" description="Builds the app then runs the Cordova script">
+ <target name="all" depends="main" description="Builds the app then runs the Cordova script">
</target>
<target name="run">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/CordovaCameraExample/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/src/main/config/compile-app-config.xml b/examples/flexjs/CordovaCameraExample/src/main/config/compile-app-config.xml
new file mode 100644
index 0000000..0c753a1
--- /dev/null
+++ b/examples/flexjs/CordovaCameraExample/src/main/config/compile-app-config.xml
@@ -0,0 +1,26 @@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+ <compiler>
+ <targets>
+ <target>SWF</target>
+ <target>JSFlexCordova</target>
+ </targets>
+ </compiler>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/MobileMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/build.xml b/examples/flexjs/MobileMap/build.xml
index ce1fe68..57c7120 100644
--- a/examples/flexjs/MobileMap/build.xml
+++ b/examples/flexjs/MobileMap/build.xml
@@ -35,27 +35,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">
- <ant antfile="../../../cordova-build.xml" />
+ <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
</target>
<target name="run" description="Executes the Cordova build script to run the app on a device.">
<ant antfile="../../../cordova-build.xml" target="run.android" />
</target>
- <target name="all" depends="main, cordova" description="Builds the app then runs the Cordova script">
- </target>
-
<target name="clean">
<delete dir="${basedir}/bin" failonerror="false" />
<delete dir="${basedir}/bin-debug" failonerror="false" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/MobileMap/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/src/main/config/compile-app-config.xml b/examples/flexjs/MobileMap/src/main/config/compile-app-config.xml
index 0d2aeef..fe340e0 100644
--- a/examples/flexjs/MobileMap/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/MobileMap/src/main/config/compile-app-config.xml
@@ -19,6 +19,10 @@
<flex-config>
<remove-circulars>true</remove-circulars>
<compiler>
+ <targets>
+ <target>SWF</target>
+ <target>JSFlexCordova</target>
+ </targets>
<js-external-library-path append="true">
<path-element>../../../../../../js/libs/google_maps.swc</path-element>
</js-external-library-path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/MobileStocks/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/build.xml b/examples/flexjs/MobileStocks/build.xml
index 5959255..d425618 100644
--- a/examples/flexjs/MobileStocks/build.xml
+++ b/examples/flexjs/MobileStocks/build.xml
@@ -37,7 +37,7 @@
<include file="${basedir}/../../build_example.xml" />
- <target name="main" depends="clean,build_example.compile,build_example.copy-js-resources,build_example.compile.cordova" description="Clean build of ${example}">
+ <target name="main" depends="clean,build_example.compile,build_example.copy-js-resources" description="Clean build of ${example}">
</target>
<target name="clean">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml b/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml
index a165dee..9661bbb 100644
--- a/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/MobileStocks/src/main/config/compile-app-config.xml
@@ -19,6 +19,10 @@
<flex-config>
<remove-circulars>true</remove-circulars>
<compiler>
+ <targets>
+ <target>SWF</target>
+ <target>JSFlexCordova</target>
+ </targets>
<js-external-library-path append="true">
<path-element>../../../../../../js/libs/cordova.swc</path-element>
</js-external-library-path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index 0e654e6..aecdeb0 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -48,7 +48,7 @@
</condition>
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
- <target name="main" depends="clean,build_example.compile,build_example.copy-js-resources,build_example.compile.cordova" description="Clean build of ${example}">
+ <target name="main" depends="clean,build_example.compile,build_example.copy-js-resources" description="Clean build of ${example}">
</target>
<target name="clean">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/MobileTrader/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/main/config/compile-app-config.xml b/examples/flexjs/MobileTrader/src/main/config/compile-app-config.xml
index a8b73f5..d62a1d8 100644
--- a/examples/flexjs/MobileTrader/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/MobileTrader/src/main/config/compile-app-config.xml
@@ -18,4 +18,10 @@
-->
<flex-config>
<remove-circulars>true</remove-circulars>
+ <compiler>
+ <targets>
+ <target>SWF</target>
+ <target>JSFlexCordova</target>
+ </targets>
+ </compiler>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/StorageExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/build.xml b/examples/flexjs/StorageExample/build.xml
index 97d921d..6c37431 100644
--- a/examples/flexjs/StorageExample/build.xml
+++ b/examples/flexjs/StorageExample/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}">
<copy todir="${basedir}/bin-debug" >
<fileset dir="${basedir}">
<include name="*-app.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc8ca215/examples/flexjs/StorageExample/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/src/main/config/compile-app-config.xml b/examples/flexjs/StorageExample/src/main/config/compile-app-config.xml
index a165dee..9661bbb 100644
--- a/examples/flexjs/StorageExample/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/StorageExample/src/main/config/compile-app-config.xml
@@ -19,6 +19,10 @@
<flex-config>
<remove-circulars>true</remove-circulars>
<compiler>
+ <targets>
+ <target>SWF</target>
+ <target>JSFlexCordova</target>
+ </targets>
<js-external-library-path append="true">
<path-element>../../../../../../js/libs/cordova.swc</path-element>
</js-external-library-path>