66 else |
66 else |
67 BUNDLE_VENDOR := $(COMPANY_NAME) |
67 BUNDLE_VENDOR := $(COMPANY_NAME) |
68 endif |
68 endif |
69 |
69 |
70 |
70 |
71 JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR) ! -type d) |
71 JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR)) |
72 JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR) ! -type d) |
72 JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR)) |
73 |
73 |
74 JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR),$(JDK_BUNDLE_DIR)/Home,$(JDK_FILE_LIST)) |
74 JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_BUNDLE_DIR)/Home/,$(JDK_FILE_LIST)) |
75 JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR),$(JRE_BUNDLE_DIR)/Home,$(JRE_FILE_LIST)) |
75 JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_BUNDLE_DIR)/Home/,$(JRE_FILE_LIST)) |
76 |
76 |
77 # The old builds implementation of this did not preserve symlinks so |
77 # The old builds implementation of this did not preserve symlinks so |
78 # make sure they are followed and the contents copied instead. |
78 # make sure they are followed and the contents copied instead. |
79 # To fix this, just replace copy with install-file macro. |
79 # To fix this, remove -L |
|
80 # Copy empty directories (jre/lib/applet). |
80 $(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/% |
81 $(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/% |
81 $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
82 $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
82 $(MKDIR) -p $(@D) |
83 $(MKDIR) -p $(@D) |
83 $(CP) -f -R -L '$<' '$@' |
84 if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi |
84 |
85 |
85 $(JRE_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/% |
86 $(JRE_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/% |
86 $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
87 $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
87 $(MKDIR) -p $(@D) |
88 $(MKDIR) -p $(@D) |
88 $(CP) -f -R -L '$<' '$@' |
89 if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi |
89 |
90 |
90 $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib: |
91 $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib: |
91 $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
92 $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
92 $(MKDIR) -p $(@D) |
93 $(MKDIR) -p $(@D) |
93 $(RM) $@ |
94 $(RM) $@ |