From 17c1676eecf6fd752e2930908a259ec0535f03a8 Mon Sep 17 00:00:00 2001
From: jjg <none@none>
Date: Tue, 3 Jun 2008 13:26:47 -0700
Subject: 4075303: Use javap to enquire aboput a specific inner class 4348375:
 Javap is not internationalized 4459541: "javap -l" shows line numbers as
 signed short; they should be unsigned 4501660: change diagnostic of -help as
 'print this help message and exit' 4776241: unused source file in javap...
 4870651: javap should recognize generics, varargs, enum 4876942: javap
 invoked without args does not print help screen 4880663: javap could output
 whitespace between class name and opening brace 4975569: javap doesn't print
 new flag bits 6271787: javap dumps LocalVariableTypeTable attribute in hex,
 needs to print a table 6305779: javap: support annotations 6439940: Clean up
 javap implementation 6469569: wrong check of searchpath in JavapEnvironment
 6474890: javap does not open .zip files in -classpath 6587786: Javap throws
 error : "ERROR:Could not find <classname>" for JRE classes 6622215: javap
 ignores certain relevant access flags 6622216: javap names some attributes
 incorrectly 6622232: javap gets whitespace confused 6622260: javap prints
 negative bytes incorrectly in hex Reviewed-by: ksrini

---
 make/build.properties                                    |  4 +++-
 make/build.xml                                           | 11 ++++++-----
 make/netbeans/common/standard-ide-actions-no-javadoc.ent |  2 +-
 make/netbeans/common/standard-ide-actions.ent            |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'make')

diff --git a/make/build.properties b/make/build.properties
index 949e91d9..9a76ff06 100644
--- a/make/build.properties
+++ b/make/build.properties
@@ -66,7 +66,7 @@ javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used
 javac.version.opt = 
 # in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
+javac.lint.opts = -Xlint:all,-deprecation,-fallthrough,-serial -Werror
 
 # options for the <javadoc> task for javac
 javadoc.jls3.url=http://java.sun.com/docs/books/jls/
@@ -120,6 +120,8 @@ javah.tests = \
 	tools/javah/
 
 javap.includes = \
+	com/sun/tools/classfile/ \
+	com/sun/tools/javap/ \
 	sun/tools/javap/
 
 javap.tests = \
diff --git a/make/build.xml b/make/build.xml
index b2d8b1b6..1f7c8543 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -136,7 +136,7 @@
             <arg value="-html:${findbugs.home}/src/xsl/fancy.xsl"/>
             <arg value="${dist.findbugs.dir}/findbugs.xml"/>
             <redirector output="${dist.findbugs.dir}/findbugs.html"/>
-        </exec>
+        </exec>
     </target>
 
     <target name="coverage" depends="-def-cobertura,build-all-classes,instrument-classes,jtreg,coverage-report"/>
@@ -301,14 +301,15 @@
                               jarmainclass="sun.tools.javap.Main"/>
     </target>
     
-    <target name="build-classes-javap" depends="build-bootstrap-javac">
+    <target name="build-classes-javap" depends="build-classes-javac">
         <build-classes name="javap" includes="${javap.includes}"/>
     </target>
     
-    <target name="build-javap" depends="build-bootstrap-javac">
+    <target name="build-javap" depends="build-javac">
         <build-tool name="javap"
                     includes="${javap.includes}"
-                    jarmainclass="sun.tools.javap.Main"/>
+                    jarmainclass="sun.tools.javap.Main"
+                    jarclasspath="javac.jar"/>
     </target>
     
     <!-- (no javadoc for javap) -->
@@ -480,7 +481,7 @@
                           destdir="@{gensrc.dir}"
                           includes="@{includes}"/>
                 <copy todir="@{gensrc.dir}">
-                    <fileset dir="${src.classes.dir}" includes="${javac.includes}"/>
+                    <fileset dir="${src.classes.dir}" includes="@{includes}"/>
                     <globmapper from="*.properties-template" to="*.properties"/>
                     <filterset begintoken="$(" endtoken=")">
                         <filter token="JDK_VERSION" value="${jdk.version}"/>
diff --git a/make/netbeans/common/standard-ide-actions-no-javadoc.ent b/make/netbeans/common/standard-ide-actions-no-javadoc.ent
index 8f91bbe2..ca194c90 100644
--- a/make/netbeans/common/standard-ide-actions-no-javadoc.ent
+++ b/make/netbeans/common/standard-ide-actions-no-javadoc.ent
@@ -157,5 +157,5 @@
 </action>
 
 <action name="javadoc">
-    <target>javadoc-nb</target>
+    <target>-javadoc-nb</target>
 </action>
diff --git a/make/netbeans/common/standard-ide-actions.ent b/make/netbeans/common/standard-ide-actions.ent
index 8f91bbe2..ca194c90 100644
--- a/make/netbeans/common/standard-ide-actions.ent
+++ b/make/netbeans/common/standard-ide-actions.ent
@@ -157,5 +157,5 @@
 </action>
 
 <action name="javadoc">
-    <target>javadoc-nb</target>
+    <target>-javadoc-nb</target>
 </action>
-- 
cgit v1.2.3