equal
deleted
inserted
replaced
98 |
98 |
99 IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPORT_TARGET_BINARIES) |
99 IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPORT_TARGET_BINARIES) |
100 |
100 |
101 ####### |
101 ####### |
102 |
102 |
103 ifeq ($(OPENJDK_TARGET_OS),solaris) |
|
104 define do-install-file |
|
105 $(MKDIR) -p '$$(@D)' |
|
106 $(RM) '$$@' |
|
107 $(CP) -r -P '$$<' '$$(@D)' |
|
108 endef |
|
109 else ifeq ($(OPENJDK_TARGET_OS),macosx) |
|
110 define do-install-file |
|
111 $(MKDIR) -p '$$(@D)' |
|
112 $(RM) '$$@' |
|
113 $(CP) -pRP '$$<' '$$@' |
|
114 endef |
|
115 else |
|
116 define do-install-file |
|
117 $(MKDIR) -p '$$(@D)' |
|
118 $(RM) '$$@' |
|
119 $(CP) -P '$$<' '$$@' |
|
120 endef |
|
121 endif |
|
122 |
|
123 define CopyDir |
103 define CopyDir |
124 $1_SRC_FILES := $(shell $(FIND) $2 -type f -a \( -name DUMMY $(addprefix -o$(SPACE)-name$(SPACE),$4) \)) |
104 $1_SRC_FILES := $(shell $(FIND) $2 -type f -a \( -name DUMMY $(addprefix -o$(SPACE)-name$(SPACE),$4) \)) |
125 $1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES)) |
105 $1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES)) |
126 IMPORT_TARGET_FILES += $$($1_DST_FILES) |
106 IMPORT_TARGET_FILES += $$($1_DST_FILES) |
127 $3/% : $2/% |
107 $3/% : $2/% |
128 $(ECHO) $(LOG_INFO) Copying $$(@F) |
108 $(ECHO) $(LOG_INFO) Copying $$(@F) |
129 $(do-install-file) |
109 $$(install-file) |
130 endef |
110 endef |
131 |
111 |
132 ####### |
112 ####### |
133 |
113 |
134 # |
114 # |
153 IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) |
133 IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) |
154 ifneq (,$(JSIG_DEBUGINFO)) |
134 ifneq (,$(JSIG_DEBUGINFO)) |
155 IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) |
135 IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) |
156 endif |
136 endif |
157 endif |
137 endif |
|
138 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
|
139 IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) |
|
140 ifneq (,$(JSIG_DEBUGINFO)) |
|
141 IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) |
|
142 endif |
|
143 endif |
158 endif |
144 endif |
159 |
145 |
160 $(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) |
146 $(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) |
161 $(MKDIR) -p $(@D) |
147 $(MKDIR) -p $(@D) |
162 $(RM) $@ |
148 $(RM) $@ |
193 $(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo |
179 $(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo |
194 $(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo |
180 $(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo |
195 $(RM) $(basename $@).debuginfo |
181 $(RM) $(basename $@).debuginfo |
196 $(MV) $@.tmp $@ |
182 $(MV) $@.tmp $@ |
197 |
183 |
198 ####### |
184 $(INSTALL_LIBRARIES_HERE)/minimal/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) |
199 |
185 $(MKDIR) -p $(@D) |
200 ifeq ($(OPENJDK_TARGET_OS),solaris) |
186 $(RM) $@ |
201 define install-file |
187 $(LN) -s ../$(@F) $@ |
202 $(MKDIR) -p '$(@D)' |
188 |
203 $(RM) '$@' |
189 $(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo |
204 $(CP) -r -P '$<' '$(@D)' |
190 $(MKDIR) -p $(@D) |
205 endef |
191 $(RM) $@ |
206 else ifeq ($(OPENJDK_TARGET_OS),macosx) |
192 $(LN) -s ../$(@F) $@ |
207 define install-file |
193 |
208 $(MKDIR) -p '$(@D)' |
194 $(INSTALL_LIBRARIES_HERE)/minimal/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz |
209 $(RM) '$@' |
195 $(MKDIR) -p $(@D) |
210 $(CP) -pRP '$<' '$@' |
196 $(RM) $@ |
211 endef |
197 $(RM) $@.tmp $(basename $@).debuginfo |
212 else |
198 $(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo |
213 define install-file |
199 $(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo |
214 $(MKDIR) -p '$(@D)' |
200 $(RM) $(basename $@).debuginfo |
215 $(RM) '$@' |
201 $(MV) $@.tmp $@ |
216 $(CP) -P '$<' '$@' |
|
217 endef |
|
218 endif |
|
219 |
202 |
220 ####### |
203 ####### |
221 |
204 |
222 all: $(IMPORT_TARGET_FILES) |
205 all: $(IMPORT_TARGET_FILES) |