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.92 by jsr166, Mon Jan 14 07:08:06 2013 UTC vs.
Revision 1.94 by jsr166, Mon Jan 14 18:50:46 2013 UTC

# Line 58 | Line 58
58  
59    <!-- JDK binary locations -->
60    <property name="jdks.home"  location="${user.home}/jdk"/>
61 <  <property name="jdk6.home"  location="${jdks.home}/jdk1.6.0"/>
62 <  <property name="jdk7.home"  location="${jdks.home}/jdk1.7.0"/>
63 <  <property name="jdk8.home"  location="${jdks.home}/jdk1.8.0"/>
64 <  <property name="javac6"     location="${jdk6.home}/bin/javac"/>
65 <  <property name="javac7"     location="${jdk7.home}/bin/javac"/>
66 <  <property name="javac8"     location="${jdk8.home}/bin/javac"/>
67 <  <property name="javadoc6"   location="${jdk6.home}/bin/javadoc"/>
68 <  <property name="javadoc7"   location="${jdk7.home}/bin/javadoc"/>
69 <  <property name="javadoc8"   location="${jdk8.home}/bin/javadoc"/>
70 <  <property name="bootdir6"   location="${jdk6.home}/jre/lib"/>
71 <  <property name="bootdir7"   location="${jdk7.home}/jre/lib"/>
72 <  <property name="bootdir8"   location="${jdk8.home}/jre/lib"/>
73 <  <property name="bootclasspath6"   value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/>
74 <  <property name="bootclasspath7"   value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/>
75 <  <property name="bootclasspath8"   value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/>
61 >
62 >  <macrodef name="defjdklocations">
63 >    <attribute name="v"/>
64 >    <sequential>
65 >    <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
66 >    <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
67 >    <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
68 >    <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
69 >    <property name="bootclasspath@{v}"  
70 >     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
71 >    </sequential>
72 >  </macrodef>
73 >
74 >  <defjdklocations v="6"/>
75 >  <defjdklocations v="7"/>
76 >  <defjdklocations v="8"/>
77  
78    <!-- Source locations -->
79    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 938 | Line 939
939  
940  
941    <target name="jsr166ecompile"
942 <          depends="init, configure-compiler"
942 >          depends="configure-compiler"
943            description="Compiles jsr166e sources">
944  
945      <mkdir dir="${build.jsr166e.dir}"/>
946  
947      <javac srcdir="${jsr166esrc.dir}"
948 <          destdir="${build.jsr166e.dir}"
949 <            debug="${build.debug}"
950 <       debuglevel="${build.debuglevel}"
951 <      deprecation="${build.deprecation}"
948 >           destdir="${build.jsr166e.dir}"
949 >           debug="${build.debug}"
950 >           debuglevel="${build.debuglevel}"
951 >           deprecation="${build.deprecation}"
952             source="1.7"
953 <             fork="true">
953 >           classpath=""
954 >           includeAntRuntime="false"
955 >           includeJavaRuntime="false"
956 >           executable="${javac7}"
957 >           fork="true">
958  
959        <include name="**/*.java"/>
960        <compilerarg line="${build.args}"/>
961        <compilerarg value="-XDignore.symbol.file=true"/>
962 <      <compilerarg value="${bootclasspath.args}"/>
958 <
959 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
962 >      <compilerarg value="-Xlint:all"/>
963  
964      </javac>
965  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines