# HG changeset patch # User ohair # Date 1293158517 28800 # Node ID 803a0c91a1a2dc3618b27f0fbab8250c79332e0b # Parent 60699c837ea8fd69c7a4828096cda2c539e82b5d 7008723: Remove binary plugs creation and use from openjdk Reviewed-by: mchung, andrew, aph, dholmes diff -r 60699c837ea8 -r 803a0c91a1a2 Makefile --- a/Makefile Wed Dec 22 12:27:14 2010 -0800 +++ b/Makefile Thu Dec 23 18:41:57 2010 -0800 @@ -156,12 +156,6 @@ clobber:: deploy-clobber endif -ifeq ($(BUILD_JDK), true) - ifeq ($(BUNDLE_RULES_AVAILABLE), true) - generic_build_repo_series:: openjdk-binary-plugs-bundles - endif -endif - # The debug build, fastdebug or debug. Needs special handling. # Note that debug builds do NOT do INSTALL steps, but must be done # after the product build and before the INSTALL step of the product build. @@ -301,7 +295,6 @@ ifeq ($(BUILD_JDK), true) ifeq ($(BUNDLE_RULES_AVAILABLE), true) -OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME) OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output OPENJDK_BUILD_NAME \ = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) @@ -330,7 +323,6 @@ GENERATE_DOCS=false \ ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ - ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \ ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \ ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ product_build ) @@ -545,7 +537,7 @@ " ################################################################ -# Source and binary plug bundling +# Source bundling ################################################################ ifeq ($(BUNDLE_RULES_AVAILABLE), true) include $(BUNDLE_RULES) diff -r 60699c837ea8 -r 803a0c91a1a2 README-builds.html --- a/README-builds.html Wed Dec 22 12:27:14 2010 -0800 +++ b/README-builds.html Thu Dec 23 18:41:57 2010 -0800 @@ -64,7 +64,6 @@
- Not all of the source code that makes up the JDK is available - under an open-source license. - This is a temporary situation and these binary plugs will be - replaced with fully open source replacements as soon as possible. - So currently, in order to build a complete OpenJDK image, - you must first download and install the appropriate - binary plug bundles for the OpenJDK, go to the - OpenJDK site and select - the - "Bundles(7)" - link and download the binaryplugs for - your particular platform. - The file downloaded is a jar file that must be extracted by running - the jar file with: ---- A prompt will be issued for acceptance of these binary plug files. - During the OpenJDK build process these "binary plugs" - for the encumbered components will be copied into your - resulting OpenJDK binary build image. - These binary plug files are only for the purpose of - building an OpenJDK binary. - Make sure you set - ALT_BINARY_PLUGS_PATH - to the root of this installation. -- java -jar jdk-7-ea-plug-bnn-os-arch-dd_month_year.jar --
The ALT_JDK_IMPORT_PATH @@ -1601,14 +1553,6 @@ You should always install your own local Bootstrap JDK and always set ALT_BOOTDIR explicitly. -ALT_BINARY_PLUGS_PATH -- The location of the binary plugs installation. - See Binary Plugs for more information. - You should always have a local copy of a - recent Binary Plugs install image - and set this variable to that location. - ALT_JDK_IMPORT_PATH The location of a previously built JDK installation. @@ -1705,26 +1649,6 @@ Where each of these directories contain the import JDK image for that platform. -ALT_BUILD_BINARY_PLUGS_PATH -- These are useful in managing builds on multiple platforms. - The default network location for all of the binary plug images - for all platforms. - If ALT_BINARY_PLUGS_PATH - is not set, this directory will be used and should contain - the following directories: - solaris-sparc, - solaris-i586, - solaris-sparcv9, - solaris-amd64, - linux-i586, - linux-amd64, - windows-i586, - and - windows-amd64. - Where each of these directories contain the binary plugs image - for that platform. - Windows specific: