/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.111 by jsr166, Sun Jan 20 03:34:23 2013 UTC revision 1.114 by jsr166, Sun Jan 20 04:44:26 2013 UTC
# Line 35  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 49  Line 49 
49    
50    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54    
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
# Line 57  Line 57 
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <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 -->    <!-- JDK binary locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
67    
# Line 324  Line 329 
329        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
330        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
331    
       <classpath refid="test.classpath"/>  
   
332      </javac>      </javac>
333    
334      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
# Line 334  Line 337 
337             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
338             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
339             source="6"             source="6"
340             classpath="${junit.jar}"             classpath=""
341             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="${product.jar}:${bootclasspath6}"
342             includeAntRuntime="false"             includeAntRuntime="false"
343             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 347  Line 350 
350        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
351        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
352    
       <classpath refid="test.classpath"/>  
   
353      </javac>      </javac>
354    
355  <!--  <!--
# Line 364  Line 365 
365        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
366        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
367    
       <classpath refid="test.classpath"/>  
   
368      </javac>      </javac>
369  -->  -->
370    
# Line 668  Line 667 
667            depends="configure-compiler"            depends="configure-compiler"
668            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
669    
670      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
671    
672      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
673             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
674             debug="${build.debug}"             debug="${build.debug}"
675             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
676             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 699  Line 698 
698            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
699    
700      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
701        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
702      </jar>      </jar>
703    
704    </target>    </target>
# Line 759  Line 758 
758            depends="configure-compiler"            depends="configure-compiler"
759            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
760    
761      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
762    
763      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
764             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
765             debug="${build.debug}"             debug="${build.debug}"
766             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
767             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 787  Line 786 
786            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
787    
788      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
789        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
790      </jar>      </jar>
791    
792    </target>    </target>
# Line 847  Line 846 
846            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
847            description="Compiles extra166y sources">            description="Compiles extra166y sources">
848    
849      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
850    
851      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
852             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
853             debug="${build.debug}"             debug="${build.debug}"
854             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
855             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 878  Line 877 
877            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
878    
879      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
880        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
881      </jar>      </jar>
882    
883    </target>    </target>
# Line 936  Line 935 
935            depends="configure-compiler"            depends="configure-compiler"
936            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
937    
938      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
939    
940      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
941             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
942             debug="${build.debug}"             debug="${build.debug}"
943             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
944             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 966  Line 965 
965            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
966    
967      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
968        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
969      </jar>      </jar>
970    
971    </target>    </target>

Legend:
Removed from v.1.111  
changed lines
  Added in v.1.114

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27