equal
deleted
inserted
replaced
96 endif |
96 endif |
97 |
97 |
98 # Paths to these files we need |
98 # Paths to these files we need |
99 JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%) |
99 JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%) |
100 JRE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%) |
100 JRE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%) |
|
101 JDK_DEMOS_AND_SAMPLES_DOCFILES = $(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE $(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE |
101 |
102 |
102 # absolute directory names: note, these must exist prior to build |
103 # absolute directory names: note, these must exist prior to build |
103 # time - they are created in the main Makefile. |
104 # time - they are created in the main Makefile. |
104 JRE_IMAGE_BINDIR = $(JRE_IMAGE_DIR)/bin |
105 JRE_IMAGE_BINDIR = $(JRE_IMAGE_DIR)/bin |
105 |
106 |
480 $(CHMOD) 444 $@ |
481 $(CHMOD) 444 $@ |
481 endef |
482 endef |
482 |
483 |
483 # JDK files |
484 # JDK files |
484 $(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/% |
485 $(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/% |
|
486 $(process-doc-file) |
|
487 |
|
488 $(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE: $(SHARE_JDK_DOC_SRC)/DEMOS_LICENSE |
|
489 $(process-doc-file) |
|
490 |
|
491 $(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE: $(SHARE_JDK_DOC_SRC)/SAMPLES_LICENSE |
485 $(process-doc-file) |
492 $(process-doc-file) |
486 |
493 |
487 # JRE files |
494 # JRE files |
488 $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/% |
495 $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/% |
489 $(process-doc-file) |
496 $(process-doc-file) |
909 endif |
916 endif |
910 |
917 |
911 # Standard jdk image |
918 # Standard jdk image |
912 initial-image-jdk:: initial-image-jdk-setup \ |
919 initial-image-jdk:: initial-image-jdk-setup \ |
913 initial-image-jdk-db \ |
920 initial-image-jdk-db \ |
914 $(JDK_DOCFILES) |
921 $(JDK_DOCFILES) \ |
|
922 $(JDK_DEMOS_AND_SAMPLES_DOCFILES) |
915 $(MKDIR) $(JDK_IMAGE_DIR)/lib |
923 $(MKDIR) $(JDK_IMAGE_DIR)/lib |
916 @# |
924 @# |
917 @# Copy in the jars in lib that only belong in the JDK |
925 @# Copy in the jars in lib that only belong in the JDK |
918 @# |
926 @# |
919 for l in $(NOTJRELIBS); do \ |
927 for l in $(NOTJRELIBS); do \ |