--- jsr166/build.xml	2015/09/13 02:09:35	1.178
+++ jsr166/build.xml	2015/09/13 05:26:02	1.181
@@ -95,12 +95,13 @@
     <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
     <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
     <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
-    <available property="jdk@{v}.have.java.base"
+    <local name="have.java.base"/>
+    <available property="have.java.base"
       file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
     <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
-      if:set="jdk@{v}.have.java.base"/>
+      if:set="have.java.base"/>
     <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
-      unless:set="jdk@{v}.have.java.base"/>
+      unless:set="have.java.base"/>
     <local name="boot.jar.dir"/>
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
     <path id="bootclasspath@{v}">
@@ -366,8 +367,8 @@
     <jar destfile="${product.jar}">
       <fileset dir="${build.classes.dir}"/>
       <manifest>
-      <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
   </target>
@@ -428,8 +429,8 @@
       <exclude name="**/SyntaxTest.java"/>
       <exclude name="**/SuperfluousAbstract.java"/>
       <manifest>
-      <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
   </target>
@@ -529,6 +530,11 @@
 
 
   <target name="configure-compiler">
+    <fail message="ant version too old">
+      <condition>
+	<not> <antversion atleast="1.9.1"/> </not>
+      </condition>
+    </fail>
 
     <property name="unchecked.option" value="-Xlint:unchecked"/>
 
@@ -669,8 +675,8 @@
     <jar destfile="${4jdk7product.jar}">
       <fileset dir="${build.4jdk7.classes.dir}"/>
       <manifest>
-      <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
 
@@ -833,8 +839,8 @@
     <jar destfile="${jsr166x.jar}">
       <fileset dir="${build.jsr166x.classes.dir}"/>
       <manifest>
-      <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
 
@@ -924,8 +930,8 @@
     <jar destfile="${jsr166y.jar}" index="true">
       <fileset dir="${build.jsr166y.classes.dir}"/>
       <manifest>
-      <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
 
@@ -1016,8 +1022,8 @@
     <jar destfile="${extra166y.jar}" index="true">
       <fileset dir="${build.extra166y.classes.dir}"/>
       <manifest>
-      <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
 
@@ -1135,8 +1141,8 @@
     <jar destfile="${jsr166e.jar}" index="true">
       <fileset dir="${build.jsr166e.classes.dir}"/>
       <manifest>
-      <attribute name="Built-By" value="${user.name}"/>
-      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>