This is an automated email from the ASF dual-hosted git repository. joshtynjala 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 8c36bbbf77 Ant: RoyaleUnit task should have different lib.path to avoid potential conflicts 8c36bbbf77 is described below commit 8c36bbbf77e6eed8e781cafd5f769c0d4199baff Author: Josh Tynjala <joshtynj...@apache.org> AuthorDate: Mon Jul 18 11:31:36 2022 -0700 Ant: RoyaleUnit task should have different lib.path to avoid potential conflicts --- frameworks/js/projects/BasicJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/BindingJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/CollectionsJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/CoreJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/MXRoyaleBaseJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/NetworkJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/ReflectionJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml | 4 +++- frameworks/js/projects/XMLJS/src/test/royale/build.xml | 4 +++- frameworks/projects/Basic/src/test/royale/build.xml | 4 +++- frameworks/projects/Binding/src/test/royale/build.xml | 4 +++- frameworks/projects/Collections/src/test/royale/build.xml | 4 +++- frameworks/projects/Core/src/test/royale/build.xml | 4 +++- frameworks/projects/MXRoyaleBase/src/test/royale/build.xml | 4 +++- frameworks/projects/Network/src/test/royale/build.xml | 4 +++- frameworks/projects/Reflection/src/test/royale/build.xml | 4 +++- frameworks/projects/RoyaleUnit/src/test/royale/build.xml | 4 +++- frameworks/projects/XML/src/test/royale/build.xml | 4 +++- 18 files changed, 54 insertions(+), 18 deletions(-) diff --git a/frameworks/js/projects/BasicJS/src/test/royale/build.xml b/frameworks/js/projects/BasicJS/src/test/royale/build.xml index 4868d090d9..ac88463c7e 100644 --- a/frameworks/js/projects/BasicJS/src/test/royale/build.xml +++ b/frameworks/js/projects/BasicJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -195,7 +197,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/BindingJS/src/test/royale/build.xml b/frameworks/js/projects/BindingJS/src/test/royale/build.xml index 366d165370..8af13a6689 100644 --- a/frameworks/js/projects/BindingJS/src/test/royale/build.xml +++ b/frameworks/js/projects/BindingJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -203,7 +205,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml b/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml index b9ad0e99b8..a3aff51fc6 100644 --- a/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml +++ b/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -195,7 +197,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/CoreJS/src/test/royale/build.xml b/frameworks/js/projects/CoreJS/src/test/royale/build.xml index 41fe2cba14..ab08c2bef7 100644 --- a/frameworks/js/projects/CoreJS/src/test/royale/build.xml +++ b/frameworks/js/projects/CoreJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -195,7 +197,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/MXRoyaleBaseJS/src/test/royale/build.xml b/frameworks/js/projects/MXRoyaleBaseJS/src/test/royale/build.xml index 48687e2f95..319a6db33d 100644 --- a/frameworks/js/projects/MXRoyaleBaseJS/src/test/royale/build.xml +++ b/frameworks/js/projects/MXRoyaleBaseJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -198,7 +200,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/NetworkJS/src/test/royale/build.xml b/frameworks/js/projects/NetworkJS/src/test/royale/build.xml index 183e5ca471..5bea5f9404 100644 --- a/frameworks/js/projects/NetworkJS/src/test/royale/build.xml +++ b/frameworks/js/projects/NetworkJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -195,7 +197,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml b/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml index c6c2c6d246..14b4183cfd 100644 --- a/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml +++ b/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -195,7 +197,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml b/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml index 25191abf8f..eedbc32937 100644 --- a/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml +++ b/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml @@ -115,6 +115,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -200,7 +202,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/js/projects/XMLJS/src/test/royale/build.xml b/frameworks/js/projects/XMLJS/src/test/royale/build.xml index b13c30db7f..4fec7ae2f0 100644 --- a/frameworks/js/projects/XMLJS/src/test/royale/build.xml +++ b/frameworks/js/projects/XMLJS/src/test/royale/build.xml @@ -110,6 +110,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -195,7 +197,7 @@ <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit diff --git a/frameworks/projects/Basic/src/test/royale/build.xml b/frameworks/projects/Basic/src/test/royale/build.xml index a8882c6a9b..ba61860559 100644 --- a/frameworks/projects/Basic/src/test/royale/build.xml +++ b/frameworks/projects/Basic/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -88,7 +90,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit swf="${basedir}/FlexUnitRoyaleApplication.swf" diff --git a/frameworks/projects/Binding/src/test/royale/build.xml b/frameworks/projects/Binding/src/test/royale/build.xml index e39232de32..fcbeb2b1bc 100644 --- a/frameworks/projects/Binding/src/test/royale/build.xml +++ b/frameworks/projects/Binding/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -93,7 +95,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit swf="${basedir}/FlexUnitRoyaleApplication.swf" diff --git a/frameworks/projects/Collections/src/test/royale/build.xml b/frameworks/projects/Collections/src/test/royale/build.xml index cd3af9aad1..8e53ca16cf 100644 --- a/frameworks/projects/Collections/src/test/royale/build.xml +++ b/frameworks/projects/Collections/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -93,7 +95,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit swf="${basedir}/FlexUnitRoyaleApplication.swf" diff --git a/frameworks/projects/Core/src/test/royale/build.xml b/frameworks/projects/Core/src/test/royale/build.xml index fdca4083a0..e52be0955f 100644 --- a/frameworks/projects/Core/src/test/royale/build.xml +++ b/frameworks/projects/Core/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -93,7 +95,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit swf="${basedir}/FlexUnitRoyaleApplication.swf" diff --git a/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml b/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml index cc1bac1ec1..f8fc2b8485 100644 --- a/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml +++ b/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -97,7 +99,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <!-- Use the env var if it is set, otherwise default to 'system' flash debugger --> <condition property="command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> diff --git a/frameworks/projects/Network/src/test/royale/build.xml b/frameworks/projects/Network/src/test/royale/build.xml index 4c5d627ca8..881f9cb289 100644 --- a/frameworks/projects/Network/src/test/royale/build.xml +++ b/frameworks/projects/Network/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -93,7 +95,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit swf="${basedir}/FlexUnitRoyaleApplication.swf" diff --git a/frameworks/projects/Reflection/src/test/royale/build.xml b/frameworks/projects/Reflection/src/test/royale/build.xml index 1c5bff89fb..25e9f6fed3 100644 --- a/frameworks/projects/Reflection/src/test/royale/build.xml +++ b/frameworks/projects/Reflection/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -93,7 +95,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit swf="${basedir}/FlexUnitRoyaleApplication.swf" diff --git a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml index 20c14d0ae3..0549cf8c22 100644 --- a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml +++ b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -93,7 +95,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <royaleunit swf="${basedir}/FlexUnitRoyaleApplication.swf" diff --git a/frameworks/projects/XML/src/test/royale/build.xml b/frameworks/projects/XML/src/test/royale/build.xml index 0d88f9c6d0..4eb47030ad 100644 --- a/frameworks/projects/XML/src/test/royale/build.xml +++ b/frameworks/projects/XML/src/test/royale/build.xml @@ -50,6 +50,8 @@ <path id="lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/> + </path> + <path id="royaleunit.lib.path"> <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="royaleUnitTasks.jar"/> </path> @@ -93,7 +95,7 @@ <target name="test"> <!-- Load the <royaleunit> task. We can't do this at the <project> level --> <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> - <taskdef resource="royaleUnitTasks.tasks" classpathref="lib.path"/> + <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> <!-- Use the env var if it is set, otherwise default to 'system' flash debugger --> <condition property="command" value="${env.FLASHPLAYER_DEBUGGER}" else="">