changeset 69:55ffcbca5f46

Merge.
author andrew
date Mon, 15 Jun 2009 14:57:29 +0100
parents faac46e2e60f aeabf802f2a1
children 9e36a42735f8
files make/README
diffstat 5 files changed, 6 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon May 18 22:06:02 2009 +0100
+++ b/.hgtags	Mon Jun 15 14:57:29 2009 +0100
@@ -34,3 +34,4 @@
 68257a5eb19afc11aee7eb19f7250f9b9eec7c05 jdk7-b57
 5fb4fbea81c3609916da00417fdd15dbd9e39e97 jdk7-b58
 f64566bf4c2bc92e65ab2b9fab51b119f0d493d1 jdk7-b59
+3b054db3e277ca224fe6576c59ed6f4ab5ed0bb5 jdk7-b60
--- a/make/Makefile	Mon May 18 22:06:02 2009 +0100
+++ b/make/Makefile	Mon Jun 15 14:57:29 2009 +0100
@@ -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/make/README	Mon May 18 22:06:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-README:
-  This file should be located at the top of the jaxws Mercurial repository.
-
-  See http://openjdk.java.net/ for more information about the OpenJDK.
-
-  See ../README-builds.html for complete details on build machine requirements.
-
-Simple Build Instructions:
-
-    cd make && gnumake
-     
-  The files that will be imported into the jdk build will be in the "dist"
-  directory.
-
--- a/make/build.properties	Mon May 18 22:06:02 2009 +0100
+++ b/make/build.properties	Mon Jun 15 14:57:29 2009 +0100
@@ -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/make/build.xml	Mon May 18 22:06:02 2009 +0100
+++ b/make/build.xml	Mon Jun 15 14:57:29 2009 +0100
@@ -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"/>