This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 605cef9f91fc4bfa3dd9f0698034bd241ad81732 Author: Carlos Rovira <[email protected]> AuthorDate: Tue Feb 26 15:35:09 2019 +0100 finaly ANT working --- .../js/projects/JewelJS/src/main/config/compile-js-config.xml | 4 ++++ frameworks/projects/Jewel/build.xml | 8 +++++--- frameworks/projects/Jewel/src/main/config/compile-swf-config.xml | 4 ++++ .../royale/org/apache/royale/jewel/beads/validators/Validator.as | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml b/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml index fe6ef45..a735bd4 100644 --- a/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml @@ -43,6 +43,10 @@ <name>COMPILE::JS</name> <value>true</value> </define> + <define> + <name>LOCALE::language</name> + <value>'en_US'</value> + </define> <keep-as3-metadata> <name>Bindable</name> diff --git a/frameworks/projects/Jewel/build.xml b/frameworks/projects/Jewel/build.xml index e124107..a7c3473 100644 --- a/frameworks/projects/Jewel/build.xml +++ b/frameworks/projects/Jewel/build.xml @@ -26,7 +26,7 @@ <property environment="env"/> <property file="${ROYALE_HOME}/build.properties"/> <property name="ROYALE_HOME" value="${ROYALE_HOME}"/> - <property name="locale" value="'en_US'"/> + <property name="locale" value="en_US"/> <property name="target.name" value="${ant.project.name}.swc" /> @@ -92,14 +92,16 @@ <jvmarg value="-Dsun.io.useCanonCaches=false" /> <jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" /> <arg value="+royalelib=${ROYALE_HOME}/frameworks" /> - <arg value="-compiler.define+=LOCALE::language,${locale}" /> + <arg value="-compiler.define+=LOCALE::language,'${locale}'" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-compiler.strict-xml=true" /> <arg value="-compiler.targets=SWF,JSRoyale" /> <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" /> - <arg value="-js-compiler-define+=LOCALE::language,${locale}" /> + <arg value="-js-compiler-define+=LOCALE::language,'${locale}'" /> + <arg value="-js-compiler-define+=COMPILE::SWF,false" /> + <arg value="-js-compiler-define+=COMPILE::JS,true" /> <arg value="-js-load-config=${ROYALE_HOME}/frameworks/js-config.xml" /> <arg value="-js-load-config+=${basedir}/../../js/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> </java> diff --git a/frameworks/projects/Jewel/src/main/config/compile-swf-config.xml b/frameworks/projects/Jewel/src/main/config/compile-swf-config.xml index 10f07d4..484e733 100644 --- a/frameworks/projects/Jewel/src/main/config/compile-swf-config.xml +++ b/frameworks/projects/Jewel/src/main/config/compile-swf-config.xml @@ -60,6 +60,10 @@ <name>COMPILE::JS</name> <value>false</value> </define> + <define> + <name>LOCALE::language</name> + <value>'en_US'</value> + </define> <keep-as3-metadata> <name>Bindable</name> diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as index cb829b6..8ceb80d 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as @@ -24,10 +24,13 @@ package org.apache.royale.jewel.beads.validators import org.apache.royale.core.IStrand; import org.apache.royale.core.Strand; import org.apache.royale.core.UIBase; + import org.apache.royale.core.ValuesManager; import org.apache.royale.events.Event; import org.apache.royale.events.IEventDispatcher; import org.apache.royale.geom.Point; import org.apache.royale.jewel.supportClasses.tooltip.ErrorTipLabel; + import org.apache.royale.utils.PointUtils; + import org.apache.royale.utils.UIUtils; /** * The Validator class is the base class for all validators. @@ -43,6 +46,7 @@ package org.apache.royale.jewel.beads.validators { /** * locale + * @royalesuppresspublicvarwarning */ public static var locale :String = LOCALE::language;
