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/04/21 21:25:51 UTC
git commit: [flex-asjs] [refs/heads/dual] - get examples to build
Repository: flex-asjs
Updated Branches:
refs/heads/dual c07b2b3bf -> 544e2de47
get examples to build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/544e2de4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/544e2de4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/544e2de4
Branch: refs/heads/dual
Commit: 544e2de47944f56e0bbf837e3a3334e17cd370ac
Parents: c07b2b3
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 21 14:19:24 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 21 14:25:47 2017 -0700
----------------------------------------------------------------------
.../src/main/config/compile-app-config.xml | 4 +-
.../src/main/config/compile-app-config.xml | 4 +-
.../src/main/config/compile-app-config.xml | 4 +-
.../src/main/config/compile-app-config.xml | 4 +-
.../src/main/config/compile-app-config.xml | 4 +-
.../src/main/config/compile-app-config.xml | 4 +-
examples/native/USStatesMap/build.xml | 55 --------------------
7 files changed, 12 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/544e2de4/examples/flexjs/CreateJSExample/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CreateJSExample/src/main/config/compile-app-config.xml b/examples/flexjs/CreateJSExample/src/main/config/compile-app-config.xml
index 51e4b0d..d5e7156 100644
--- a/examples/flexjs/CreateJSExample/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/CreateJSExample/src/main/config/compile-app-config.xml
@@ -21,8 +21,8 @@
<optimization>skipFunctionCoercions</optimization>
</js-output-optimization>
<compiler>
- <js-external-library-path append="true">
+ <external-library-path append="true">
<path-element>../../../../../../js/libs/createjs.swc</path-element>
- </js-external-library-path>
+ </external-library-path>
</compiler>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/544e2de4/examples/flexjs/DesktopMap/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/src/main/config/compile-app-config.xml b/examples/flexjs/DesktopMap/src/main/config/compile-app-config.xml
index 0d2aeef..d542757 100644
--- a/examples/flexjs/DesktopMap/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/DesktopMap/src/main/config/compile-app-config.xml
@@ -19,8 +19,8 @@
<flex-config>
<remove-circulars>true</remove-circulars>
<compiler>
- <js-external-library-path append="true">
+ <external-library-path append="true">
<path-element>../../../../../../js/libs/google_maps.swc</path-element>
- </js-external-library-path>
+ </external-library-path>
</compiler>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/544e2de4/examples/flexjs/FlexJSStore_jquery/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/config/compile-app-config.xml b/examples/flexjs/FlexJSStore_jquery/src/main/config/compile-app-config.xml
index 6036129..0e2b391 100644
--- a/examples/flexjs/FlexJSStore_jquery/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/FlexJSStore_jquery/src/main/config/compile-app-config.xml
@@ -21,8 +21,8 @@
<optimization>skipFunctionCoercions</optimization>
</js-output-optimization>
<compiler>
- <js-external-library-path append="true">
+ <external-library-path append="true">
<path-element>../../../../../../js/libs/jquery.swc</path-element>
- </js-external-library-path>
+ </external-library-path>
</compiler>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/544e2de4/examples/flexjs/MapSearch/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/src/main/config/compile-app-config.xml b/examples/flexjs/MapSearch/src/main/config/compile-app-config.xml
index 0d2aeef..d542757 100644
--- a/examples/flexjs/MapSearch/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/MapSearch/src/main/config/compile-app-config.xml
@@ -19,8 +19,8 @@
<flex-config>
<remove-circulars>true</remove-circulars>
<compiler>
- <js-external-library-path append="true">
+ <external-library-path append="true">
<path-element>../../../../../../js/libs/google_maps.swc</path-element>
- </js-external-library-path>
+ </external-library-path>
</compiler>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/544e2de4/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..d542757 100644
--- a/examples/flexjs/MobileMap/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/MobileMap/src/main/config/compile-app-config.xml
@@ -19,8 +19,8 @@
<flex-config>
<remove-circulars>true</remove-circulars>
<compiler>
- <js-external-library-path append="true">
+ <external-library-path append="true">
<path-element>../../../../../../js/libs/google_maps.swc</path-element>
- </js-external-library-path>
+ </external-library-path>
</compiler>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/544e2de4/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..cc47563 100644
--- a/examples/flexjs/StorageExample/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/StorageExample/src/main/config/compile-app-config.xml
@@ -19,8 +19,8 @@
<flex-config>
<remove-circulars>true</remove-circulars>
<compiler>
- <js-external-library-path append="true">
+ <external-library-path append="true">
<path-element>../../../../../../js/libs/cordova.swc</path-element>
- </js-external-library-path>
+ </external-library-path>
</compiler>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/544e2de4/examples/native/USStatesMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/native/USStatesMap/build.xml b/examples/native/USStatesMap/build.xml
index 2a62d4a..5a0d580 100644
--- a/examples/native/USStatesMap/build.xml
+++ b/examples/native/USStatesMap/build.xml
@@ -33,64 +33,9 @@
<property name="config_arg" value="js" />
<property name="file_suffix" value="as" />
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" >
- <and>
- <not>
- <isset property="JS.SWC" />
- </not>
- <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" type="file" />
- </and>
- </condition>
-
- <condition property="JS.SWC" value="${FALCONJX_HOME}/libs/js.swc" >
- <and>
- <not>
- <isset property="JS.SWC" />
- </not>
- <available file="${FALCONJX_HOME}/libs/js.swc" type="file" />
- </and>
- </condition>
-
- <path id="lib.path">
- <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
- </path>
-
<target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
</target>
- <target name="build">
- <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
- fork="true">
- <jvmarg line="${mxmlc.jvm.args}"/>
- <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
- <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
- <arg value="-debug" />
- <arg value="-define=CONFIG::as_only,false" />
- <arg value="-define=CONFIG::js_only,true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <arg value="-compiler.mxml.children-as-data" />
- <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
- <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" />
- <arg value="-compiler.binding-value-change-event-type=valueChange" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="-js-output-type=FLEXJS" />
- <arg value="-closure-lib=${GOOG_HOME}" />
- <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
- <arg value="${basedir}/src/main/flex/${example}.as" />
- </java>
- <fail>
- <condition>
- <not>
- <or>
- <equals arg1="${errorCode}" arg2="0" />
- <equals arg1="${errorCode}" arg2="2" />
- </or>
- </not>
- </condition>
- </fail>
- </target>
-
<target name="clean">
<delete dir="${basedir}/bin" failonerror="false" />
<delete dir="${basedir}/bin-debug" failonerror="false" />