royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] branch feature/rename updated: available seems to overwrite properties
Date Sat, 14 Oct 2017 06:35:46 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/feature/rename by this push:
     new ef874d3  available seems to overwrite properties
ef874d3 is described below

commit ef874d39f8196c2732ff0eba0ffd358f4cf7bb81
Author: Alex Harui <aharui@apache.org>
AuthorDate: Fri Oct 13 23:35:35 2017 -0700

    available seems to overwrite properties
---
 build.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 9d35d74..beb9085 100644
--- a/build.xml
+++ b/build.xml
@@ -42,15 +42,23 @@
         property="ROYALE_TYPEDEFS_HOME"
         value="${env.ROYALE_TYPEDEFS_HOME}" />
         
-        <available file="${basedir}/../royale-typedefs"
-        type="dir"
-        property="ROYALE_TYPEDEFS_HOME"
-        value="${basedir}/../royale-typedefs" />
+        <condition property="ROYALE_TYPEDEFS_HOME" value="${basedir}/../royale-typedefs"
>
+            <and>
+                <available file="${basedir}/../royale-typedefs" type="dir" />
+                <not>
+                    <isset property="ROYALE_TYPEDEFS_HOME" />
+                </not>
+            </and>
+        </condition>
         
-        <available file="${basedir}/royale-typedefs"
-        type="dir"
-        property="ROYALE_TYPEDEFS_HOME"
-        value="${basedir}/royale-typedefs" />
+        <condition property="ROYALE_TYPEDEFS_HOME" value="${basedir}/royale-typedefs"
>
+            <and>
+                <available file="${basedir}/royale-typedefs" type="dir" />
+                <not>
+                    <isset property="ROYALE_TYPEDEFS_HOME" />
+                </not>
+            </and>
+        </condition>
         
         <fail message="The environment variable ROYALE_TYPEDEFS_HOME is not set to a directory"
         unless="ROYALE_TYPEDEFS_HOME"/>

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <commits@royale.apache.org>'].

Mime
View raw message