make/build.xml

*** 81,91 ****
  
   This file is organized into sections as follows:
   - global property definitions
   - general top level targets
   - general diagnostic/debugging targets
!  - groups of targets for each tool: javac, javadoc, doclets, javah, javap, apt
      Within each group, the following targets are provided, where applicable
        build-bootstrap-TOOL      build the bootstrap version of the tool
        build-classes-TOOL        build the classes for the tool
        build-TOOL                build the jar file and script for the tool
        jtreg-TOOL                build the tool and run the appropriate tests
--- 81,91 ----
  
   This file is organized into sections as follows:
   - global property definitions
   - general top level targets
   - general diagnostic/debugging targets
!  - groups of targets for each tool: javac, javadoc, doclets, javah, javap
      Within each group, the following targets are provided, where applicable
        build-bootstrap-TOOL      build the bootstrap version of the tool
        build-classes-TOOL        build the classes for the tool
        build-TOOL                build the jar file and script for the tool
        jtreg-TOOL                build the tool and run the appropriate tests
*** 243,257 ****
      <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,-create-import-jdk-stubs">
!         <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">
--- 243,257 ----
      <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"
      />
  
      <target name="build-all-classes" depends="build-bootstrap-javac,-create-import-jdk-stubs">
!         <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes}"/>
      </target>
  
      <!-- clean -->
  
      <target name="clean" description="Delete all generated files">
*** 655,700 ****
  
      <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>
- 
- 
-     <target name="jtreg-apt" depends="build-apt,-def-jtreg">
-         <jtreg-tool name="apt" tests="${apt.tests}"/>
-     </target>
- 
-     <target name="findbugs-apt" depends="build-apt,-def-findbugs">
-         <findbugs-tool name="apt"/>
-     </target>
- 
-     <target name="apt" depends="build-apt,jtreg-apt,findbugs-apt"/>
- 
- 
-     <!--
      **** Create import JDK stubs.
      -->
  
      <target name="-create-import-jdk-stubs" depends="-def-genstubs" if="require.import.jdk.stubs">
          <mkdir dir="${build.genstubs.dir}"/>
--- 655,664 ----
*** 965,975 ****
                      <packageset dir="${src.classes.dir}" includes="@{includes}">
                          <or>
                              <filename name="java/"/>
                              <filename name="javax/"/>
                              <filename name="com/sun/javadoc/"/>
-                             <filename name="com/sun/mirror/"/>
                              <filename name="com/sun/source/"/>
                          </or>
                      </packageset>
                  </javadoc>
              </sequential>
--- 929,938 ----