You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/04/18 07:32:08 UTC
[royale-asjs] branch feature/MXRoyale updated (972a25e -> 27e0eb3)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 972a25e Merge pull request #182 from alinakazi/EffectInstanceandCompositeEffectInstance
new 3ca56b6 eliminate ambiguous definitions in Jewel Ant build
new 5c035bb add Jewel to build
new 27e0eb3 try to get JewelExample to build in Ant
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../JewelExample/src/main/config/compile-app-config.xml | 6 ++++--
frameworks/build.xml | 12 +++++++++++-
.../projects/Jewel/src/main/config/compile-swf-config.xml | 12 +++++++++---
3 files changed, 24 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 03/03: try to get JewelExample to build in Ant
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 27e0eb32f766b771d146de55a0db73cbb9fc4695
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Apr 18 00:31:46 2018 -0700
try to get JewelExample to build in Ant
---
examples/royale/JewelExample/src/main/config/compile-app-config.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/config/compile-app-config.xml b/examples/royale/JewelExample/src/main/config/compile-app-config.xml
index ccb20e9..d850acb 100644
--- a/examples/royale/JewelExample/src/main/config/compile-app-config.xml
+++ b/examples/royale/JewelExample/src/main/config/compile-app-config.xml
@@ -22,8 +22,10 @@
</js-output-optimization>
<compiler>
<theme>
- <filename>../../../../../../frameworks/libs/JewelTheme.swc</filename>
- <filename>../../../../../../frameworks/themes/JewelTheme/src/main/resources/defaults.css</filename>
+ <!--<filename>../../../../../../frameworks/libs/JewelTheme.swc</filename>-->
+ <filename>../../../../../../frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css</filename>
+ <filename>../../../../../../frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css</filename>
+ <filename>../../../../../../frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css</filename>
</theme>
</compiler>
</royale-config>
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 02/03: add Jewel to build
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 5c035bb029cbf498bde2b6defbddb8e2d70b32a6
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Apr 18 00:30:52 2018 -0700
add Jewel to build
---
frameworks/build.xml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/frameworks/build.xml b/frameworks/build.xml
index c0bb98c..384aca6 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -139,6 +139,8 @@
<antcall target="Express"/>
<antcall target="RoyaleSite"/>
<antcall target="MXRoyale"/>
+ <antcall target="Jewel"/>
+ <antcall target="JewelTheme"/>
</target>
<target name="fonts">
@@ -194,6 +196,8 @@
<ant dir="${basedir}/projects/TLF" target="clean"/>
<ant dir="${basedir}/projects/RoyaleSite" target="clean"/>
<ant dir="${basedir}/projects/MXRoyale" target="clean"/>
+ <ant dir="${basedir}/projects/Jewel" target="clean"/>
+ <ant dir="${basedir}/themes/JewelTheme" target="clean"/>
<ant dir="${basedir}/fontsrc" target="clean"/>
<!-- delete the FlashBuilder executable directories -->
@@ -333,9 +337,15 @@
<target name="RoyaleSite" description="Clean build of RoyaleSite.swc">
<ant dir="${basedir}/projects/RoyaleSite"/>
</target>
- <target name="MXRoyale" description="Clean build of RoyaleSite.swc">
+ <target name="MXRoyale" description="Clean build of MXRoyale.swc">
<ant dir="${basedir}/projects/MXRoyale"/>
</target>
+ <target name="Jewel" description="Clean build of Jewel.swc">
+ <ant dir="${basedir}/projects/Jewel"/>
+ </target>
+ <target name="JewelTheme" description="Clean build of JewelTheme.swc">
+ <ant dir="${basedir}/themes/JewelTheme"/>
+ </target>
<target name="create-config" depends="playerglobal-setswfversion" description="Copy the config template and inject version numbers">
<copy file="${basedir}/${configname}-config-template.xml" tofile="${basedir}/${configname}-config.xml" overwrite="true">
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 01/03: eliminate ambiguous definitions in Jewel Ant
build
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 3ca56b66cc43ddfbba1f31b3af1fc3d50b5ab423
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Apr 18 00:29:59 2018 -0700
eliminate ambiguous definitions in Jewel Ant build
---
.../projects/Jewel/src/main/config/compile-swf-config.xml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
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 4c2f19e..9656867 100644
--- a/frameworks/projects/Jewel/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/Jewel/src/main/config/compile-swf-config.xml
@@ -38,9 +38,15 @@
</external-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
- <mxml>
- <children-as-data>true</children-as-data>
- </mxml>
+ <mxml>
+ <children-as-data>true</children-as-data>
+ <imports>
+ <implicit-import>org.apache.royale.events.*</implicit-import>
+ <implicit-import>org.apache.royale.geom.*</implicit-import>
+ <implicit-import>org.apache.royale.core.ClassFactory</implicit-import>
+ <implicit-import>org.apache.royale.core.IFactory</implicit-import>
+ </imports>
+ </mxml>
<binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
<binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.