Merge
authorxdono
Thu, 07 May 2009 12:26:11 -0700
changeset 2843 cc43f23731cc
parent 2842 1a14159efe64 (diff)
parent 2726 d60a9ce3c3ea (current diff)
child 2844 e7ca0be66640
Merge
jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/XSLTProcessorApplet.java
jaxp/src/share/classes/com/sun/org/apache/xalan/internal/client/package.html
jdk/src/share/native/sun/java2d/pipe/RenderBuffer.c
--- a/jaxws/make/Makefile	Wed Jul 05 16:52:55 2017 +0200
+++ b/jaxws/make/Makefile	Thu May 07 12:26:11 2009 -0700
@@ -69,6 +69,10 @@
   endif
 endif
 
+ifeq ($(DEBUG_CLASSFILES), true)
+  ANT_OPTIONS += -Djavac.debug=true
+endif
+
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
 # and the somewhat misnamed CLASS_VERSION (-target NN)
 ifdef TARGET_CLASS_VERSION
--- a/jaxws/make/build.properties	Wed Jul 05 16:52:55 2017 +0200
+++ b/jaxws/make/build.properties	Thu May 07 12:26:11 2009 -0700
@@ -32,7 +32,6 @@
 # options for the <javac> tasks used to compile the tools
 javac.target = 5
 javac.debug = true
-javac.debuglevel = source,lines
 javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used
 javac.version.opt = 
--- a/jaxws/make/build.xml	Wed Jul 05 16:52:55 2017 +0200
+++ b/jaxws/make/build.xml	Thu May 07 12:26:11 2009 -0700
@@ -107,6 +107,7 @@
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
+	     debug="${javac.debug}"
              target="${javac.target}"
              excludes="com/sun/tools/internal/txw2/**">
          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>