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.113 by jsr166, Sun Jan 20 03:51:38 2013 UTC vs.
Revision 1.114 by jsr166, Sun Jan 20 04:44:26 2013 UTC

# Line 35 | Line 35
35  
36  
37    <!-- Compilation options -->
38 <  <property name="build.sourcelevel"    value="1.6"/>
38 >  <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>
# Line 57 | Line 57
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59  
60 +  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61 +  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62 +  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63 +  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64 +
65    <!-- JDK binary locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>
67  
# Line 662 | Line 667
667            depends="configure-compiler"
668            description="Compiles jsr166x sources to build dir">
669  
670 <    <mkdir dir="${build.jsr166x.dir}"/>
670 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
671  
672      <javac srcdir="${topsrc.dir}"
673 <           destdir="${build.jsr166x.dir}"
673 >           destdir="${build.jsr166x.classes.dir}"
674             debug="${build.debug}"
675             debuglevel="${build.debuglevel}"
676             deprecation="${build.deprecation}"
# Line 693 | Line 698
698            description="Builds library jar from compiled sources">
699  
700      <jar destfile="${jsr166x.jar}">
701 <      <fileset dir="${build.jsr166x.dir}"/>
701 >      <fileset dir="${build.jsr166x.classes.dir}"/>
702      </jar>
703  
704    </target>
# Line 753 | Line 758
758            depends="configure-compiler"
759            description="Compiles jsr166y sources">
760  
761 <    <mkdir dir="${build.jsr166y.dir}"/>
761 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
762  
763      <javac srcdir="${topsrc.dir}"
764 <           destdir="${build.jsr166y.dir}"
764 >           destdir="${build.jsr166y.classes.dir}"
765             debug="${build.debug}"
766             debuglevel="${build.debuglevel}"
767             deprecation="${build.deprecation}"
# Line 781 | Line 786
786            description="Builds library jar from compiled sources">
787  
788      <jar destfile="${jsr166y.jar}" index="true">
789 <      <fileset dir="${build.jsr166y.dir}"/>
789 >      <fileset dir="${build.jsr166y.classes.dir}"/>
790      </jar>
791  
792    </target>
# Line 841 | Line 846
846            depends="configure-compiler, jsr166yjar"
847            description="Compiles extra166y sources">
848  
849 <    <mkdir dir="${build.extra166y.dir}"/>
849 >    <mkdir dir="${build.extra166y.classes.dir}"/>
850  
851      <javac srcdir="${topsrc.dir}"
852 <           destdir="${build.extra166y.dir}"
852 >           destdir="${build.extra166y.classes.dir}"
853             debug="${build.debug}"
854             debuglevel="${build.debuglevel}"
855             deprecation="${build.deprecation}"
# Line 872 | Line 877
877            description="Builds library jar from compiled sources">
878  
879      <jar destfile="${extra166y.jar}" index="true">
880 <      <fileset dir="${build.extra166y.dir}"/>
880 >      <fileset dir="${build.extra166y.classes.dir}"/>
881      </jar>
882  
883    </target>
# Line 930 | Line 935
935            depends="configure-compiler"
936            description="Compiles jsr166e sources">
937  
938 <    <mkdir dir="${build.jsr166e.dir}"/>
938 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
939  
940      <javac srcdir="${topsrc.dir}"
941 <           destdir="${build.jsr166e.dir}"
941 >           destdir="${build.jsr166e.classes.dir}"
942             debug="${build.debug}"
943             debuglevel="${build.debuglevel}"
944             deprecation="${build.deprecation}"
# Line 960 | Line 965
965            description="Builds library jar from compiled sources">
966  
967      <jar destfile="${jsr166e.jar}" index="true">
968 <      <fileset dir="${build.jsr166e.dir}"/>
968 >      <fileset dir="${build.jsr166e.classes.dir}"/>
969      </jar>
970  
971    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines