Changeset 45360 in vbox

Timestamp:

Apr 5, 2013 9:33:49 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84778

Message:

Makefile.kmk: drag in the ZIP tool unconditionally, avoids the complicated work of doing this only when absolutely necessary, and makes sure one can't forget it (like before, as additions needed it but didn't drag in the tool - which caused surprising error messages if one didn't fetch the docs package from the build server)

File:

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

trunk/Makefile.kmk

@@ -158 +158 @@
 
 
+# Below we might need TOOL_ZIP_UNPACK (for the additions/docs/efifw packages
+# from the build server), and it's not really worth the effort of dragging in
+# this tool only if absolutely needed.
+TOOL += ZIP
+
 #
 # For building the combined package, just get the additions .ISO
@@ -228 +233 @@
                 VirtualBox.chm UserManual.pdf \
                 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf))
-
-## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
-include $(KBUILD_PATH)/tools/ZIP.kmk
 
 $$(buildserver-docs_0_OUTDIR)/unpacked.ts +| $(PATH_TARGET)/VirtualBox.chm $(PATH_TARGET)/UserManual.pdf \
@@ -278 +280 @@
         $(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp
    ## @todo rainy day: cleanup the output directory (zip contains lots more)
-
-   ## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
-   include $(KBUILD_PATH)/tools/ZIP.kmk
 
    $$(buildserver-efifw_0_OUTDIR)/unpacked.ts \