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/05/19 16:58:23 UTC
[4/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - fix up
examine targets
fix up examine targets
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a9ae1452
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a9ae1452
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a9ae1452
Branch: refs/heads/release0.8.0
Commit: a9ae1452a922648e8c4cb907cfe3d915ae5ec619
Parents: b3b3cd6
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 19 09:57:56 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 19 09:57:56 2017 -0700
----------------------------------------------------------------------
examples/build_example.xml | 16 ++++++++++++++++
examples/flexjs/ASDoc/build.xml | 7 ++++++-
examples/flexjs/DesktopMap/build.xml | 4 +++-
examples/flexjs/MapSearch/build.xml | 8 +++++---
examples/flexjs/MobileMap/build.xml | 3 ++-
examples/flexjs/MobileStocks/build.xml | 18 +-----------------
examples/flexjs/MobileTrader/build.xml | 4 +++-
examples/flexjs/StorageExample/build.xml | 2 +-
8 files changed, 37 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 178c262..65c4149 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -92,6 +92,22 @@
</and>
</condition>
+ <condition property="adl" value="adl.exe">
+ <os family="windows"/>
+ </condition>
+
+ <condition property="adl" value="adl">
+ <os family="mac"/>
+ </condition>
+
+ <condition property="runtime" value="win">
+ <os family="windows"/>
+ </condition>
+
+ <condition property="runtime" value="mac">
+ <os family="mac"/>
+ </condition>
+
<target name="get.browser" >
<condition property="browser" value="${env.ProgramFiles}/Mozilla Firefox/firefox.exe">
<and>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/ASDoc/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ASDoc/build.xml b/examples/flexjs/ASDoc/build.xml
index 1976bfb..37cb92d 100644
--- a/examples/flexjs/ASDoc/build.xml
+++ b/examples/flexjs/ASDoc/build.xml
@@ -28,6 +28,11 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <condition property="config.path" value=""${basedir}/src/main/config/asdoc-config.xml"">
+ <os family="windows" />
+ </condition>
+ <property name="config.path" value="${basedir}/src/main/config/asdoc-config.xml"/>
+
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="build_example.compile" description="Clean build of ${example}">
@@ -54,7 +59,7 @@
<arg value="-external-library-path=${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" />
<arg value="-external-library-path+=${FLEXJS_HOME}/js/libs/google_maps.swc" />
<arg value="+frameworks_dir=${FLEXJS_HOME}/frameworks" />
- <arg value="-load-config="${basedir}/src/main/config/asdoc-config.xml"" />
+ <arg value="-load-config=${config.path}" />
<arg value="-debug=true" />
<arg value="-output=${basedir}/bin-debug" />
<arg value="-window-title=Apache FlexJS API Reference" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/DesktopMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml
index f34d591..ea73725 100644
--- a/examples/flexjs/DesktopMap/build.xml
+++ b/examples/flexjs/DesktopMap/build.xml
@@ -80,7 +80,9 @@
<property name="which" value="debug" />
<echo message="View map."/>
<antcall target="build_example.run.air.desktop" />
- <antcall target="build_example.run.cordova" />
+ <exec executable="${browser}" dir="${basedir}/bin/js-${which}" failonerror="true">
+ <arg value="${basedir}/bin/js-${which}/index.html"/>
+ </exec>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index f8e985d..2722bee 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -64,14 +64,16 @@
</target>
<target name="run">
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
</target>
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="View map."/>
- <antcall target="build_example.run.air" />
- <antcall target="build_example.run.cordova" />
+ <antcall target="build_example.run.air.desktop" />
+ <exec executable="${browser}" dir="${basedir}/bin/js-${which}" failonerror="true">
+ <arg value="${basedir}/bin/js-${which}/index.html"/>
+ </exec>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MobileMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/build.xml b/examples/flexjs/MobileMap/build.xml
index a1e9d07..f50c4b7 100644
--- a/examples/flexjs/MobileMap/build.xml
+++ b/examples/flexjs/MobileMap/build.xml
@@ -30,6 +30,7 @@
<property file="${FLEXJS_HOME}/local.properties"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <property name="AIR_HOME" value="${env.AIR_HOME}"/>
<property name="config_arg" value="air" />
<include file="${basedir}/../../build_example.xml" />
@@ -59,7 +60,7 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="View map."/>
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
<antcall target="build_example.run.cordova" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MobileStocks/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileStocks/build.xml b/examples/flexjs/MobileStocks/build.xml
index 39264c4..831e25d 100644
--- a/examples/flexjs/MobileStocks/build.xml
+++ b/examples/flexjs/MobileStocks/build.xml
@@ -35,22 +35,6 @@
<property name="AIR_HOME" value="${env.AIR_HOME}"/>
<property name="config_arg" value="air"/>
- <condition property="adl" value="adl.exe">
- <os family="windows"/>
- </condition>
-
- <condition property="adl" value="adl">
- <os family="mac"/>
- </condition>
-
- <condition property="runtime" value="win">
- <os family="windows"/>
- </condition>
-
- <condition property="runtime" value="mac">
- <os family="mac"/>
- </condition>
-
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="clean,build_example.compile,build_example.compile.cordova" description="Clean build of ${example}">
@@ -80,7 +64,7 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="Click on Products tab. Hover over person to see buttons with tooltips. DragDrop a person to compare box. Click on Support tab."/>
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
<antcall target="build_example.run.cordova" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index d1483b0..8c7ab5f 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -76,7 +76,9 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="View example"/>
- <antcall target="build_example.run.air" />
+ <exec executable="${browser}" dir="${basedir}/bin-${which}" failonerror="true">
+ <arg value="${basedir}/bin-${which}/${example}.html"/>
+ </exec>
<antcall target="build_example.run.cordova" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9ae1452/examples/flexjs/StorageExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/build.xml b/examples/flexjs/StorageExample/build.xml
index 9e908ab..5e6d1a2 100644
--- a/examples/flexjs/StorageExample/build.xml
+++ b/examples/flexjs/StorageExample/build.xml
@@ -80,7 +80,7 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
<echo message="See if Storage works."/>
- <antcall target="build_example.run.air" />
+ <antcall target="build_example.run.air.desktop" />
<antcall target="build_example.run.cordova" />
</target>