On Feb 7, 2011, at 9:37 AM, Kelly O'Hair wrote: > It is critical that all changes to the OpenJDK build process, as defined in > the existing Makefiles, be reviewed > by the Build Infrastructure Group (http://openjdk.java.net/groups/build/) via > the [email protected] > mailing list prior to integration into the public shared repositories. > This includes ANY change to the Makefiles, ant scripts, build property files, > build dependencies, or > system configurations required.
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: http://hg.openjdk.java.net/mlvm/mlvm/jdk/file/tip/meth-rename-7012648.patch I've enclosed the relevant section. Comments? -- John diff --git a/make/java/Makefile b/make/java/Makefile --- a/make/java/Makefile +++ b/make/java/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -44,7 +44,7 @@ SUBDIRS_desktop = awt applet beans SUBDIRS_management = management SUBDIRS_misc = npt java_crw_demo java_hprof_demo \ - logging instrument dyn sql rmi + logging instrument invoke sql rmi ifeq ($(PLATFORM), solaris) diff --git a/make/java/dyn/Makefile b/make/java/invoke/Makefile rename from make/java/dyn/Makefile rename to make/java/invoke/Makefile --- a/make/java/dyn/Makefile +++ b/make/java/invoke/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -25,18 +25,15 @@ BUILDDIR = ../.. -PACKAGE = java.dyn +PACKAGE = java.lang.invoke PRODUCT = java include $(BUILDDIR)/common/Defs.gmk -AUTO_FILES_JAVA_DIRS = java/dyn sun/dyn +AUTO_FILES_JAVA_DIRS = java/lang/invoke sun/invoke # The sources built here use new language syntax to generate # method handle calls. Let's be sure we are using that format. LANGUAGE_VERSION = -source 7 CLASS_VERSION = -target 7 -# Tell the compiler not to accept transitional forms. -OTHER_JAVACFLAGS = -XDallowTransitionalJSR292=no - include $(BUILDDIR)/common/Classes.gmk
