1.1 --- a/make/Makefile Fri Apr 11 09:56:35 2008 -0400
1.2 +++ b/make/Makefile Sun Apr 13 17:43:42 2008 -0400
1.3 @@ -85,6 +85,9 @@
1.4 C2_VM_TARGETS=product fastdebug optimized jvmg
1.5 KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
1.6
1.7 +# JDK directory list
1.8 +JDK_DIRS=bin include jre lib demo
1.9 +
1.10 all: all_product all_fastdebug
1.11 all_product: product product1 productkernel docs export_product
1.12 all_fastdebug: fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
1.13 @@ -341,7 +344,7 @@
1.14 $(RM) -r $(JDK_IMAGE_DIR)
1.15 $(MKDIR) -p $(JDK_IMAGE_DIR)
1.16 ($(CD) $(JDK_IMPORT_PATH) && \
1.17 - $(TAR) -cf - bin include jre lib) | \
1.18 + $(TAR) -cf - $(JDK_DIRS)) | \
1.19 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
1.20
1.21 copy_fastdebug_jdk:
1.22 @@ -349,11 +352,11 @@
1.23 $(MKDIR) -p $(JDK_IMAGE_DIR)/fastdebug
1.24 if [ -d $(JDK_IMPORT_PATH)/fastdebug ] ; then \
1.25 ($(CD) $(JDK_IMPORT_PATH)/fastdebug && \
1.26 - $(TAR) -cf - bin include jre lib) | \
1.27 + $(TAR) -cf - $(JDK_DIRS)) | \
1.28 ($(CD) $(JDK_IMAGE_DIR)/fastdebug && $(TAR) -xf -) ; \
1.29 else \
1.30 ($(CD) $(JDK_IMPORT_PATH) && \
1.31 - $(TAR) -cf - bin include jre lib) | \
1.32 + $(TAR) -cf - $(JDK_DIRS)) | \
1.33 ($(CD) $(JDK_IMAGE_DIR)/fastdebug && $(TAR) -xf -) ; \
1.34 fi
1.35
1.36 @@ -362,15 +365,15 @@
1.37 $(MKDIR) -p $(JDK_IMAGE_DIR)/debug
1.38 if [ -d $(JDK_IMPORT_PATH)/debug ] ; then \
1.39 ($(CD) $(JDK_IMPORT_PATH)/debug && \
1.40 - $(TAR) -cf - bin include jre lib) | \
1.41 + $(TAR) -cf - $(JDK_DIRS)) | \
1.42 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
1.43 elif [ -d $(JDK_IMPORT_PATH)/fastdebug ] ; then \
1.44 ($(CD) $(JDK_IMPORT_PATH)/fastdebug && \
1.45 - $(TAR) -cf - bin include jre lib) | \
1.46 + $(TAR) -cf - $(JDK_DIRS)) | \
1.47 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
1.48 else \
1.49 ($(CD) $(JDK_IMPORT_PATH) && \
1.50 - $(TAR) -cf - bin include jre lib) | \
1.51 + $(TAR) -cf - $(JDK_DIRS)) | \
1.52 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
1.53 fi
1.54
