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/flex-flexunit.git
commit b78064ee3931ebe5dae52a6e9592122b2d5480ec
Author: Josh Tynjala <joshtynj...@bowlerhat.dev>
AuthorDate: Mon Mar 4 14:47:38 2024 -0800
FlexUnit4SampleCIProject: this detection of FLEX_HOME shouldn't have changed
---
FlexUnit4SampleCIProject/build.air.xml | 9 +--------
FlexUnit4SampleCIProject/build.browser.xml | 9 +--------
FlexUnit4SampleCIProject/build.custom.xml | 9 +--------
FlexUnit4SampleCIProject/build.xml | 9 +--------
4 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/FlexUnit4SampleCIProject/build.air.xml
b/FlexUnit4SampleCIProject/build.air.xml
index abcb073..f957f0a 100644
--- a/FlexUnit4SampleCIProject/build.air.xml
+++ b/FlexUnit4SampleCIProject/build.air.xml
@@ -39,14 +39,7 @@
<!-- Setup Flex and FlexUnit ant tasks -->
<!-- You can set this directly so mxmlc will work correctly, or set
FLEX_HOME as an environment variable and use as below -->
- <available file="${env.FLEX_HOME}/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${env.FLEX_HOME}"/>
- <available file="${basedir}/../../flex-sdk/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${basedir}/../../flex-sdk"/>
+ <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
<taskdef resource="flexTasks.tasks"
classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef resource="flexUnitTasks.tasks">
<classpath>
diff --git a/FlexUnit4SampleCIProject/build.browser.xml
b/FlexUnit4SampleCIProject/build.browser.xml
index cdb517d..75e8199 100644
--- a/FlexUnit4SampleCIProject/build.browser.xml
+++ b/FlexUnit4SampleCIProject/build.browser.xml
@@ -39,14 +39,7 @@
<!-- Setup Flex and FlexUnit ant tasks -->
<!-- You can set this directly so mxmlc will work correctly, or set
FLEX_HOME as an environment variable and use as below -->
- <available file="${env.FLEX_HOME}/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${env.FLEX_HOME}"/>
- <available file="${basedir}/../../flex-sdk/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${basedir}/../../flex-sdk"/>
+ <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
<taskdef resource="flexTasks.tasks"
classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef resource="flexUnitTasks.tasks">
<classpath>
diff --git a/FlexUnit4SampleCIProject/build.custom.xml
b/FlexUnit4SampleCIProject/build.custom.xml
index bb90d5c..513cc37 100644
--- a/FlexUnit4SampleCIProject/build.custom.xml
+++ b/FlexUnit4SampleCIProject/build.custom.xml
@@ -39,14 +39,7 @@
<!-- Setup Flex and FlexUnit ant tasks -->
<!-- You can set this directly so mxmlc will work correctly, or set
FLEX_HOME as an environment variable and use as below -->
- <available file="${env.FLEX_HOME}/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${env.FLEX_HOME}"/>
- <available file="${basedir}/../../flex-sdk/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${basedir}/../../flex-sdk"/>
+ <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
<taskdef resource="flexTasks.tasks"
classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef resource="flexUnitTasks.tasks">
<classpath>
diff --git a/FlexUnit4SampleCIProject/build.xml
b/FlexUnit4SampleCIProject/build.xml
index 966b10f..fd293b7 100644
--- a/FlexUnit4SampleCIProject/build.xml
+++ b/FlexUnit4SampleCIProject/build.xml
@@ -39,14 +39,7 @@
<!-- Setup Flex and FlexUnit ant tasks -->
<!-- You can set this directly so mxmlc will work correctly, or set
FLEX_HOME as an environment variable and use as below -->
- <available file="${env.FLEX_HOME}/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${env.FLEX_HOME}"/>
- <available file="${basedir}/../../flex-sdk/lib/compc.jar"
- type="file"
- property="FLEX_HOME"
- value="${basedir}/../../flex-sdk"/>
+ <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
<taskdef resource="flexTasks.tasks" >
<classpath>
<pathelement
location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
