Fixed Mac OS build by not requiring tools.jar on Mac
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@177 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/common.ant.xml b/common.ant.xml
index d2a3797..154997d 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -39,8 +39,8 @@
<available file="${gwt.tools}" type="dir" property="gwt.tools.exists" />
<fail unless="gwt.tools.exists" message="Cannot find '${gwt.tools}' tools directory; perhaps you should define the GWT_TOOLS environment variable" />
- <!-- JUnit support -->
- <condition property="build.host.platform" value="linux">
+ <!-- Platform identification -->
+ <condition property="build.host.islinux">
<and>
<os family="unix" />
<not>
@@ -48,23 +48,33 @@
</not>
</and>
</condition>
+ <condition property="build.host.platform" value="linux">
+ <isset property="build.host.islinux" />
+ </condition>
- <condition property="build.host.platform" value="mac">
+ <condition property="build.host.ismac">
<and>
<os family="unix" />
<contains string="${os.name}" substring="mac" casesensitive="false" />
</and>
</condition>
+ <condition property="build.host.platform" value="mac">
+ <isset property="build.host.ismac" />
+ </condition>
- <condition property="build.host.platform" value="windows">
+ <condition property="build.host.iswindows">
<os family="windows" />
</condition>
+ <condition property="build.host.platform" value="windows">
+ <isset property="build.host.iswindows" />
+ </condition>
<fail unless="build.host.platform" message="Building on ${os.name} is not supported" />
<condition property="junit.platform.args" value="-XstartOnFirstThread" else="">
<equals arg1="${build.host.platform}" arg2="mac" casesensitive="false" />
</condition>
+ <!-- JUnit support -->
<property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-${build.host.platform}-${gwt.version}/gwt-dev-${build.host.platform}.jar" />
<property name="gwt.junit.port" value="8888" />
@@ -168,9 +178,15 @@
<attribute name="name" />
<attribute name="location" />
<attribute name="message" default="Cannot find dependency ${@{name}}" />
+ <attribute name="unless" default="__nonexistent_property__" />
<sequential>
<property name="@{name}" location="@{location}" />
- <available file="${@{name}}" property="@{name}.exists" />
+ <condition property="@{name}.exists">
+ <or>
+ <available file="${@{name}}" />
+ <isset property="@{unless}" />
+ </or>
+ </condition>
<fail unless="@{name}.exists" message="@{message}" />
</sequential>
</macrodef>
