<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>Looks good.</div><div><br></div><div>Now I'll know what to say when people come running into my office screaming about disappearing packages in the builds. ;^)</div><div><br></div><div>Thanks.</div><div><br></div><div>-kto</div><div><br><div><div>On Feb 7, 2011, at 10:09 AM, John Rose wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><div>On Feb 7, 2011, at 9:37 AM, Kelly O'Hair wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>It is critical that all changes to the OpenJDK build process, as defined in the existing Makefiles, be reviewed<br>by the Build Infrastructure Group (<a href="http://openjdk.java.net/groups/build/">http://openjdk.java.net/groups/build/</a>) via the <a href="mailto:build-dev@openjdk.java.net">build-dev@openjdk.java.net</a><br>mailing list prior to integration into the public shared repositories.<br>This includes ANY change to the Makefiles, ant scripts, build property files, build dependencies, or<br>system configurations required.<br></div></blockquote></div><br><div>That's timely. In a few weeks I will be renaming the JSR 292 java.dyn package to java.lang.invoke. This leads to some makefile changes which are a little tricky. The changes are at the top of this patch:</div><div><br></div><div><a href="http://hg.openjdk.java.net/mlvm/mlvm/jdk/file/tip/meth-rename-7012648.patch">http://hg.openjdk.java.net/mlvm/mlvm/jdk/file/tip/meth-rename-7012648.patch</a></div><div><br></div><div>I've enclosed the relevant section. Comments?</div><div><br></div><div>-- John</div><div><br></div><div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">diff --git a/make/java/Makefile b/make/java/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">--- a/make/java/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">+++ b/make/java/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">@@ -1,5 +1,5 @@</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> #</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">+# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> #</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> # This code is free software; you can redistribute it and/or modify it</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">@@ -44,7 +44,7 @@</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> SUBDIRS_desktop = awt applet beans</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> SUBDIRS_management = management</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> SUBDIRS_misc = npt java_crw_demo java_hprof_demo \</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">- logging instrument dyn sql rmi</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">+ logging instrument invoke sql rmi</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> </font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> </font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> ifeq ($(PLATFORM), solaris)</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">diff --git a/make/java/dyn/Makefile b/make/java/invoke/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">rename from make/java/dyn/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">rename to make/java/invoke/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">--- a/make/java/dyn/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">+++ b/make/java/invoke/Makefile</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">@@ -1,5 +1,5 @@</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> #</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> #</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> # This code is free software; you can redistribute it and/or modify it</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">@@ -25,18 +25,15 @@</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> </font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> BUILDDIR = ../..</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> </font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">-PACKAGE = java.dyn</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">+PACKAGE = java.lang.invoke</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> PRODUCT = java</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> include $(BUILDDIR)/common/Defs.gmk</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> </font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">-AUTO_FILES_JAVA_DIRS = java/dyn sun/dyn</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">+AUTO_FILES_JAVA_DIRS = java/lang/invoke sun/invoke</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> </font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> # The sources built here use new language syntax to generate</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> # method handle calls. Let's be sure we are using that format.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> LANGUAGE_VERSION = -source 7</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> CLASS_VERSION = -target 7</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> </font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">-# Tell the compiler not to accept transitional forms.</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">-OTHER_JAVACFLAGS = -XDallowTransitionalJSR292=no</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'">-</font></div><div><font class="Apple-style-span" face="'Lucida Sans Typewriter'"> include $(BUILDDIR)/common/Classes.gmk</font></div></div><div><br></div></div></blockquote></div><br></div></body></html>