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

Diff of /jsr166/build.xml

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

revision 1.91 by jsr166, Sun Nov 18 06:21:11 2012 UTC revision 1.92 by jsr166, Mon Jan 14 07:08:06 2013 UTC
# Line 34  Line 34 
34    <property name="build.lib.dir"               location="${build.dir}/lib"/>    <property name="build.lib.dir"               location="${build.dir}/lib"/>
35    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
37    
38      <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
39      <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
40      <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
41      <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
42    
43    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
44    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
45    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
# Line 50  Line 56 
56    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
57    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
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"/>
76    
77    <!-- Source locations -->    <!-- Source locations -->
78    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
79    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 59  Line 83 
83    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
84    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
85    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
86    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
87    <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
88    <property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
89    <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
90      <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
91    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
92    
93    <!-- Distribution locations -->    <!-- Distribution locations -->
94    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
95      <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
96    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
97    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
98    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
# Line 74  Line 100 
100    
101    <!-- Jar locations -->    <!-- Jar locations -->
102    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
103      <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
104    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
105    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
106    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
# Line 176  Line 203 
203               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdksrc.dir}"
204               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
205        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
206        <include name="**/*.java"/>          <include name="**/*.java"/>
207        </fileset>        </fileset>
208      </javadoc>      </javadoc>
209    
# Line 245  Line 272 
272               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdksrc.dir}"
273               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
274        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
275        <include name="**/*.java"/>          <include name="**/*.java"/>
276        </fileset>        </fileset>
277      </javadoc>      </javadoc>
278    
# Line 476  Line 503 
503    </target>    </target>
504    
505    
506      <!-- jdk7 -->
507    
508    
509      <target name="jdk7compile"
510              depends="configure-compiler"
511              description="Compiles src/jdk7 sources">
512    
513        <mkdir dir="${build.jdk7.classes.dir}"/>
514    
515        <javac srcdir="${jdk7src.dir}"
516               destdir="${build.jdk7.classes.dir}"
517               debug="${build.debug}"
518               debuglevel="${build.debuglevel}"
519               deprecation="${build.deprecation}"
520               source="1.6"
521               classpath=""
522               bootclasspath="${bootclasspath6}"
523               includeAntRuntime="false"
524               includeJavaRuntime="false"
525               executable="${javac6}"
526               fork="true">
527    
528          <include name="**/*.java"/>
529          <compilerarg line="${build.args}"/>
530          <compilerarg value="-XDignore.symbol.file=true"/>
531          <compilerarg value="-Xlint:all"/>
532    
533        </javac>
534    
535      </target>
536    
537    
538    
539      <target name="jdk7jar"
540              depends="jdk7compile"
541              description="Builds library jar from compiled sources">
542    
543        <mkdir dir="${build.jdk7.lib.dir}"/>
544    
545        <jar destfile="${jdk7product.jar}" index="true">
546          <fileset dir="${build.jdk7.classes.dir}"/>
547        </jar>
548    
549      </target>
550    
551    
552    
553      <target name="jdk7docs"
554              description="Builds javadocs with custom tags to build folder">
555    
556        <delete dir="${build.jdk7.docs.dir}"/>
557        <mkdir dir="${build.jdk7.docs.dir}"/>
558    
559        <javadoc destdir="${build.jdk7.docs.dir}"
560                 packagenames="none"
561                 link="${jdkapi7docs.url}"
562                 overview="${jdk7src.dir}/intro.html"
563                 sourcepath="${jdk7src.dir}"
564                 bootclasspath="${bootclasspath6}"
565                 classpath=""
566                 source="1.6"
567                 executable="${javadoc7}"
568                 additionalparam="-XDignore.symbol.file=true" >
569          <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
570            <include name="**/*.java"/>
571          </fileset>
572        </javadoc>
573    
574      </target>
575    
576    
577      <target name="jdk7dist"
578              depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
579              description="Puts all distributable products in single hierarchy"/>
580    
581    
582    
583      <target name="jdk7clean"
584              description="Removes all build products">
585    
586        <delete dir="${build.jdk7.dir}"/>
587    
588      </target>
589    
590    
591    
592      <target name="jdk7dist-clean"
593              description="Removes all build and distribution products">
594    
595      </target>
596    
597      <target name="jdk7dist-docs"
598              description="Builds javadocs without custom tags to dist folder">
599    
600        <delete dir="${dist.jdk7.docs.dir}"/>
601        <mkdir dir="${dist.jdk7.docs.dir}"/>
602    
603        <javadoc destdir="${dist.jdk7.docs.dir}"
604                 packagenames="none"
605                 link="${jdkapi7docs.url}"
606                 overview="${jdk7src.dir}/intro.html"
607                 sourcepath="${jdk7src.dir}"
608                 classpath=""
609                 executable="${javadoc7}"
610                 bootclasspath="${bootclasspath6}"
611                 source="1.6">
612          <arg value="-XDignore.symbol.file=true"/>
613          <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
614            <include name="**/*.java"/>
615          </fileset>
616        </javadoc>
617    
618      </target>
619    
620      <target name="jdk7dist-jar"
621              depends="jdk7clean, jdk7jar">
622    
623        <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
624    
625      </target>
626    
627    <!-- jsr166x -->    <!-- jsr166x -->
628    
629    
Legend:
Removed from v.1.91  
changed lines
  Added in v.1.92
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27