ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.178 by jsr166, Sun Sep 13 02:09:35 2015 UTC vs.
Revision 1.181 by jsr166, Sun Sep 13 05:26:02 2015 UTC

# Line 95 | Line 95
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98 <    <available property="jdk@{v}.have.java.base"
98 >    <local name="have.java.base"/>
99 >    <available property="have.java.base"
100        file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
101      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
102 <      if:set="jdk@{v}.have.java.base"/>
102 >      if:set="have.java.base"/>
103      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
104 <      unless:set="jdk@{v}.have.java.base"/>
104 >      unless:set="have.java.base"/>
105      <local name="boot.jar.dir"/>
106      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
107      <path id="bootclasspath@{v}">
# Line 366 | Line 367
367      <jar destfile="${product.jar}">
368        <fileset dir="${build.classes.dir}"/>
369        <manifest>
370 <      <attribute name="Built-By" value="${user.name}"/>
371 <      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
370 >        <attribute name="Built-By" value="${user.name}"/>
371 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
372        </manifest>
373      </jar>
374    </target>
# Line 428 | Line 429
429        <exclude name="**/SyntaxTest.java"/>
430        <exclude name="**/SuperfluousAbstract.java"/>
431        <manifest>
432 <      <attribute name="Built-By" value="${user.name}"/>
433 <      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
432 >        <attribute name="Built-By" value="${user.name}"/>
433 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
434        </manifest>
435      </jar>
436    </target>
# Line 529 | Line 530
530  
531  
532    <target name="configure-compiler">
533 +    <fail message="ant version too old">
534 +      <condition>
535 +        <not> <antversion atleast="1.9.1"/> </not>
536 +      </condition>
537 +    </fail>
538  
539      <property name="unchecked.option" value="-Xlint:unchecked"/>
540  
# Line 669 | Line 675
675      <jar destfile="${4jdk7product.jar}">
676        <fileset dir="${build.4jdk7.classes.dir}"/>
677        <manifest>
678 <      <attribute name="Built-By" value="${user.name}"/>
679 <      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
678 >        <attribute name="Built-By" value="${user.name}"/>
679 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
680        </manifest>
681      </jar>
682  
# Line 833 | Line 839
839      <jar destfile="${jsr166x.jar}">
840        <fileset dir="${build.jsr166x.classes.dir}"/>
841        <manifest>
842 <      <attribute name="Built-By" value="${user.name}"/>
843 <      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
842 >        <attribute name="Built-By" value="${user.name}"/>
843 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
844        </manifest>
845      </jar>
846  
# Line 924 | Line 930
930      <jar destfile="${jsr166y.jar}" index="true">
931        <fileset dir="${build.jsr166y.classes.dir}"/>
932        <manifest>
933 <      <attribute name="Built-By" value="${user.name}"/>
934 <      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
933 >        <attribute name="Built-By" value="${user.name}"/>
934 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
935        </manifest>
936      </jar>
937  
# Line 1016 | Line 1022
1022      <jar destfile="${extra166y.jar}" index="true">
1023        <fileset dir="${build.extra166y.classes.dir}"/>
1024        <manifest>
1025 <      <attribute name="Built-By" value="${user.name}"/>
1026 <      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1025 >        <attribute name="Built-By" value="${user.name}"/>
1026 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1027        </manifest>
1028      </jar>
1029  
# Line 1135 | Line 1141
1141      <jar destfile="${jsr166e.jar}" index="true">
1142        <fileset dir="${build.jsr166e.classes.dir}"/>
1143        <manifest>
1144 <      <attribute name="Built-By" value="${user.name}"/>
1145 <      <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1144 >        <attribute name="Built-By" value="${user.name}"/>
1145 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1146        </manifest>
1147      </jar>
1148  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines