Mercurial > hg > openjdk > jdk8u > jdk
changeset 13086:d237c59d14e1 jdk8u181-b03
8197871: Support Derby connections
Reviewed-by: billyh, aefimov, erikj, rhalade
| author | asemenyuk |
|---|---|
| date | Thu, 29 Mar 2018 14:43:14 -0400 |
| parents | c63696447d6d |
| children | f1be70238ff6 |
| files | make/CompileDemos.gmk make/Images.gmk |
| diffstat | 2 files changed, 0 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileDemos.gmk Wed Mar 14 12:11:15 2018 +0000 +++ b/make/CompileDemos.gmk Thu Mar 29 14:43:14 2018 -0400 @@ -455,29 +455,6 @@ ################################################################################################## -ifndef OPENJDK - DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/db-derby-*-bin.zip) - - $(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE) - $(MKDIR) -p $(@D) - $(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo - $(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -q -o $< - $(MV) $(JDK_OUTPUTDIR)/demo/db-derby-*-bin/demo $(JDK_OUTPUTDIR)/demo/db - $(CD) $(JDK_OUTPUTDIR)/demo && $(RM) -r db-derby-*-bin - $(TOUCH) $@ - - # Copy this after the unzip above to avoid race with directory creation and mv command. - $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \ - $(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \ - | $(JDK_OUTPUTDIR)/demo/_the.db.unzipped - $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ - - BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html -endif - -################################################################################################## - all: $(BUILD_DEMOS) .PHONY: all
--- a/make/Images.gmk Wed Mar 14 12:11:15 2018 +0000 +++ b/make/Images.gmk Thu Mar 29 14:43:14 2018 -0400 @@ -542,37 +542,6 @@ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_SAMPLE_TARGETS))) ################################################################################ -# /db dir - -ifndef OPENJDK - $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/% - $(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<) - $(MKDIR) -p $(JDK_IMAGE_DIR)/db - cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x */index.html */KEYS */test/* *javadoc/* */docs/* */demo/* 2> /dev/null - cd $(JDK_IMAGE_DIR)/db && $(MV) db-derby-*-bin/* . && $(RM) -r db-derby-*-bin -ifneq ($(OPENJDK_TARGET_OS), windows) - $(RM) $(JDK_IMAGE_DIR)/db/bin/*.bat -endif - $(MKDIR) -p $(@D) - $(TOUCH) $@ - - $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html - $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' - $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ - - $(JDK_IMAGE_DIR)/db/3RDPARTY: $(JDK_TOPDIR)/src/closed/share/db/3RDPARTY - $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' - $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ - - JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%, $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped, \ - $(wildcard $(JDK_TOPDIR)/src/closed/share/db/db-derby-*-bin.zip)) \ - $(JDK_IMAGE_DIR)/db/README-JDK.html $(JDK_IMAGE_DIR)/db/3RDPARTY - -endif - -################################################################################ # /include dir $(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/include), \