This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new ccdead78fc building XML before Basic in ant (along with unit-testing
implications)
ccdead78fc is described below
commit ccdead78fc05f9d437520842be047641a0e7509b
Author: greg-dove <[email protected]>
AuthorDate: Wed May 11 15:12:48 2022 +1200
building XML before Basic in ant (along with unit-testing implications)
---
frameworks/build.xml | 4 ++--
frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml | 1 +
.../Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml | 1 +
frameworks/projects/XML/build.xml | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/frameworks/build.xml b/frameworks/build.xml
index a84e139127..d583cb0517 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -123,6 +123,7 @@
<antcall target="Reflection"/>
<antcall target="RoyaleUnit"/>
<antcall target="Collections"/>
+ <antcall target="XML"/>
<antcall target="Basic"/>
<antcall target="RoyaleUnitUI"/>
@@ -138,8 +139,7 @@
<antcall target="HTML5"/>
<antcall target="JQuery"/>
<antcall target="Mobile"/>
-
- <antcall target="XML"/>
+
<antcall target="Network"/>
<antcall target="Storage"/>
diff --git
a/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
b/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
index 3027f11b59..3ede8a2c4b 100644
--- a/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
@@ -60,6 +60,7 @@
<path-element>../../../../../libs/CoreJS.swc</path-element>
<path-element>../../../../../libs/GraphicsJS.swc</path-element>
<path-element>../../../../../libs/CollectionsJS.swc</path-element>
+ <path-element>../../../../../libs/XMLJS.swc</path-element>
</external-library-path>
<namespaces>
diff --git
a/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
index aa89347c31..807344c6b2 100644
---
a/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
+++
b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
@@ -55,6 +55,7 @@
<path-element>../../../../../js/libs/LanguageJS.swc</path-element>
<path-element>../../../../../js/libs/ReflectionJS.swc</path-element>
<path-element>../../../../../js/libs/RoyaleUnitJS.swc</path-element>
+ <path-element>../../../../../js/libs/XMLJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
diff --git a/frameworks/projects/XML/build.xml
b/frameworks/projects/XML/build.xml
index ed85da8973..8ee8077032 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/build.xml
@@ -42,8 +42,8 @@
<format property="royale.swc-date" pattern="MM/dd/yy HH:mm Z"/>
</tstamp>
<echo>swc-date is ${royale.swc-date}</echo>
-
- <target name="main"
depends="clean,check-compiler,compile,compile-js,copy-swc,test"
description="Full build of ${ant.project.name}.swc">
+ <!-- test needs to be run after Basic is built -->
+ <target name="main"
depends="clean,check-compiler,compile,compile-js,copy-swc" description="Full
build of ${ant.project.name}.swc">
</target>
<target name="compile-js">
