--- a/jdk/make/common/shared/Defs.gmk Fri Dec 03 19:47:49 2010 -0800
+++ b/jdk/make/common/shared/Defs.gmk Fri Dec 03 21:37:05 2010 -0800
@@ -287,9 +287,12 @@
FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
else
BUILD_NUMBER = b00
- BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
- CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]')
- USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
+ ifndef USER_RELEASE_SUFFIX
+ BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
+ CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]')
+ USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
+ endif
+ export USER_RELEASE_SUFFIX
FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
endif
@@ -335,7 +338,9 @@
# Include any private definitions for this set of workspaces
_PRIVATE_DEFS_FILE=$(JDK_MAKE_SHARED_DIR)/PrivateDefs.gmk
-USING_PRIVATE_DEFS:=$(shell if [ -f $(_PRIVATE_DEFS_FILE) ]; then echo true; else echo false; fi)
+ifeq ($(USING_PRIVATE_DEFS),)
+ USING_PRIVATE_DEFS:=$(shell if [ -f $(_PRIVATE_DEFS_FILE) ]; then echo true; else echo false; fi)
+endif
ifeq ($(USING_PRIVATE_DEFS),true)
dummy:=$(warning "WARNING: Using definitions from $(_PRIVATE_DEFS_FILE)")
include $(_PRIVATE_DEFS_FILE)
--- a/jdk/make/common/shared/Sanity.gmk Fri Dec 03 19:47:49 2010 -0800
+++ b/jdk/make/common/shared/Sanity.gmk Fri Dec 03 21:37:05 2010 -0800
@@ -1389,20 +1389,21 @@
endif
sane-alsa-headers:
ifdef REQUIRED_ALSA_VERSION
- if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \
- $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
- " You have the following ALSA version installed: $${alsa_version) \n" \
- " Please reinstall ALSA (drivers and lib). You can download \n" \
- " the source distribution from http://www.alsa-project.org \n" \
- " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
- "" >> $(ERROR_FILE) ; \
- fi \
+ @if [ "$(ALSA_CHECK)" != "missing" ] ; then \
+ if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \
+ $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
+ " You have the following ALSA version installed: $${alsa_version} \n" \
+ " Please reinstall ALSA (drivers and lib). You can download \n" \
+ " the source distribution from http://www.alsa-project.org \n" \
+ " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
+ "" >> $(ERROR_FILE) ; \
+ fi ; \
else \
- $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
- " Please install ALSA (drivers and lib). You can download the \n" \
- " source distribution from http://www.alsa-project.org or go to \n" \
- " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
- "" >> $(ERROR_FILE) ; \
+ $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
+ " Please install ALSA (drivers and lib). You can download the \n" \
+ " source distribution from http://www.alsa-project.org or go to \n" \
+ " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
+ "" >> $(ERROR_FILE) ; \
fi
endif
--- a/jdk/make/jprt.gmk Fri Dec 03 19:47:49 2010 -0800
+++ b/jdk/make/jprt.gmk Fri Dec 03 21:37:05 2010 -0800
@@ -26,9 +26,6 @@
# JPRT rule to build this workspace
JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-ifdef JPRT_BUILD_VERSION
- MILESTONE=$(JPRT_BUILD_VERSION)
-endif
jprt_build_product: all images
( $(CD) $(OUTPUTDIR)/j2sdk-image && \