changeset 1815:913b44746bd8

8197871: Support Derby connections Reviewed-by: billyh, aefimov, erikj, rhalade
author asemenyuk
date Thu, 29 Mar 2018 14:43:14 -0400
parents 79b17290a53c
children 0babb64bcbaa
files make/common/Release.gmk
diffstat 1 files changed, 0 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Release.gmk	Thu May 17 13:54:02 2018 +0300
+++ b/make/common/Release.gmk	Thu Mar 29 14:43:14 2018 -0400
@@ -885,28 +885,8 @@
 			  initial-image-jdk64-bindemos \
 			  $(JDK_LICENSES) $(JDK64_LICENSES)
 
-# DB files to add
-ifdef OPENJDK
-
-initial-image-jdk-db:
-
-else
-
-# Create the list of db *.zip files to bundle with jdk
-ABS_DB_PATH  :=$(call FullPath,$(CLOSED_SHARE_SRC)/db)
-DB_ZIP_LIST = $(shell $(LS) $(ABS_DB_PATH)/*.zip 2>/dev/null)
-
-initial-image-jdk-db: $(DB_ZIP_LIST)
-	$(MKDIR) -p $(JDK_IMAGE_DIR)/db
-	for d in $(DB_ZIP_LIST); do \
-          ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \
-	done
-
-endif
-
 # Standard jdk image
 initial-image-jdk:: initial-image-jdk-setup \
-		    initial-image-jdk-db \
 		    $(JDK_LICENSES) $(JDK_DOCFILES)
 	$(MKDIR) -p $(JDK_IMAGE_DIR)/lib
 	@#
@@ -1244,7 +1224,6 @@
 	initial-image-jre initial-image-jdk \
 	initial-image-jre-sol64 initial-image-jdk-sol64 \
         initial-image-jdk-setup \
-	initial-image-jdk-db \
         initial-image-jdk64-bindemos \
         initial-image-jre-setup \
 	trim-image-jre trim-image-jdk \