--- jsr166/build.xml	2015/09/08 16:54:43	1.176
+++ jsr166/build.xml	2015/09/13 02:09:35	1.178
@@ -1,4 +1,5 @@
-<project name="jsr166" default="usage">
+<project name="jsr166" default="usage"
+  xmlns:if="ant:if" xmlns:unless="ant:unless">
 
   <description>
 ------------------------------------------------------------------------------
@@ -38,6 +39,7 @@
     </java>
   </target>
 
+  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
 
   <!-- User-specific settings -->
   <property file="user.properties"/>
@@ -93,7 +95,12 @@
     <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"/>
-    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
+    <available property="jdk@{v}.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"/>
+    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
+      unless:set="jdk@{v}.have.java.base"/>
     <local name="boot.jar.dir"/>
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
     <path id="bootclasspath@{v}">
@@ -358,6 +365,10 @@
 
     <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."/>
+      </manifest>
     </jar>
   </target>
 
@@ -416,6 +427,10 @@
       <exclude name="src/emulation/**"/>
       <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."/>
+      </manifest>
     </jar>
   </target>
 
@@ -653,6 +668,10 @@
 
     <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."/>
+      </manifest>
     </jar>
 
   </target>
@@ -813,6 +832,10 @@
 
     <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."/>
+      </manifest>
     </jar>
 
   </target>
@@ -900,6 +923,10 @@
 
     <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."/>
+      </manifest>
     </jar>
 
   </target>
@@ -988,6 +1015,10 @@
 
     <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."/>
+      </manifest>
     </jar>
 
   </target>
@@ -1103,6 +1134,10 @@
 
     <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."/>
+      </manifest>
     </jar>
 
   </target>