Changeset 67323 in vbox

Timestamp:

Jun 9, 2017 2:47:35 PM (8 years ago)

Author:

vboxsync

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

116035

Message:

unified 'zip' to 'VBOX_ZIP'

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• doc/manual/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/Makefile.kmk (modified) (1 diff)
• src/VBox/ValidationKit/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -1982 +1982 @@
  VBOX_MKISOFS  ?= mkisofs
 endif
+
+# zip
+VBOX_ZIP ?= zip$(HOSTSUFF_EXE)
 
 ifeq ($(KBUILD_TARGET),win)

trunk/doc/manual/Makefile.kmk

@@ -773 +773 @@
         $(call MSG_L1,Packing documentation $@)
         $(QUIET)$(RM) -f $@
-        $(QUIET)$(REDIRECT) -C $(PATH_STAGE_BIN) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^)
+        $(QUIET)$(REDIRECT) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -9 $@ $(notdir $^)
 
 endif # VBOX_WITH_DOCS_CHM
@@ -824 +824 @@
         $(call MSG_L1,Packing documentation $@)
         $(QUIET)$(RM) -f $@
-        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ -- zip$(HOSTSUFF_EXE) \
+        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ -- $(VBOX_ZIP) \
                 -9 -r $@ html-single html-chunks $(VBOX_MANUAL_PNG_FILES_en_US)
 

trunk/src/VBox/Additions/Makefile.kmk

@@ -337 +337 @@
         $(call MSG_L1,Zipping image $@)
         $(QUIET)$(RM) -f $@
-        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_ADDITIONS_ISO) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^)
+        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_ADDITIONS_ISO) -- $(VBOX_ZIP) -9 $@ $(notdir $^)
 
 # Alias for creating the iso.

trunk/src/VBox/Installer/Makefile.kmk

@@ -58 +58 @@
                  $(wildcard $(PATH_STAGE_BIN)/VirtualBoxSDK-*-r*.zip)
 
- VBOX_ZIP     ?= zip
 # @todo: wrong, it must depend on everything included in SDK
 $(VBOX_SDK_ZIP): \

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -104 +104 @@
         ,$(if-expr defined(VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch))\
                 ,$(NLTAB)$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/ \
-                        -- zip$(HOSTSUFF_EXE) -r9 $@ $(INST_VALIDATIONKIT) -x '*.pyc',)))
+                        -- $(VBOX_ZIP) -r9 $@ $(INST_VALIDATIONKIT) -x '*.pyc',)))
 
  #
@@ -119 +119 @@
         ,$(if-expr defined(VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch))\
                 ,$(NLTAB)$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/ \
-                        -- zip$(HOSTSUFF_EXE) -r9 $@ $(INST_TESTBOXSCRIPT) -x '*.pyc',)))
+                        -- $(VBOX_ZIP) -r9 $@ $(INST_TESTBOXSCRIPT) -x '*.pyc',)))
 
 endif # !VBOX_WITHOUT_VALIDATIONKIT_ZIP