1.1 --- a/Makefile Wed Dec 22 15:57:04 2010 -0800
1.2 +++ b/Makefile Fri Dec 24 11:16:02 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 @@ -456,7 +448,6 @@
1.33 DEVTOOLS_PATH.desc = Directory containing zip and gnumake
1.34 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
1.35 DXSDK_PATH.desc = Root directory of DirectX SDK
1.36 -MSDEVTOOLS_PATH.desc = Root directory of VC++ tools (e.g. rc.exe)
1.37 MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll
1.38
1.39 # Make variables to print out (description and value)
1.40 @@ -487,12 +478,10 @@
1.41
1.42 VARIABLE_PRINTVAL_LIST += \
1.43 DXSDK_PATH \
1.44 - MSDEVTOOLS_PATH \
1.45 MSVCRT_DLL_PATH
1.46
1.47 VARIABLE_CHECKDIR_LIST += \
1.48 DXSDK_PATH \
1.49 - MSDEVTOOLS_PATH \
1.50 MSVCRT_DLL_PATH
1.51
1.52 endif
1.53 @@ -548,7 +537,7 @@
1.54 "
1.55
1.56 ################################################################
1.57 -# Source and binary plug bundling
1.58 +# Source bundling
1.59 ################################################################
1.60 ifeq ($(BUNDLE_RULES_AVAILABLE), true)
1.61 include $(BUNDLE_RULES)
