Changeset 68790 in vbox for trunk/Makefile.kmk

Timestamp:

Sep 19, 2017 10:07:28 AM (7 years ago)

Author:

vboxsync

Message:

Makefile.kmk: On some of our build systems we need to get along with a really old unzip binary, so no -DD option. Instead adjust the timestamps to "now" with the append utility which in this context does the same as the Unix "touch" utility.

File:

• trunk/Makefile.kmk (modified) (3 diffs)

trunk/Makefile.kmk

@@ -285 +285 @@
                 $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip
         $(call MSG_L1,Unpacking additions archive)
-        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -DD -o $< -d $(PATH_TARGET)
+        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(PATH_TARGET)
+        $(APPEND) -n $(PATH_TARGET)/VBoxGuestAdditions.iso
         $(APPEND) -t $@ "done"
 
@@ -320 +321 @@
                 $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip
         $(call MSG_L1,Unpacking documentation)
-        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -DD -o $< -d $(PATH_TARGET)
+        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(PATH_TARGET)
+        $(APPEND) -n $(PATH_TARGET)/VirtualBox.chm
+        $(APPEND) -n $(PATH_TARGET)/UserManual.pdf
+        for i in $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_TARGET)/VirtualBox_$(f).chm $(PATH_TARGET)/UserManual_$(f).pdf); do $(APPEND) -n $$i; done
         $(APPEND) -t $@ "done"
 
@@ -374 +378 @@
                 $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip
         $(call MSG_L1,Unpacking EFI firmware)
-        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -DD -o $< -d $(buildserver-efifw_0_OUTDIR)
+        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(buildserver-efifw_0_OUTDIR)
         $(foreach arch, amd64 x86, \
                 $(NLTAB) $(QUIET)$(TEST) '!' -d $(dir $@)/$(arch) -- $(MKDIR_EXT) -- $(dir $@)/$(arch) \
                 $(foreach mod,$(VBOX_EFI_MODULES_FLAT) \
                 ,$(NLTAB) $(QUIET)$(TEST) '!' -f $(dir $@)/$(arch)/$(mod).pdb -- $(APPEND_EXT) $(dir $@)/$(arch)/$(mod).pdb ))
+        $(APPEND) -n $(buildserver-efifw_0_OUTDIR)/VBoxEFI32.fd
+        $(APPEND) -n $(buildserver-efifw_0_OUTDIR)/VBoxEFI64.fd
         $(APPEND) -t $@ "done"