# HG changeset patch
# User ohair
# Date 1296668329 28800
# Node ID 57d702105b23fb90e40beaf00f8f8aeae5e249e7
# Parent 61f181d43d9a1bd0ae29234f52a6e39b924bf192# Parent a7a4f6db294dbe5d079df5be239c1ce98f0aa3e5
Merge
diff -r 61f181d43d9a -r 57d702105b23 Makefile
--- a/Makefile Fri Jan 28 10:00:12 2011 -0800
+++ b/Makefile Wed Feb 02 09:38:49 2011 -0800
@@ -29,15 +29,6 @@
TOPDIR:=.
endif
-# Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true)
-OPENJDK_SOURCETREE=$(TOPDIR)/openjdk
-OPENJDK_BUILDDIR:=$(shell \
- if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \
- echo "$(OPENJDK_SOURCETREE)"; \
- else \
- echo "."; \
- fi)
-
ifndef JDK_TOPDIR
JDK_TOPDIR=$(TOPDIR)/jdk
endif
@@ -70,7 +61,7 @@
all::
@$(START_ECHO)
-all:: openjdk_check sanity
+all:: sanity
ifeq ($(SKIP_FASTDEBUG_BUILD), false)
all:: fastdebug_build
@@ -80,10 +71,6 @@
all:: debug_build
endif
-ifneq ($(SKIP_OPENJDK_BUILD), true)
- all:: openjdk_build
-endif
-
all:: all_product_build
all::
@@ -267,81 +254,6 @@
debug_build:: build_debug_image
fastdebug_build:: build_fastdebug_image
-# Check on whether we really can build the openjdk, need source etc.
-openjdk_check: FRC
-ifneq ($(SKIP_OPENJDK_BUILD), true)
- @$(ECHO) " "
- @$(ECHO) "================================================="
- @if [ ! -r $(OPENJDK_BUILDDIR)/Makefile ] ; then \
- $(ECHO) "ERROR: No openjdk source tree available at: $(OPENJDK_BUILDDIR)"; \
- exit 1; \
- else \
- $(ECHO) "OpenJDK will be built after JDK is built"; \
- $(ECHO) " OPENJDK_BUILDDIR=$(OPENJDK_BUILDDIR)"; \
- fi
- @$(ECHO) "================================================="
- @$(ECHO) " "
-endif
-
-# If we have bundle rules, we have a chance here to do a complete cycle
-# build, of production and open build.
-# FIXUP: We should create the openjdk source bundle and build that?
-# But how do we reliable create or get at a formal openjdk source tree?
-# The one we have needs to be trimmed of built bits and closed dirs.
-# The repositories might not be available.
-# The openjdk source bundle is probably not available.
-
-ifneq ($(SKIP_OPENJDK_BUILD), true)
- ifeq ($(BUILD_JDK), true)
- ifeq ($(BUNDLE_RULES_AVAILABLE), true)
-
-OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output
-OPENJDK_BUILD_NAME \
- = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
-OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip
-BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image
-ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
- OPENJDK_BOOTDIR=$(BOOTDIR)
- OPENJDK_IMPORTJDK=$(JDK_IMPORT_PATH)
-else
- OPENJDK_BOOTDIR=$(BUILT_IMAGE)
- OPENJDK_IMPORTJDK=$(BUILT_IMAGE)
-endif
-
-openjdk_build:
- @$(START_ECHO)
- @$(ECHO) " "
- @$(ECHO) "================================================="
- @$(ECHO) "Starting openjdk build"
- @$(ECHO) " Using: ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR)"
- @$(ECHO) "================================================="
- @$(ECHO) " "
- $(RM) -r $(OPENJDK_OUTPUTDIR)
- $(MKDIR) -p $(OPENJDK_OUTPUTDIR)
- ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \
- OPENJDK=true \
- GENERATE_DOCS=false \
- ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
- ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
- ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \
- ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \
- product_build )
- $(RM) $(OPENJDK_BUILD_BINARY_ZIP)
- ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \
- $(ZIPEXE) -q -r $(OPENJDK_BUILD_BINARY_ZIP) .)
- $(RM) -r $(OPENJDK_OUTPUTDIR)
- @$(ECHO) " "
- @$(ECHO) "================================================="
- @$(ECHO) "Finished openjdk build"
- @$(ECHO) " Binary Bundle: $(OPENJDK_BUILD_BINARY_ZIP)"
- @$(ECHO) "================================================="
- @$(ECHO) " "
- @$(FINISH_ECHO)
-
- endif
- endif
-endif
-
clobber::
$(RM) -r $(OUTPUTDIR)/*
$(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/*
@@ -448,7 +360,6 @@
DEVTOOLS_PATH.desc = Directory containing zip and gnumake
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
DXSDK_PATH.desc = Root directory of DirectX SDK
-MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll
# Make variables to print out (description and value)
VARIABLE_PRINTVAL_LIST += \
@@ -477,12 +388,10 @@
ifeq ($(PLATFORM), windows)
VARIABLE_PRINTVAL_LIST += \
- DXSDK_PATH \
- MSVCRT_DLL_PATH
+ DXSDK_PATH
VARIABLE_CHECKDIR_LIST += \
- DXSDK_PATH \
- MSVCRT_DLL_PATH
+ DXSDK_PATH
endif
diff -r 61f181d43d9a -r 57d702105b23 README-builds.html
--- a/README-builds.html Fri Jan 28 10:00:12 2011 -0800
+++ b/README-builds.html Wed Feb 02 09:38:49 2011 -0800
@@ -1414,14 +1414,14 @@
but it's normally found via the DirectX environment variable
DXSDK_DIR.
- MSVCR100.DLL
+ MSVCR100.DLL
The OpenJDK build requires access to a redistributable
MSVCR100.DLL.
This is usually picked up automatically from the redist
directories of Visual Studio 2010.
If this cannot be found set the
- ALT_MSVCRT_DLL_PATH
+ ALT_MSVCRNN_DLL_PATH
variable to the location of this file.
@@ -1671,15 +1671,10 @@
variable DXSDK_DIR,
failing that, look in C:/DXSDK.
- ALT_MSVCRT_DLL_PATH
-
- The location of the
- MSVCRT.DLL.
-
ALT_MSVCRNN_DLL_PATH
The location of the
- MSVCR100.DLL.
+ MSVCR100.DLL.
diff -r 61f181d43d9a -r 57d702105b23 make/Defs-internal.gmk
--- a/make/Defs-internal.gmk Fri Jan 28 10:00:12 2011 -0800
+++ b/make/Defs-internal.gmk Wed Feb 02 09:38:49 2011 -0800
@@ -147,7 +147,7 @@
endif
-# Do we build the source and openjdk binary plug bundles?
+# Do we build the source bundles?
BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
ifeq ($(SKIP_BUNDLES_BUILD), true)
BUNDLE_RULES_AVAILABLE := false
@@ -171,7 +171,6 @@
ifndef SKIP_COMPARE_IMAGES
SKIP_COMPARE_IMAGES = true
endif
- SKIP_OPENJDK_BUILD = true
else
# Various non-OPENJDK reasons to NOT build the deploy repository
@@ -187,21 +186,11 @@
endif
endif
- ifndef SKIP_OPENJDK_BUILD
- #SKIP_OPENJDK_BUILD = false
- # Until 6675289 is resolved, or this feature is removed.
- SKIP_OPENJDK_BUILD = true
- endif
endif
ifndef SKIP_PRODUCT_BUILD
SKIP_PRODUCT_BUILD = false
endif
-# Solaris 64 bit builds are not complete enough to ever do this
-ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
- SKIP_OPENJDK_BUILD = true
-endif
-
# Many reasons why we would want to skip the comparison to previous jdk
ifndef SKIP_COMPARE_IMAGES
ifeq ($(BUILD_JDK), false)