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
The following commit(s) were added to refs/heads/develop by this push:
new c88fd33 be explicit about which FlexUnit swcs we use by default.
There is unlikely to be a newer FlexUnit version we will use
c88fd33 is described below
commit c88fd330a004476b04716cf6912acc14bc77784e
Author: Alex Harui <aha...@apache.org>
AuthorDate: Tue Nov 20 11:11:41 2018 -0800
be explicit about which FlexUnit swcs we use by default. There is unlikely
to be a newer FlexUnit version we will use
---
frameworks/projects/Basic/src/test/royale/build.xml | 6 ++++--
frameworks/projects/Core/src/test/royale/build.xml | 4 ++--
frameworks/projects/HTML/src/test/royale/build.xml | 4 ++--
frameworks/projects/Testing/src/test/royale/build.xml | 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/frameworks/projects/Basic/src/test/royale/build.xml
b/frameworks/projects/Basic/src/test/royale/build.xml
index 9872f11..64cf426 100644
--- a/frameworks/projects/Basic/src/test/royale/build.xml
+++ b/frameworks/projects/Basic/src/test/royale/build.xml
@@ -52,13 +52,13 @@
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" />
+ <property name="FLEXUNIT_LIBPATH1"
value="-swf-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="-define+=CONFIG::dummy,false" />
+ <property name="FLEXUNIT_LIBPATH2"
value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc"
/>
<available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
type="dir"
@@ -91,6 +91,8 @@
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
<echo message="FLEXUNIT_HOME: ${FLEXUNIT_HOME}"/>
+ <echo message="FLEXUNIT_LIBPATH1: ${FLEXUNIT_LIBPATH1}"/>
+ <echo message="FLEXUNIT_LIBPATH2: ${FLEXUNIT_LIBPATH2}"/>
<echo message="playerglobal.version: ${playerglobal.version}"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
diff --git a/frameworks/projects/Core/src/test/royale/build.xml
b/frameworks/projects/Core/src/test/royale/build.xml
index 5ce78b6..ab745f5 100644
--- a/frameworks/projects/Core/src/test/royale/build.xml
+++ b/frameworks/projects/Core/src/test/royale/build.xml
@@ -52,13 +52,13 @@
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" />
+ <property name="FLEXUNIT_LIBPATH1"
value="-swf-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="-define+=CONFIG::dummy,false" />
+ <property name="FLEXUNIT_LIBPATH2"
value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc"
/>
<available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
type="dir"
diff --git a/frameworks/projects/HTML/src/test/royale/build.xml
b/frameworks/projects/HTML/src/test/royale/build.xml
index 49e0386..562435a 100644
--- a/frameworks/projects/HTML/src/test/royale/build.xml
+++ b/frameworks/projects/HTML/src/test/royale/build.xml
@@ -52,13 +52,13 @@
type="dir"
property="FLEXUNIT_LIBPATH1"
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" />
+ <property name="FLEXUNIT_LIBPATH1"
value="-swf-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="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
- <property name="FLEXUNIT_LIBPATH2"
value="-define+=CONFIG::dummy,false" />
+ <property name="FLEXUNIT_LIBPATH2"
value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc"
/>
<available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
type="dir"
diff --git a/frameworks/projects/Testing/src/test/royale/build.xml
b/frameworks/projects/Testing/src/test/royale/build.xml
index 422093e..ca13ed3 100644
--- a/frameworks/projects/Testing/src/test/royale/build.xml
+++ b/frameworks/projects/Testing/src/test/royale/build.xml
@@ -58,13 +58,13 @@
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" />
+ <property name="FLEXUNIT_LIBPATH1"
value="-swf-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="-define=CONFIG::dummy,false" />
+ <property name="FLEXUNIT_LIBPATH2"
value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit/flexunit-cilistener-4.2.0-20140410-4.12.0.swc"
/>
<available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
type="dir"
