make/build.xml
Print this page
*** 110,120 ****
<target name="build-bootstrap-tools" depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah"/>
<target name="build-all-tools" depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap,build-apt"/>
! <target name="build-all-classes" depends="build-classes-javac,build-classes-javadoc,build-classes-doclets,build-classes-javah,build-classes-javap,build-classes-apt"/>
<!-- clean -->
<target name="clean" description="Delete all generated files">
<delete dir="${build.dir}"/>
--- 110,122 ----
<target name="build-bootstrap-tools" depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah"/>
<target name="build-all-tools" depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap,build-apt"/>
! <target name="build-all-classes" depends="build-bootstrap-javac">
! <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes} ${apt.includes}"/>
! </target>
<!-- clean -->
<target name="clean" description="Delete all generated files">
<delete dir="${build.dir}"/>
*** 186,205 ****
datafile="${build.coverage.dir}/cobertura.ser"/>
</target>
<!-- javac targets -->
! <target name="build-bootstrap-javac" depends="-def-build-bootstrap-tool">
! <build-bootstrap-tool name="javac" includes="${javac.includes}"/>
</target>
<target name="build-classes-javac" depends="build-bootstrap-javac">
! <build-classes name="javac" includes="${javac.includes}"/>
</target>
! <target name="build-javac" depends="build-bootstrap-javac">
! <build-tool name="javac" includes="${javac.includes}"/>
</target>
<target name="javadoc-javac" depends="build-javac,-def-javadoc-tool">
<javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls3.option}"/>
</target>
--- 188,211 ----
datafile="${build.coverage.dir}/cobertura.ser"/>
</target>
<!-- javac targets -->
! <target name="build-bootstrap-javac"
! depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
! <build-bootstrap-classes includes="${javac.includes}"/>
! <build-bootstrap-jar name="javac" includes="${javac.includes}"/>
! <build-bootstrap-tool name="javac"/>
</target>
<target name="build-classes-javac" depends="build-bootstrap-javac">
! <build-classes includes="${javac.includes}"/>
</target>
! <target name="build-javac" depends="build-classes-javac">
! <build-jar name="javac" includes="${javac.includes}"/>
! <build-tool name="javac"/>
</target>
<target name="javadoc-javac" depends="build-javac,-def-javadoc-tool">
<javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls3.option}"/>
</target>
*** 215,237 ****
<target name="javac" depends="build-javac,jtreg-javac,findbugs-javac"/>
<!-- javadoc targets -->
<target name="build-bootstrap-javadoc" depends="build-bootstrap-javac">
! <build-bootstrap-tool name="javadoc"
! includes="${javadoc.includes}"
jarclasspath="javac.jar doclets.jar"/>
</target>
<target name="build-classes-javadoc" depends="build-classes-javac">
! <build-classes name="javadoc" includes="${javadoc.includes}"/>
</target>
! <target name="build-javadoc" depends="build-javac">
! <build-tool name="javadoc"
! includes="${javadoc.includes}"
jarclasspath="javac.jar doclets.jar"/>
</target>
<target name="javadoc-javadoc" depends="build-javadoc,-def-javadoc-tool">
<javadoc-tool name="javadoc" includes="${javadoc.includes}"/>
</target>
--- 221,244 ----
<target name="javac" depends="build-javac,jtreg-javac,findbugs-javac"/>
<!-- javadoc targets -->
<target name="build-bootstrap-javadoc" depends="build-bootstrap-javac">
! <build-bootstrap-classes includes="${javadoc.includes}"/>
! <build-bootstrap-jar name="javadoc" includes="${javadoc.includes}"
jarclasspath="javac.jar doclets.jar"/>
+ <build-bootstrap-tool name="javadoc"/>
</target>
<target name="build-classes-javadoc" depends="build-classes-javac">
! <build-classes includes="${javadoc.includes}"/>
</target>
! <target name="build-javadoc" depends="build-javac,build-classes-javadoc">
! <build-jar name="javadoc" includes="${javadoc.includes}"
jarclasspath="javac.jar doclets.jar"/>
+ <build-tool name="javadoc"/>
</target>
<target name="javadoc-javadoc" depends="build-javadoc,-def-javadoc-tool">
<javadoc-tool name="javadoc" includes="${javadoc.includes}"/>
</target>
*** 247,271 ****
<target name="javadoc" depends="build-javadoc,jtreg-javadoc,findbugs-javadoc"/>
<!-- doclets targets -->
<target name="build-bootstrap-doclets" depends="build-bootstrap-javadoc,-def-build-bootstrap-jar">
! <build-bootstrap-jar name="doclets"
! includes="${doclets.includes}"
jarmainclass="com.sun.tools.javadoc.Main"
jarclasspath="javadoc.jar"/>
</target>
<target name="build-classes-doclets" depends="build-classes-javadoc">
! <build-classes name="doclets" includes="${doclets.includes}"/>
</target>
! <target name="build-doclets" depends="build-javadoc">
<!-- just jar, no bin for doclets -->
! <build-jar name="doclets"
! includes="${doclets.includes}"
! jarclasspath="javadoc.jar"/>
</target>
<!-- (no javadoc for doclets) -->
<target name="jtreg-doclets" depends="build-doclets,-def-jtreg">
--- 254,276 ----
<target name="javadoc" depends="build-javadoc,jtreg-javadoc,findbugs-javadoc"/>
<!-- doclets targets -->
<target name="build-bootstrap-doclets" depends="build-bootstrap-javadoc,-def-build-bootstrap-jar">
! <build-bootstrap-classes includes="${doclets.includes}"/>
! <build-bootstrap-jar name="doclets" includes="${doclets.includes}"
jarmainclass="com.sun.tools.javadoc.Main"
jarclasspath="javadoc.jar"/>
</target>
<target name="build-classes-doclets" depends="build-classes-javadoc">
! <build-classes includes="${doclets.includes}"/>
</target>
! <target name="build-doclets" depends="build-javadoc,build-classes-doclets">
<!-- just jar, no bin for doclets -->
! <build-jar name="doclets" includes="${doclets.includes}" jarclasspath="javadoc.jar"/>
</target>
<!-- (no javadoc for doclets) -->
<target name="jtreg-doclets" depends="build-doclets,-def-jtreg">
*** 279,301 ****
<target name="doclets" depends="build-doclets,jtreg-doclets,findbugs-doclets"/>
<!-- javah targets -->
<target name="build-bootstrap-javah" depends="build-bootstrap-javadoc">
! <build-bootstrap-tool name="javah"
! includes="${javah.includes}"
jarclasspath="javadoc.jar doclets.jar javac.jar"/>
</target>
! <target name="build-javah" depends="build-javac">
! <build-tool name="javah"
! includes="${javah.includes}"
! jarclasspath="javac.jar"/>
</target>
<target name="build-classes-javah" depends="build-classes-javadoc">
! <build-classes name="javah" includes="${javah.includes}"/>
</target>
<!-- (no javadoc for javah) -->
<target name="jtreg-javah" depends="build-javah,-def-jtreg">
--- 284,306 ----
<target name="doclets" depends="build-doclets,jtreg-doclets,findbugs-doclets"/>
<!-- javah targets -->
<target name="build-bootstrap-javah" depends="build-bootstrap-javadoc">
! <build-bootstrap-classes includes="${javah.includes}"/>
! <build-bootstrap-jar name="javah" includes="${javah.includes}"
jarclasspath="javadoc.jar doclets.jar javac.jar"/>
+ <build-bootstrap-tool name="javah"/>
</target>
! <target name="build-javah" depends="build-javac,build-classes-javah">
! <build-jar name="javah" includes="${javah.includes}" jarclasspath="javac.jar"/>
! <build-tool name="javah"/>
</target>
<target name="build-classes-javah" depends="build-classes-javadoc">
! <build-classes includes="${javah.includes}"/>
</target>
<!-- (no javadoc for javah) -->
<target name="jtreg-javah" depends="build-javah,-def-jtreg">
*** 308,332 ****
<target name="javah" depends="build-javah,jtreg-javah,findbugs-javah"/>
<!-- javap targets -->
! <target name="build-bootstrap-javap" depends="-def-build-bootstrap-tool">
! <build-bootstrap-tool name="javap"
! includes="${javap.includes}"
jarmainclass="sun.tools.javap.Main"/>
</target>
<target name="build-classes-javap" depends="build-classes-javac">
! <build-classes name="javap" includes="${javap.includes}"/>
</target>
! <target name="build-javap" depends="build-javac">
! <build-tool name="javap"
! includes="${javap.includes}"
jarmainclass="com.sun.tools.javap.Main"
jarclasspath="javac.jar"/>
</target>
<!-- (no javadoc for javap) -->
<target name="jtreg-javap" depends="build-javap,-def-jtreg">
--- 313,339 ----
<target name="javah" depends="build-javah,jtreg-javah,findbugs-javah"/>
<!-- javap targets -->
! <target name="build-bootstrap-javap"
! depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
! <build-bootstrap-classes includes="${javap.includes}"/>
! <build-bootstrap-jar name="javap" includes="${javap.includes}"
jarmainclass="sun.tools.javap.Main"/>
+ <build-bootstrap-tool name="javap"/>
</target>
<target name="build-classes-javap" depends="build-classes-javac">
! <build-classes includes="${javap.includes}"/>
</target>
! <target name="build-javap" depends="build-javac,build-classes-javap">
! <build-jar includes="${javap.includes}"
jarmainclass="com.sun.tools.javap.Main"
jarclasspath="javac.jar"/>
+ <build-tool name="javap"/>
</target>
<!-- (no javadoc for javap) -->
<target name="jtreg-javap" depends="build-javap,-def-jtreg">
*** 340,362 ****
<target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/>
<!-- apt targets -->
<target name="build-bootstrap-apt" depends="build-bootstrap-javac">
! <build-bootstrap-tool name="apt"
! includes="${apt.includes}"
jarclasspath="javac.jar"/>
</target>
! <target name="build-apt" depends="build-javac">
! <build-tool name="apt"
! includes="${apt.includes}"
! jarclasspath="javac.jar"/>
</target>
<target name="build-classes-apt" depends="build-classes-javac">
! <build-classes name="apt" includes="${apt.includes}"/>
</target>
<target name="javadoc-apt" depends="build-apt,-def-javadoc-tool">
<javadoc-tool name="apt" includes="${apt.includes}"/>
</target>
--- 347,369 ----
<target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/>
<!-- apt targets -->
<target name="build-bootstrap-apt" depends="build-bootstrap-javac">
! <build-bootstrap-classes includes="${apt.includes}"/>
! <build-bootstrap-jar name="apt" includes="${apt.includes}"
jarclasspath="javac.jar"/>
+ <build-bootstrap-tool name="apt"/>
</target>
! <target name="build-apt" depends="build-javac,build-classes-apt">
! <build-jar name="apt" includes="${apt.includes}" jarclasspath="javac.jar"/>
! <build-tool name="apt"/>
</target>
<target name="build-classes-apt" depends="build-classes-javac">
! <build-classes includes="${apt.includes}"/>
</target>
<target name="javadoc-apt" depends="build-apt,-def-javadoc-tool">
<javadoc-tool name="apt" includes="${apt.includes}"/>
</target>
*** 394,437 ****
<check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
</target>
<!-- Ant macro and preset defs -->
! <target name="-def-build-tool" depends="-def-build-jar">
<macrodef name="build-tool">
<attribute name="name"/>
- <attribute name="includes"/>
- <attribute name="excludes" default="**/package-info.java"/>
<attribute name="bin.dir" default="${dist.bin.dir}"/>
- <attribute name="classes.dir" default="${build.classes.dir}"/>
- <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
- <attribute name="lib.dir" default="${dist.lib.dir}"/>
<attribute name="java" default="${launcher.java}"/>
- <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/>
- <attribute name="javac.java.home" default="${boot.java.home}"/>
- <attribute name="javac.source" default="${javac.source}"/>
- <attribute name="javac.target" default="${javac.target}"/>
- <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/>
- <attribute name="jarclasspath" default=""/>
- <attribute name="release" default="${release}"/>
- <attribute name="full.version" default="${full.version}"/>
<sequential>
- <build-jar
- name="@{name}"
- gensrc.dir="@{gensrc.dir}"
- classes.dir="@{classes.dir}"
- lib.dir="@{lib.dir}"
- includes="@{includes}"
- excludes="@{excludes}"
- jarmainclass="@{jarmainclass}"
- jarclasspath="@{jarclasspath}"
- release="@{release}"
- full.version="@{full.version}"
- javac.bootclasspath="@{javac.bootclasspath}"
- javac.source="@{javac.source}"
- javac.target="@{javac.target}"
- />
<mkdir dir="@{bin.dir}"/>
<copy file="${src.bin.dir}/launcher.sh-template" tofile="@{bin.dir}/@{name}">
<filterset begintoken="#" endtoken="#">
<filter token="PROGRAM" value="@{name}"/>
<filter token="TARGET_JAVA" value="@{java}"/>
--- 401,416 ----
<check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
</target>
<!-- Ant macro and preset defs -->
! <target name="-def-build-tool">
<macrodef name="build-tool">
<attribute name="name"/>
<attribute name="bin.dir" default="${dist.bin.dir}"/>
<attribute name="java" default="${launcher.java}"/>
<sequential>
<mkdir dir="@{bin.dir}"/>
<copy file="${src.bin.dir}/launcher.sh-template" tofile="@{bin.dir}/@{name}">
<filterset begintoken="#" endtoken="#">
<filter token="PROGRAM" value="@{name}"/>
<filter token="TARGET_JAVA" value="@{java}"/>
*** 440,478 ****
<chmod file="@{bin.dir}/@{name}" perm="ugo+rx"/>
</sequential>
</macrodef>
</target>
! <target name="-def-build-jar" depends="-def-build-classes">
<macrodef name="build-jar">
<attribute name="name"/>
<attribute name="includes"/>
- <attribute name="excludes" default="**/package-info.java"/>
<attribute name="classes.dir" default="${build.classes.dir}"/>
- <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
<attribute name="lib.dir" default="${dist.lib.dir}"/>
- <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/>
- <attribute name="javac.java.home" default="${boot.java.home}"/>
- <attribute name="javac.source" default="${javac.source}"/>
- <attribute name="javac.target" default="${javac.target}"/>
<attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/>
<attribute name="jarclasspath" default=""/>
- <attribute name="release" default="${release}"/>
- <attribute name="full.version" default="${full.version}"/>
<sequential>
- <build-classes
- name="@{name}"
- gensrc.dir="@{gensrc.dir}"
- classes.dir="@{classes.dir}"
- includes="@{includes}"
- excludes="@{excludes}"
- release="@{release}"
- full.version="@{full.version}"
- javac.bootclasspath="@{javac.bootclasspath}"
- javac.source="@{javac.source}"
- javac.target="@{javac.target}"
- />
<mkdir dir="@{lib.dir}"/>
<jar destfile="@{lib.dir}/@{name}.jar"
basedir="@{classes.dir}"
includes="@{includes}">
<manifest>
--- 419,437 ----
<chmod file="@{bin.dir}/@{name}" perm="ugo+rx"/>
</sequential>
</macrodef>
</target>
! <target name="-def-build-jar">
<macrodef name="build-jar">
<attribute name="name"/>
<attribute name="includes"/>
<attribute name="classes.dir" default="${build.classes.dir}"/>
<attribute name="lib.dir" default="${dist.lib.dir}"/>
<attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/>
<attribute name="jarclasspath" default=""/>
<sequential>
<mkdir dir="@{lib.dir}"/>
<jar destfile="@{lib.dir}/@{name}.jar"
basedir="@{classes.dir}"
includes="@{includes}">
<manifest>
*** 484,494 ****
</macrodef>
</target>
<target name="-def-build-classes" depends="-def-pcompile">
<macrodef name="build-classes">
- <attribute name="name"/>
<attribute name="includes"/>
<attribute name="excludes" default="**/package-info.java"/>
<attribute name="classes.dir" default="${build.classes.dir}"/>
<attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
<attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/>
--- 443,452 ----
*** 515,538 ****
<pcompile srcdir="@{gensrc.dir}"
destdir="@{gensrc.dir}"
includes="**/*.properties"/>
<javac fork="true"
executable="@{javac.java.home}/bin/javac"
! srcdir="@{gensrc.dir}"
! destdir="@{classes.dir}"
! includes="@{includes}"
! sourcepath=""
! includeAntRuntime="no"
! source="@{javac.source}"
! target="@{javac.target}">
! <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
! <compilerarg line="${javac.version.opt}"/>
! <compilerarg line="-Xlint"/>
! </javac>
! <javac fork="true"
! executable="@{javac.java.home}/bin/javac"
! srcdir="${src.classes.dir}"
destdir="@{classes.dir}"
includes="@{includes}"
excludes="@{excludes}"
sourcepath=""
includeAntRuntime="no"
--- 473,483 ----
<pcompile srcdir="@{gensrc.dir}"
destdir="@{gensrc.dir}"
includes="**/*.properties"/>
<javac fork="true"
executable="@{javac.java.home}/bin/javac"
! srcdir="${src.classes.dir}:@{gensrc.dir}"
destdir="@{classes.dir}"
includes="@{includes}"
excludes="@{excludes}"
sourcepath=""
includeAntRuntime="no"
*** 560,590 ****
</target>
<target name="-def-build-bootstrap-tool" depends="-check-boot.java.home,-def-build-tool">
<presetdef name="build-bootstrap-tool">
<build-tool
- javac.source="${boot.javac.source}"
- javac.target="${boot.javac.target}"
- gensrc.dir="${build.bootstrap.dir}/gensrc"
- classes.dir="${build.bootstrap.dir}/classes"
bin.dir="${build.bootstrap.dir}/bin"
! lib.dir="${build.bootstrap.dir}/lib"
! java="${boot.java}"
! javac.bootclasspath=""
! release="${bootstrap.release}"
! full.version="${bootstrap.full.version}"/>
</presetdef>
</target>
<target name="-def-build-bootstrap-jar" depends="-def-build-jar">
<presetdef name="build-bootstrap-jar">
<build-jar
javac.source="${boot.javac.source}"
javac.target="${boot.javac.target}"
gensrc.dir="${build.bootstrap.dir}/gensrc"
classes.dir="${build.bootstrap.dir}/classes"
- lib.dir="${build.bootstrap.dir}/lib"
javac.bootclasspath=""
release="${bootstrap.release}"
full.version="${bootstrap.full.version}"/>
</presetdef>
</target>
--- 505,534 ----
</target>
<target name="-def-build-bootstrap-tool" depends="-check-boot.java.home,-def-build-tool">
<presetdef name="build-bootstrap-tool">
<build-tool
bin.dir="${build.bootstrap.dir}/bin"
! java="${boot.java}"/>
</presetdef>
</target>
<target name="-def-build-bootstrap-jar" depends="-def-build-jar">
<presetdef name="build-bootstrap-jar">
<build-jar
+ classes.dir="${build.bootstrap.dir}/classes"
+ lib.dir="${build.bootstrap.dir}/lib"/>
+ </presetdef>
+ </target>
+
+ <target name="-def-build-bootstrap-classes" depends="-def-build-classes">
+ <presetdef name="build-bootstrap-classes">
+ <build-classes
javac.source="${boot.javac.source}"
javac.target="${boot.javac.target}"
gensrc.dir="${build.bootstrap.dir}/gensrc"
classes.dir="${build.bootstrap.dir}/classes"
javac.bootclasspath=""
release="${bootstrap.release}"
full.version="${bootstrap.full.version}"/>
</presetdef>
</target>