1.1 --- a/Makefile Wed Dec 22 12:27:14 2010 -0800
1.2 +++ b/Makefile Thu Dec 23 18:41:57 2010 -0800
1.3 @@ -156,12 +156,6 @@
1.4 clobber:: deploy-clobber
1.5 endif
1.6
1.7 -ifeq ($(BUILD_JDK), true)
1.8 - ifeq ($(BUNDLE_RULES_AVAILABLE), true)
1.9 - generic_build_repo_series:: openjdk-binary-plugs-bundles
1.10 - endif
1.11 -endif
1.12 -
1.13 # The debug build, fastdebug or debug. Needs special handling.
1.14 # Note that debug builds do NOT do INSTALL steps, but must be done
1.15 # after the product build and before the INSTALL step of the product build.
1.16 @@ -301,7 +295,6 @@
1.17 ifeq ($(BUILD_JDK), true)
1.18 ifeq ($(BUNDLE_RULES_AVAILABLE), true)
1.19
1.20 -OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME)
1.21 OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output
1.22 OPENJDK_BUILD_NAME \
1.23 = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
1.24 @@ -330,7 +323,6 @@
1.25 GENERATE_DOCS=false \
1.26 ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
1.27 ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
1.28 - ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
1.29 ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \
1.30 ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \
1.31 product_build )
1.32 @@ -545,7 +537,7 @@
1.33 "
1.34
1.35 ################################################################
1.36 -# Source and binary plug bundling
1.37 +# Source bundling
1.38 ################################################################
1.39 ifeq ($(BUNDLE_RULES_AVAILABLE), true)
1.40 include $(BUNDLE_RULES)
