This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 00d021774c8d4fb761ecee5ec791b5b9a7b5e694 Author: Alex Harui <aha...@apache.org> AuthorDate: Wed Nov 21 17:55:48 2018 -0800 use flex config in mxroyale --- examples/mxroyale/ControlsExample/build.xml | 1 + examples/mxroyale/HelloWorld/build.xml | 1 + examples/mxroyale/RemoteObjectAMFTest/build.xml | 1 + examples/mxroyale/SparkHelloWorld/build.xml | 1 + examples/mxroyale/tourdeflexmodules/build.xml | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/mxroyale/ControlsExample/build.xml b/examples/mxroyale/ControlsExample/build.xml index 6db143a..a6e26e3 100644 --- a/examples/mxroyale/ControlsExample/build.xml +++ b/examples/mxroyale/ControlsExample/build.xml @@ -27,6 +27,7 @@ <property environment="env"/> <property file="${ROYALE_HOME}/build.properties"/> <property name="ROYALE_HOME" value="${ROYALE_HOME}"/> + <property name="config_arg" value="flex"/> <include file="${basedir}/../../build_example.xml" /> diff --git a/examples/mxroyale/HelloWorld/build.xml b/examples/mxroyale/HelloWorld/build.xml index dddbf5c..62250e0 100644 --- a/examples/mxroyale/HelloWorld/build.xml +++ b/examples/mxroyale/HelloWorld/build.xml @@ -27,6 +27,7 @@ <property environment="env"/> <property file="${ROYALE_HOME}/build.properties"/> <property name="ROYALE_HOME" value="${ROYALE_HOME}"/> + <property name="config_arg" value="flex"/> <include file="${basedir}/../../build_example.xml" /> diff --git a/examples/mxroyale/RemoteObjectAMFTest/build.xml b/examples/mxroyale/RemoteObjectAMFTest/build.xml index 64adeeb..8a473b7 100644 --- a/examples/mxroyale/RemoteObjectAMFTest/build.xml +++ b/examples/mxroyale/RemoteObjectAMFTest/build.xml @@ -28,6 +28,7 @@ <property file="${ROYALE_HOME}/build.properties"/> <property name="ROYALE_HOME" value="${ROYALE_HOME}"/> <property name="opt1_arg" value="-html-template=${basedir}/src/main/resources/mdl-js-index-template.html" /> + <property name="config_arg" value="flex"/> <include file="${basedir}/../../build_example.xml" /> diff --git a/examples/mxroyale/SparkHelloWorld/build.xml b/examples/mxroyale/SparkHelloWorld/build.xml index 7f030ee..1189ea6 100644 --- a/examples/mxroyale/SparkHelloWorld/build.xml +++ b/examples/mxroyale/SparkHelloWorld/build.xml @@ -27,6 +27,7 @@ <property environment="env"/> <property file="${ROYALE_HOME}/build.properties"/> <property name="ROYALE_HOME" value="${ROYALE_HOME}"/> + <property name="config_arg" value="flex"/> <include file="${basedir}/../../build_example.xml" /> diff --git a/examples/mxroyale/tourdeflexmodules/build.xml b/examples/mxroyale/tourdeflexmodules/build.xml index 0b6f70f..de66710 100644 --- a/examples/mxroyale/tourdeflexmodules/build.xml +++ b/examples/mxroyale/tourdeflexmodules/build.xml @@ -90,7 +90,7 @@ <mxmlc file="${basedir}/src/@{folder}@{example}.mxml" debug="true" output="${basedir}/bin-debug/@{folder}@{example}.swf" fork="true" failonerror="true"> - <load-config filename="${ROYALE_HOME}/frameworks/royale-config.xml"/> + <load-config filename="${ROYALE_HOME}/frameworks/flex-config.xml"/> <arg value="-module-output=@{folder}" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -113,7 +113,7 @@ <locale>el_GR</locale> <locale>de_CH</locale> <locale>pt_PT</locale> - <load-config filename="${ROYALE_HOME}/frameworks/royale-config.xml"/> + <load-config filename="${ROYALE_HOME}/frameworks/flex-config.xml"/> </mxmlc> </sequential> </macrodef>