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/11/22 01:58:25 UTC
[royale-asjs] 01/04: set royale-config to list all swcs except
emulation swcs. Emulation users must switch to flex-config via
+configname=flex. Fix up build now that some SWCs will be missing as we
start to build from sources
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 4e7c1ade6caf4264c444aaaac90d93c6d0b5e1ea
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Nov 21 17:54:31 2018 -0800
set royale-config to list all swcs except emulation swcs. Emulation users must switch to flex-config via +configname=flex. Fix up build now that some SWCs will be missing as we start to build from sources
---
frameworks/flex-config-template.xml | 5 +-
.../royale/FlexUnitRoyaleApplication-config.xml | 96 ++++++++++++++++++++++
.../projects/Basic/src/test/royale/build.xml | 9 +-
.../royale/FlexUnitRoyaleApplication-config.xml | 88 ++++++++++++++++++++
frameworks/projects/Core/src/test/royale/build.xml | 9 +-
frameworks/royale-config-template.xml | 63 +++++++++++++-
6 files changed, 257 insertions(+), 13 deletions(-)
diff --git a/frameworks/flex-config-template.xml b/frameworks/flex-config-template.xml
index 25bc08c..18b45b1 100644
--- a/frameworks/flex-config-template.xml
+++ b/frameworks/flex-config-template.xml
@@ -106,7 +106,10 @@
<mxml>
<children-as-data>true</children-as-data>
<imports>
- <implicit-import>org.apache.royale.events.*</implicit-import>
+ <implicit-import>org.apache.royale.events.Event</implicit-import>
+ <implicit-import>org.apache.royale.events.EventDispatcher</implicit-import>
+ <implicit-import>org.apache.royale.events.IEventDispatcher</implicit-import>
+ <implicit-import>mx.events.MouseEvent</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>
diff --git a/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
new file mode 100644
index 0000000..c02a2d7
--- /dev/null
+++ b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
@@ -0,0 +1,96 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<royale-config>
+
+ <compiler>
+ <accessible>false</accessible>
+
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>SWF</target>
+ </targets>
+ <strict-xml>true</strict-xml>
+
+ <external-library-path>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
+ </external-library-path>
+
+ <library-path>
+ <path-element>../../../../../libs/Basic.swc</path-element>
+ <path-element>../../../../../libs/Binding.swc</path-element>
+ <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../../../libs/Graphics.swc</path-element>
+ <path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/Testing.swc</path-element>
+ </library-path>
+
+ <allow-subclass-overrides>true</allow-subclass-overrides>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </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>
+ <fxg-base-class>flash.display.Sprite</fxg-base-class>
+
+ <define>
+ <name>COMPILE::SWF</name>
+ <value>true</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>false</value>
+ </define>
+
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ <name>SWFOverride</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>../../main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>../../main/resources/basic-as-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/royale/svg</uri>
+ <manifest>../../main/resources/svg-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <target-player>${playerglobal.version}</target-player>
+
+
+</royale-config>
diff --git a/frameworks/projects/Basic/src/test/royale/build.xml b/frameworks/projects/Basic/src/test/royale/build.xml
index 64cf426..511167e 100644
--- a/frameworks/projects/Basic/src/test/royale/build.xml
+++ b/frameworks/projects/Basic/src/test/royale/build.xml
@@ -51,14 +51,14 @@
<available file="${FLEXUNIT_HOME}/FlexUnit4/target"
type="dir"
property="FLEXUNIT_LIBPATH1"
- value="-swf-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target/flexunit-4.3.0-20140410-as3_4.12.0.swc" />
- <property name="FLEXUNIT_LIBPATH1" value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-4.2.0-20140410-as3_4.12.0.swc" />
+ value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target/flexunit-4.3.0-20140410-as3_4.12.0.swc" />
+ <property name="FLEXUNIT_LIBPATH1" value="-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-4.2.0-20140410-as3_4.12.0.swc" />
<available file="${FLEXUNIT_HOME}/FlexUnit4CIListener/target"
type="dir"
property="FLEXUNIT_LIBPATH2"
- value="-swf-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
- <property name="FLEXUNIT_LIBPATH2" value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc" />
+ value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
+ <property name="FLEXUNIT_LIBPATH2" value="-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc" />
<available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
type="dir"
@@ -118,7 +118,6 @@
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="-swf-library-path+=${ROYALE_HOME}/frameworks/libs" />
<arg value="${FLEXUNIT_LIBPATH1}" />
<arg value="${FLEXUNIT_LIBPATH2}" />
</mxmlc>
diff --git a/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication-config.xml b/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication-config.xml
new file mode 100644
index 0000000..13ef557
--- /dev/null
+++ b/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication-config.xml
@@ -0,0 +1,88 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<royale-config>
+
+ <compiler>
+ <accessible>false</accessible>
+
+ <!-- build both SWF and JS. -->
+ <targets>
+ <target>SWF</target>
+ </targets>
+ <strict-xml>true</strict-xml>
+
+ <external-library-path>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
+ </external-library-path>
+
+ <library-path>
+ <path-element>../../../../../libs/Basic.swc</path-element>
+ <path-element>../../../../../libs/Binding.swc</path-element>
+ <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../../../libs/Graphics.swc</path-element>
+ <path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/Testing.swc</path-element>
+ </library-path>
+
+ <allow-subclass-overrides>true</allow-subclass-overrides>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </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>
+ <fxg-base-class>flash.display.Sprite</fxg-base-class>
+
+ <define>
+ <name>COMPILE::SWF</name>
+ <value>true</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>false</value>
+ </define>
+
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ <name>SWFOverride</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/royale/basic</uri>
+ <manifest>../../main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <target-player>${playerglobal.version}</target-player>
+
+
+</royale-config>
diff --git a/frameworks/projects/Core/src/test/royale/build.xml b/frameworks/projects/Core/src/test/royale/build.xml
index ab745f5..e920264 100644
--- a/frameworks/projects/Core/src/test/royale/build.xml
+++ b/frameworks/projects/Core/src/test/royale/build.xml
@@ -51,14 +51,14 @@
<available file="${FLEXUNIT_HOME}/FlexUnit4/target"
type="dir"
property="FLEXUNIT_LIBPATH1"
- value="-swf-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target/flexunit-4.3.0-20140410-as3_4.12.0.swc" />
- <property name="FLEXUNIT_LIBPATH1" value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-4.2.0-20140410-as3_4.12.0.swc" />
+ value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target/flexunit-4.3.0-20140410-as3_4.12.0.swc" />
+ <property name="FLEXUNIT_LIBPATH1" value="-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-4.2.0-20140410-as3_4.12.0.swc" />
<available file="${FLEXUNIT_HOME}/FlexUnit4CIListener/target"
type="dir"
property="FLEXUNIT_LIBPATH2"
- value="-swf-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
- <property name="FLEXUNIT_LIBPATH2" value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc" />
+ value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
+ <property name="FLEXUNIT_LIBPATH2" value="-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc" />
<available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
type="dir"
@@ -121,7 +121,6 @@
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="-swf-library-path+=${ROYALE_HOME}/frameworks/libs" />
<arg value="${FLEXUNIT_LIBPATH1}" />
<arg value="${FLEXUNIT_LIBPATH2}" />
</mxmlc>
diff --git a/frameworks/royale-config-template.xml b/frameworks/royale-config-template.xml
index d0fab5c..84bb3a2 100644
--- a/frameworks/royale-config-template.xml
+++ b/frameworks/royale-config-template.xml
@@ -93,13 +93,72 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs</path-element>
+ <path-element>libs/Basic.swc</path-element>
+ <path-element>libs/Binding.swc</path-element>
+ <path-element>libs/Charts.swc</path-element>
+ <path-element>libs/Collections.swc</path-element>
+ <path-element>libs/Core.swc</path-element>
+ <path-element>libs/CreateJS.swc</path-element>
+ <path-element>libs/DragDrop.swc</path-element>
+ <path-element>libs/Effects.swc</path-element>
+ <path-element>libs/Express.swc</path-element>
+ <path-element>libs/Flat.swc</path-element>
+ <path-element>libs/FontAwesome.swc</path-element>
+ <path-element>libs/Formatters.swc</path-element>
+ <path-element>libs/GoogleMaps.swc</path-element>
+ <path-element>libs/Graphics.swc</path-element>
+ <path-element>libs/HTML.swc</path-element>
+ <path-element>libs/HTML5.swc</path-element>
+ <path-element>libs/Icons.swc</path-element>
+ <path-element>libs/Jewel.swc</path-element>
+ <path-element>libs/jQuery.swc</path-element>
+ <path-element>libs/Language.swc</path-element>
+ <path-element>libs/MaterialDesignLite.swc</path-element>
+ <path-element>libs/Mobile.swc</path-element>
+ <path-element>libs/Network.swc</path-element>
+ <path-element>libs/Reflection.swc</path-element>
+ <path-element>libs/RoyaleSite.swc</path-element>
+ <path-element>libs/Storage.swc</path-element>
+ <path-element>libs/TLF.swc</path-element>
+ <path-element>libs/Testing.swc</path-element>
+ <path-element>libs/Text.swc</path-element>
+ <path-element>libs/XML.swc</path-element>
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
- <path-element>js/libs</path-element>
+ <path-element>js/libs/AceJS.swc</path-element>
+ <path-element>js/libs/BasicJS.swc</path-element>
+ <path-element>js/libs/BindingJS.swc</path-element>
+ <path-element>js/libs/ChartsJS.swc</path-element>
+ <path-element>js/libs/CollectionsJS.swc</path-element>
+ <path-element>js/libs/CoreJS.swc</path-element>
+ <path-element>js/libs/CreateJSJS.swc</path-element>
+ <path-element>js/libs/DragDropJS.swc</path-element>
+ <path-element>js/libs/EffectsJS.swc</path-element>
+ <path-element>js/libs/ExpressJS.swc</path-element>
+ <path-element>js/libs/FlatJS.swc</path-element>
+ <path-element>js/libs/FontAwesomeJS.swc</path-element>
+ <path-element>js/libs/FormattersJS.swc</path-element>
+ <path-element>js/libs/GoogleMapsJS.swc</path-element>
+ <path-element>js/libs/GraphicsJS.swc</path-element>
+ <path-element>js/libs/HTMLJS.swc</path-element>
+ <path-element>js/libs/HTML5JS.swc</path-element>
+ <path-element>js/libs/IconsJS.swc</path-element>
+ <path-element>js/libs/JewelJS.swc</path-element>
+ <path-element>js/libs/jQueryJS.swc</path-element>
+ <path-element>js/libs/LanguageJS.swc</path-element>
+ <path-element>js/libs/MaterialDesignLiteJS.swc</path-element>
+ <path-element>js/libs/MobileJS.swc</path-element>
+ <path-element>js/libs/NetworkJS.swc</path-element>
+ <path-element>js/libs/ReflectionJS.swc</path-element>
+ <path-element>js/libs/RoyaleSiteJS.swc</path-element>
+ <path-element>js/libs/StorageJS.swc</path-element>
+ <path-element>js/libs/TLFJS.swc</path-element>
+ <path-element>js/libs/TestingJS.swc</path-element>
+ <path-element>js/libs/TextJS.swc</path-element>
+ <path-element>js/libs/XMLJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>