Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 16:53:52 +0200
changeset 2846 629e4fc20f75
parent 2845 76ee911ec65f (diff)
parent 2837 36b20a6c7568 (current diff)
child 2855 c233842412b3
Merge
corba/make/README file | annotate | diff | comparison | revisions
hotspot/make/README file | annotate | diff | comparison | revisions
jaxp/make/README file | annotate | diff | comparison | revisions 
--- a/jaxws/.hgtags	Wed Jul 05 16:53:48 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 16:53:52 2017 +0200
@@ -33,3 +33,4 @@
 0f7fbf85f7a1d9c027a863b9955c623352ed1292 jdk7-b56
 68257a5eb19afc11aee7eb19f7250f9b9eec7c05 jdk7-b57
 5fb4fbea81c3609916da00417fdd15dbd9e39e97 jdk7-b58
+f64566bf4c2bc92e65ab2b9fab51b119f0d493d1 jdk7-b59
--- a/jaxws/make/Makefile	Wed Jul 05 16:53:48 2017 +0200
+++ b/jaxws/make/Makefile	Wed Jul 05 16:53:52 2017 +0200
@@ -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/README	Wed Jul 05 16:53:48 2017 +0200
+++ /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/jaxws/make/build.properties	Wed Jul 05 16:53:48 2017 +0200
+++ b/jaxws/make/build.properties	Wed Jul 05 16:53:52 2017 +0200
@@ -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:53:48 2017 +0200
+++ b/jaxws/make/build.xml	Wed Jul 05 16:53:52 2017 +0200
@@ -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"/>
jdk-sandbox