Changeset 69376 in vbox

Timestamp:

Oct 26, 2017 4:19:55 PM (7 years ago)

Author:

vboxsync

Message:

/Makefile.kmk: Added optional VBOX_USE_PROXY_FOR_BUILD_SERVER/--default-proxy tweak to the VBOX_WITH_XXXX_FROM_BUILD_SERVER fetch commands.

File:

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

trunk/Makefile.kmk

@@ -291 +291 @@
  $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/additions.sh | $$(dir $$@)
         $(RM) -f -- "$@" "$@.tmp"
-        $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename "$@.tmp"
+        $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename "$@.tmp" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
         $(MV) -f -- "$@.tmp" "$@"
 
@@ -329 +329 @@
 $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/documentation.sh | $$(dir $$@)
         $(RM) -f -- "$@" "$@.tmp"
-        $(SHELL) $(PATH_DEVTOOLS)/bin/documentation.sh --cmd fetch --filename "$@.tmp"
+        $(SHELL) $(PATH_DEVTOOLS)/bin/documentation.sh --cmd fetch --filename "$@.tmp" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
         $(MV) -f -- "$@.tmp" "$@"
 
@@ -390 +390 @@
                 $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
         $(RM) -f -- "$@" "$@.tmp"
-        $(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename "$@.tmp"
+        $(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename "$@.tmp" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
         $(MV) -f -- "$@.tmp" "$@"
 
@@ -426 +426 @@
                 $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/extpacks.sh | $$(dir $$@)
         $(RM) -f -- "$@.tmp" "$@"
-        $(SHELL) $(PATH_DEVTOOLS)/bin/extpacks.sh --cmd fetch --filename "$@.tmp" --vbox-version "$(VBOX_VERSION_STRING)"
+        $(SHELL) $(PATH_DEVTOOLS)/bin/extpacks.sh --cmd fetch --filename "$@.tmp" --vbox-version "$(VBOX_VERSION_STRING)" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
         $(MV) -f -- "$@.tmp" "$@"
         $(TOUCH) -- "$@"