7008723: Remove binary plugs creation and use from openjdk
Reviewed-by: mchung, andrew, aph, dholmes
--- a/jdk/README Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/README Thu Dec 23 18:50:21 2010 -0800
@@ -9,25 +9,20 @@
http://java.sun.com/javase/downloads/index.jsp
Set the environment variable ALT_BOOTDIR to the location of this JDK 6.
- 2. Download and install the Binary Plugs for the most recent JDK7 from
- http://download.java.net/openjdk/jdk7/
- Set the environment variable ALT_BINARY_PLUGS_PATH to the location of
- these binary plugs.
-
- 3. Either download and install the latest JDK7 from
+ 2. Either download and install the latest JDK7 from
http://download.java.net/openjdk/jdk7/, or build your own complete
OpenJDK7 by using the top level Makefile in the OpenJDK Mercurial forest.
Set the environment variable ALT_JDK_IMPORT_PATH to the location of
this latest JDK7 or OpenJDK7 build.
- 4. Check the sanity of doing a build with the current machine:
+ 3. Check the sanity of doing a build with the current machine:
cd make && gnumake sanity
See README-builds.html if you run into problems.
- 5. Do a partial build of the jdk:
+ 4. Do a partial build of the jdk:
cd make && gnumake all
- 6. Construct the images:
+ 5. Construct the images:
cd make && gnumake images
The resulting JDK image should be found in build/*/j2sdk-image
--- a/jdk/make/Makefile Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/Makefile Thu Dec 23 18:50:21 2010 -0800
@@ -322,11 +322,6 @@
endif
#
-# Binary Plug rules and macros
-#
-include $(BUILDDIR)/common/internal/BinaryPlugs.gmk
-
-#
# Test rule
#
--- a/jdk/make/com/sun/jmx/Makefile Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/com/sun/jmx/Makefile Thu Dec 23 18:50:21 2010 -0800
@@ -42,12 +42,8 @@
# within common included gmk files : that is why the following for loop
# has been duplicated.
-# When building the openjdk, build snmp only if importing binary plugs,
-ifdef OPENJDK
- ifeq ($(IMPORT_BINARY_PLUGS),true)
- SUBDIRS = snmp
- endif
-else
+# When building the openjdk, no snmp
+ifndef OPENJDK
SUBDIRS = snmp
endif
--- a/jdk/make/common/Defs.gmk Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/common/Defs.gmk Thu Dec 23 18:50:21 2010 -0800
@@ -109,83 +109,6 @@
endif
endif
-# If OPENJDK is defined, we may still need to use some native libraries that
-# exist only as part of the closed source. If the closed sources are not
-# available, the libraries must have been pre-built. Since these libraries
-# and the JDK internal interfaces to these are reasonably stable this is not
-# a significant problem. But we do need to provide a way to locate them,
-# including a way to point to a new one when there have been changes.
-#
-# If you have a formal binary plugs download, set ALT_BINARY_PLUGS_PATH
-# to the location.
-# (Optionally you can set ALT_CLOSED_JDK_IMPORT_PATH to point to the latest
-# build JDK, or last promotion for this JDK version, but will not work
-# on windows).
-#
-# As the OPENJDK is built, the binary plugs are used instead of building the
-# libraries.
-# Individual Makefiles that specify USE_BINARY_PLUG_LIBRARY, will get
-# the binary plug copy (or a copy from a built JDK).
-#
-# See common/internal/BinaryPlugs.gmk for more information.
-#
-# Usage notes:
-#
-# ALT_BINARY_PLUGS_JARFILE is probably rarely needed. It can be used
-# to identify the exact jar file to be used for all closed classes..
-#
-# ALT_BINARY_PLUGS_PATH points to a directory containing precisely the
-# binaries needed to build.
-#
-# ALT_BUILD_BINARY_PLUGS_PATH points to a directory containing binary plug dirs
-# multiple architectures named using the standard conventions
-# This is useful for build scripts that need to build multiple architectures
-# of the OpenJDK.
-#
-# ALT_CLOSED_JDK_IMPORT_PATH points to the top-level of a specific platform
-# JDK image.
-#
-# The precedence is that
-# 1. ALT_BINARY_PLUGS_JARFILE overrides any other location of the classes
-# 2. ALT_BINARY_PLUGS_PATH overrides all locations of classes and libraries
-# 3. ALT_BUILD_BINARY_PLUGS_PATH is used to find a ALT_BINARY_PLUGS_PATH
-# 4. ALT_CLOSED_JDK_IMPORT_PATH is used to locate classes and libraries
-# Note: If any of the ALT_ variables are modified here, it is assumed
-# that the build should be done with IMPORT_BINARY_PLUGS=true as
-# well. Otherwise the default will be IMPORT_BINARY_PLUGS=false.
-# Lastly, setting IMPORT_BINARY_PLUGS=false on the command line
-# will override this logic, and plugs will not be imported.
-#
-
-# Always needed, defines the name of the imported/exported jarfile
-BINARY_PLUGS_JARNAME = rt-closed.jar
-
-ifdef OPENJDK
- ifdef ALT_CLOSED_JDK_IMPORT_PATH
- CLOSED_JDK_IMPORT_PATH = $(ALT_CLOSED_JDK_IMPORT_PATH)
- BINARY_PLUGS_PATH = $(CLOSED_JDK_IMPORT_PATH)
- BINARY_PLUGS_JARFILE = $(CLOSED_JDK_IMPORT_PATH)/jre/lib/rt.jar
- IMPORT_BINARY_PLUGS=true
- endif
- ifdef ALT_BUILD_BINARY_PLUGS_PATH
- BUILD_BINARY_PLUGS_PATH = $(ALT_BUILD_BINARY_PLUGS_PATH)
- IMPORT_BINARY_PLUGS=true
- else
- BUILD_BINARY_PLUGS_PATH = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted/latest/openjdk/binaryplugs
- endif
- BINARY_PLUGS_PATH = $(BUILD_BINARY_PLUGS_PATH)/$(PLATFORM)-$(ARCH)
- BINARY_PLUGS_JARFILE = $(BINARY_PLUGS_PATH)/jre/lib/$(BINARY_PLUGS_JARNAME)
- ifdef ALT_BINARY_PLUGS_PATH
- BINARY_PLUGS_PATH = $(ALT_BINARY_PLUGS_PATH)
- BINARY_PLUGS_JARFILE = $(BINARY_PLUGS_PATH)/jre/lib/$(BINARY_PLUGS_JARNAME)
- IMPORT_BINARY_PLUGS=true
- endif
- ifdef ALT_BINARY_PLUGS_JARFILE
- BINARY_PLUGS_JARFILE = $(ALT_BINARY_PLUGS_JARFILE)
- IMPORT_BINARY_PLUGS=true
- endif
-endif # OPENJDK
-
#
# Get platform definitions
#
@@ -289,17 +212,6 @@
LDLIBS_COMMON += $(EXTRA_LIBS)
-#
-# Default is to build, not import native binaries
-#
-ifndef IMPORT_NATIVE_BINARIES
- IMPORT_NATIVE_BINARIES=false
-endif
-# If importing libraries in, no incremental builds
-ifeq ($(IMPORT_NATIVE_BINARIES),true)
- INCREMENTAL_BUILD=false
-endif
-
# for generated libraries
LIBDIR = $(OUTPUTDIR)/lib
ABS_LIBDIR = $(ABS_OUTPUTDIR)/lib
--- a/jdk/make/common/Library.gmk Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/common/Library.gmk Thu Dec 23 18:50:21 2010 -0800
@@ -77,26 +77,6 @@
LINKER=$(LINK.c)
endif
-# FIXUP: unpack needs the zip .o files. So we must build zip?
-# or fix unpack makefile so it uses Program.gmk.
-ifneq ($(IMPORT_NATIVE_BINARIES),true)
- COMPILE_IT=true
-else
- ifeq ($(LIBRARY),zip)
- COMPILE_IT=true
- else
- COMPILE_IT=false
- endif
-endif
-
-# If a Makefile has specified a pre-compiled closed src lib, just copy it.
-ifdef USE_BINARY_PLUG_LIBRARY
- COMPILE_IT=false
-endif
-
-# We either need to import (copy) libraries in, or build them
-ifeq ($(COMPILE_IT),true)
-
$(ACTUAL_LIBRARY):: $(INIT) $(TEMPDIR) $(LIBDIR) $(BINDIR) $(EXTDIR) classheaders
#
@@ -275,31 +255,6 @@
$(LINT.c) $(FILES_ln) $(LDLIBS)
endif
-else # COMPILE_IT
-
-# OpenJDK rule is first so any lib is preferentially copied from that location.
-ifndef USE_BINARY_PLUG_LIBRARY
-
-# In this case we are just copying the file.
-ifneq ($(LIBRARY), fdlibm)
-# Copies in the file from the JDK_IMPORT_PATH area
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/%
- $(install-import-file)
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/native_threads/%
- $(install-import-file)
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/headless/%
- $(install-import-file)
-$(ACTUAL_LIBRARY_DIR)/%: $(JDK_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/xawt/%
- $(install-import-file)
-else # fdlibm
-$(ACTUAL_LIBRARY_DIR)/%:
- $(prep-target)
-endif # fdlibm
-
-endif # USE_BINARY_PLUG_LIBRARY
-
-endif # COMPILE_IT
-
#
# Class libraries with JNI native methods get a include to the package.
#
--- a/jdk/make/common/Program.gmk Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/common/Program.gmk Thu Dec 23 18:50:21 2010 -0800
@@ -105,15 +105,6 @@
FILES_o = \
$(OBJDIR)/main.$(OBJECT_SUFFIX)
-# We either need to import (copy) binaries in, or build them
-ifneq ($(IMPORT_NATIVE_BINARIES),true)
- COMPILE_IT=true
-else
- COMPILE_IT=false
-endif
-
-ifeq ($(COMPILE_IT),true)
-
$(ACTUAL_PROGRAM):: classes $(INIT)
#
@@ -192,19 +183,6 @@
endif # PLATFORM
-else # COMPILE_IT
-
-$(ACTUAL_PROGRAM)::
-
-# Copies in the file from the JDK_IMPORT_PATH area
-$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/%
- @$(install-import-file)
-$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/bin/%
- @$(install-import-file)
-
-endif # COMPILE_IT
-
-
clean::
ifeq ($(PLATFORM), windows)
$(RM) $(OBJDIR)/$(PROGRAM).rc
--- a/jdk/make/common/Release.gmk Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/common/Release.gmk Thu Dec 23 18:50:21 2010 -0800
@@ -249,18 +249,8 @@
sec-files sec-files-win jgss-files ::
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
-#
-# Export binary plugs if not building OPENJDK
-#
-ifdef OPENJDK
- EXPORT_BINARY_PLUGS =
-else # !OPENJDK
- EXPORT_BINARY_PLUGS = export-binary-plugs test-binary-plugs
-endif # OPENJDK
-
# Order is important here, trim jre after jdk image is created
images:: sanity-images post-sanity-images \
- $(EXPORT_BINARY_PLUGS) \
$(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
trim-image-jre trim-image-jdk \
process-image-jre process-image-jdk sec-files sec-files-win jgss-files
--- a/jdk/make/common/Sanity.gmk Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/common/Sanity.gmk Thu Dec 23 18:50:21 2010 -0800
@@ -85,7 +85,6 @@
sane-classpath \
sane-java_home \
sane-fonts \
- sane-binary-plugs \
sane-variant \
sane-ld_library_path \
sane-ld_library_path_64 \
--- a/jdk/make/common/internal/BinaryPlugs.gmk Tue Dec 21 18:21:26 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,270 +0,0 @@
-#
-# Copyright (c) 2007, 2008, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-########################################################################
-
-# Definitions for openjdk plugs (used by both import and export)
-
-# Names of native shared libraries
-
-PLUG_LIBRARY_NAMES=
-
-# Sub-directory where native shared libraries are located (e.g. jre/bin or...)
-
-PLUG_LOCATION_SUBDIR=$(ARCH_VM_SUBDIR)
-
-# Explicit classfile lists
-
-# WARNING: These classlists will not work with pattern rules, only used in
-# shell commands.
-# The \$$ patterns will fail in pattern rules, which want $$,
-# but the $$ fails in shell commands.
-# The shell commands are more important.
-# Also, the $1 pattern in these names causes problems with the
-# GNU make define feature, so you can't use these in define's.
-
-PLUG_JMF_CLASS_NAMES = \
-com/sun/jmx/snmp/SnmpDataTypeEnums.class \
-com/sun/jmx/snmp/SnmpDefinitions.class \
-com/sun/jmx/snmp/SnmpOid.class \
-com/sun/jmx/snmp/SnmpOidDatabase.class \
-com/sun/jmx/snmp/SnmpOidDatabaseSupport.class \
-com/sun/jmx/snmp/SnmpOidRecord.class \
-com/sun/jmx/snmp/SnmpOidTable.class \
-com/sun/jmx/snmp/SnmpOidTableSupport.class \
-com/sun/jmx/snmp/SnmpParameters.class \
-com/sun/jmx/snmp/SnmpPduPacket.class \
-com/sun/jmx/snmp/SnmpPeer.class \
-com/sun/jmx/snmp/SnmpTimeticks.class \
-com/sun/jmx/snmp/SnmpVarBind.class \
-com/sun/jmx/snmp/SnmpVarBindList.class \
-com/sun/jmx/snmp/Timestamp.class \
-com/sun/jmx/snmp/daemon/SendQ.class \
-com/sun/jmx/snmp/daemon/SnmpInformRequest.class \
-com/sun/jmx/snmp/daemon/SnmpQManager.class \
-com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \
-com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \
-com/sun/jmx/snmp/daemon/SnmpSendServer.class \
-com/sun/jmx/snmp/daemon/SnmpSession.class \
-com/sun/jmx/snmp/daemon/SnmpSocket.class \
-com/sun/jmx/snmp/daemon/SnmpTimerServer.class \
-com/sun/jmx/snmp/daemon/WaitQ.class
-
-# Class list temp files (used by both import and export of plugs)
-
-PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
-PLUG_CLASS_AREAS = jmf
-PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
-
-# Create jargs file command
-
-define plug-create-jargs
-@$(prep-target)
-$(SED) -e "s@^@-C $(CLASSDESTDIR) @" $< > $@
-endef # plug-create-clist-jargs
-
-# Create clist (class name list) and jargs file (input to jar)
-# Need these files to avoid long command lines which fail on some systems.
-
-$(PLUG_TEMPDIR)/jmf.clist:
- @$(prep-target)
- @for i in $(PLUG_JMF_CLASS_NAMES) ; do \
- $(ECHO) "$$i" >> $@; \
- done
-$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
- @$(prep-target)
- $(CAT) $(PLUG_CLISTS) > $@
-$(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
- $(plug-create-jargs)
-$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
- $(plug-create-jargs)
-
-#
-# Specific to OPENJDK import of binary plugs
-#
-
-ifdef OPENJDK
-
-# Import
-
-PLUG_IMPORT_DIR=$(BINARY_PLUGS_PATH)
-PLUG_IMPORT_JARFILE=$(BINARY_PLUGS_JARFILE)
-
-# Import file command
-
-define import-binary-plug-file
-@$(ECHO) "PLUG IMPORT: $(@F)"
-$(install-non-module-file)
-endef # import-binary-plug-file
-
-# Import classes command
-
-define import-binary-plug-classes
-@$(MKDIR) -p $(CLASSDESTDIR)
-@$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /'
-($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1 $(BOOT_JAR_JFLAGS) )
-($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) )
-endef # import-binary-plug-classes
-
-# Import specific area classes (the classes are always created)
-
-import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
- $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
-
-# Import all classes from the jar file
-
-import-binary-plug-jar: \
- import-binary-plug-jmf-classes
-
-# Binary plug start/complete messages
-
-import-binary-plugs-started:
- @$(ECHO) "BinaryPlugs import started: `date`"
- @$(ECHO) "BINARY_PLUGS_PATH=$(BINARY_PLUGS_PATH)"
-import-binary-plugs-completed:
- @$(ECHO) "BinaryPlugs import completed: `date`"
-
-# Import lib files (only if they don't exist already)
-
-import-binary-plugs-libs: \
- $(PLUG_LIBRARY_NAMES:%=$(LIB_LOCATION)/%)
-
-# Import everything
-
-import-binary-plugs: \
- import-binary-plugs-started \
- import-binary-plugs-libs \
- import-binary-plug-jar \
- import-binary-plugs-completed
-
-# All these targets are phony (no filenames)
-
-.PHONY: import-binary-plugs-started \
- import-binary-plugs-completed \
- import-binary-plugs-libs \
- import-binary-plugs \
- import-binary-plug-jar \
- import-binary-plug-jmf-classes
-
-else # !OPENJDK
-
-#
-# Specific to exporting binary plugs for OPENJDK (e.g. OPENJDK is NOT defined)
-#
-
-# Export names (See make/common/Defs.gmk for BINARY_PLUGS_JARNAME definition)
-
-PLUG_EXPORT_DIRNAME=openjdk-binary-plugs-image
-PLUG_EXPORT_DIR=$(OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME)
-PLUG_EXPORT_JARFILE=$(PLUG_EXPORT_DIR)/jre/lib/$(BINARY_PLUGS_JARNAME)
-
-# Export file command
-
-define export-binary-plug-file
-@$(ECHO) "PLUG EXPORT: $(@F)"
-$(install-non-module-file)
-endef # export-binary-plug-file
-
-# OpenJDK Binary Plug License
-
-$(PLUG_EXPORT_DIR)/LICENSE: $(CLOSED_SHARE_SRC)/doc/openjdk/binary-plugs/LICENSE
- $(export-binary-plug-file)
-export-binary-plugs-license: $(PLUG_EXPORT_DIR)/LICENSE
-
-# Create jar file of plug classes (always created)
-
-$(PLUG_EXPORT_JARFILE): $(PLUG_TEMPDIR)/all.clist $(PLUG_TEMPDIR)/all.jargs
- @$(prep-target)
- @$(ECHO) "PLUG EXPORT: $(@F)"
- @$(CAT) $(PLUG_TEMPDIR)/all.clist | $(SED) -e 's/^/PLUG EXPORT: /'
- $(BOOT_JAR_CMD) cf $@ @$(PLUG_TEMPDIR)/all.jargs $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-export-binary-plugs-jar: $(PLUG_EXPORT_JARFILE)
-
-# Export binary plug start/complete messages
-
-export-binary-plugs-started:
- @$(ECHO) "BinaryPlugs export started: `date`"
- @$(ECHO) "PLUG_EXPORT_DIR=$(PLUG_EXPORT_DIR)"
- $(RM) -r $(PLUG_EXPORT_DIR)
- @$(MKDIR) -p $(PLUG_EXPORT_DIR)
- @$(MKDIR) -p $(PLUG_TEMPDIR)
-export-binary-plugs-completed:
- @$(RM) -r $(PLUG_TEMPDIR)
- @$(ECHO) "BinaryPlugs export completed: `date`"
-
-# Export lib files (only if they don't exist already)
-
-export-binary-plugs-libs: \
- $(PLUG_LIBRARY_NAMES:%=$(PLUG_EXPORT_DIR)/$(PLUG_LOCATION_SUBDIR)/%)
-
-# Export everything
-
-export-binary-plugs: \
- export-binary-plugs-started \
- export-binary-plugs-libs \
- export-binary-plugs-license \
- export-binary-plugs-jar \
- export-binary-plugs-completed
-
-# All these targets are phony (no filenames)
-
-.PHONY: export-binary-plugs-started \
- export-binary-plugs-license \
- export-binary-plugs-jar \
- export-binary-plugs-libs \
- export-binary-plugs-completed \
- export-binary-plugs
-
-# Rules that test the export and import of plugs (only when you can export)
-
-TEST_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-testing-plugs
-TEST_PLUG_COPY=$(TEST_OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME)-testcopy
-
-# Run export-binary-plugs first, then use this rule to test an import
-
-test-binary-plugs: $(TEST_PLUG_COPY)
- $(RM) -r $(TEST_OUTPUTDIR)/$(PLUG_EXPORT_DIRNAME)
- $(MKDIR) -p $(TEST_OUTPUTDIR)
- @$(ECHO) "Testing import of plugs"
- ($(CD) $(JDK_TOPDIR)/make && \
- $(MAKE) OPENJDK=true \
- ALT_OUTPUTDIR=$(TEST_OUTPUTDIR) \
- ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH) \
- ALT_BINARY_PLUGS_PATH=$(TEST_PLUG_COPY) \
- import-binary-plugs )
- $(RM) -r $(TEST_OUTPUTDIR)
- @$(ECHO) "Testing of plugs was successful"
-
-$(TEST_PLUG_COPY):
- @$(ECHO) "Creating test plug copy"
- $(RM) -r $@
- $(MKDIR) -p $(@D)
- $(CP) -r -p $(PLUG_EXPORT_DIR) $@
-
-.PHONY: test-binary-plugs
-
-endif # !OPENJDK
-
--- a/jdk/make/common/shared/Sanity-Settings.gmk Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/common/shared/Sanity-Settings.gmk Thu Dec 23 18:50:21 2010 -0800
@@ -246,16 +246,7 @@
ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH)
- ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
- ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
- ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
- ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH)
- ALL_SETTINGS+=$(call addAltSetting,BUILD_BINARY_PLUGS_PATH)
-else
- ALL_SETTINGS+=$(call addHeading,OPENJDK Export Binary Plug Settings)
- ALL_SETTINGS+=$(call addOptionalSetting,PLUG_EXPORT_DIRNAME)
endif
-ALL_SETTINGS+=$(call addOptionalSetting,PLUG_LIBRARY_NAMES)
ifdef OPENJDK
ALL_SETTINGS+=$(call addHeading,Previous JDK Settings)
--- a/jdk/make/common/shared/Sanity.gmk Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/common/shared/Sanity.gmk Thu Dec 23 18:50:21 2010 -0800
@@ -183,7 +183,6 @@
sane-classpath \
sane-java_home \
sane-fonts \
- sane-binary-plugs \
sane-variant \
sane-ld_library_path \
sane-ld_library_path_64 \
@@ -499,23 +498,6 @@
endif
######################################################
-# If building OPENJDK check pre-built binaries are
-# available for binary plug source components.
-######################################################
-ifdef OPENJDK
-sane-binary-plugs:
- ifeq ($(IMPORT_BINARY_PLUGS),true)
- @if [ ! -d "$(BINARY_PLUGS_PATH)" ]; then \
- $(ECHO) "WARNING: Can't locate pre-built libraries. \n" \
- " Please check your access to \n" \
- " $(BINARY_PLUGS_PATH) \n" \
- " and/or check your value of ALT_BINARY_PLUGS_PATH. \n" \
- "" >> $(WARNING_FILE); \
- fi
- endif
-endif
-
-######################################################
# VARIANT must be set to DBG or OPT
######################################################
sane-variant:
--- a/jdk/make/java/redist/Makefile Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/java/redist/Makefile Thu Dec 23 18:50:21 2010 -0800
@@ -272,17 +272,9 @@
$(install-file)
#
-# Specific to OpenJDK building
+# Specific to non-OpenJDK building
#
-ifdef OPENJDK
-
- ifeq ($(IMPORT_BINARY_PLUGS),true)
- include $(BUILDDIR)/common/internal/BinaryPlugs.gmk
-
- build: import-binary-plugs
- endif
-
-else # !OPENJDK
+ifndef OPENJDK
INTERNAL_IMPORT_LIST += \
$(LIBDIR)/security/US_export_policy.jar \
--- a/jdk/make/javax/sound/Makefile Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/javax/sound/Makefile Thu Dec 23 18:50:21 2010 -0800
@@ -23,8 +23,6 @@
# questions.
#
-# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
-
BUILDDIR = ../..
MODULE = sound
PACKAGE = javax.sound
--- a/jdk/make/jdk_generic_profile.sh Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/jdk_generic_profile.sh Thu Dec 23 18:50:21 2010 -0800
@@ -78,8 +78,6 @@
# Attempts to set these variables for the JDK builds:
# ALT_COMPILER_PATH
# ALT_BOOTDIR
-# ALT_BINARY_PLUGS_PATH
-# ALT_CLOSED_JDK_IMPORT_PATH
# Windows Only:
# ALT_UNIXCOMMAND_PATH
# ALT_DXSDK_PATH
@@ -304,28 +302,6 @@
export ALT_JDK_IMPORT_PATH
fi
-# Get the latest JDK binary plugs or build to import pre-built binaries
-if [ "${ALT_BINARY_PLUGS_PATH}" = "" ] ; then
- binplugs=${jdk_instances}/openjdk-binary-plugs
- jdkplugs=${jdk_instances}/${importjdk}
- if [ -d ${binplugs} ] ; then
- ALT_BINARY_PLUGS_PATH=${binplugs}
- export ALT_BINARY_PLUGS_PATH
- elif [ "${ALT_CLOSED_JDK_IMPORT_PATH}" = "" -a -d ${jdkplugs} ] ; then
- ALT_CLOSED_JDK_IMPORT_PATH=${jdkplugs}
- export ALT_CLOSED_JDK_IMPORT_PATH
- fi
- if [ "${ALT_BINARY_PLUGS_PATH}" = "" ] ; then
- echo "WARNING: Missing ALT_BINARY_PLUGS_PATH: ${binplugs}"
- fi
-fi
-if [ "${ALT_BINARY_PLUGS_PATH}" != "" -a ! -d "${ALT_BINARY_PLUGS_PATH}" ] ; then
- echo "WARNING: Cannot access ALT_BINARY_PLUGS_PATH=${ALT_BINARY_PLUGS_PATH}"
-fi
-if [ "${ALT_CLOSED_JDK_IMPORT_PATH}" != "" -a ! -d "${ALT_CLOSED_JDK_IMPORT_PATH}" ] ; then
- echo "WARNING: Cannot access ALT_CLOSED_JDK_IMPORT_PATH=${ALT_CLOSED_JDK_IMPORT_PATH}"
-fi
-
# Export PATH setting
PATH="${path4sdk}"
export PATH
--- a/jdk/make/netbeans/README Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/netbeans/README Thu Dec 23 18:50:21 2010 -0800
@@ -93,7 +93,6 @@
make.options=\
ALT_BOOTDIR=/home/me/bin/jdk1.6.0 \
- ALT_BINARY_PLUGS_PATH=/home/me/bin/openjdk-binary-plugs \
ALT_JDK_IMPORT_PATH=/home/me/bin/jdk1.7.0 \
OPENJDK=true
--- a/jdk/make/sun/dcpr/Makefile Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/sun/dcpr/Makefile Thu Dec 23 18:50:21 2010 -0800
@@ -23,8 +23,6 @@
# questions.
#
-# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
-
BUILDDIR = ../..
MODULE = java2d
PACKAGE = sun.dc
--- a/jdk/make/sun/font/t2k/Makefile Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/sun/font/t2k/Makefile Thu Dec 23 18:50:21 2010 -0800
@@ -23,8 +23,6 @@
# questions.
#
-# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
-
#
# Makefile for building t2k rasteriser.
#
--- a/jdk/make/sun/management/Makefile Tue Dec 21 18:21:26 2010 -0800
+++ b/jdk/make/sun/management/Makefile Thu Dec 23 18:50:21 2010 -0800
@@ -37,12 +37,8 @@
all build:: properties aclfile jmxremotefiles
-# When building the openjdk, build snmp only if importing binary plugs,
-ifdef OPENJDK
- ifeq ($(IMPORT_BINARY_PLUGS),true)
- SUBDIRS = snmp
- endif
-else
+# When building the openjdk, no snmp
+ifndef OPENJDK
SUBDIRS = snmp
endif
SUBDIRS += jmxremote