- Timestamp:
- Aug 9, 2020 2:12:34 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
Makefile.kmk (modified) (5 diffs)
-
doc/manual/Config.kmk (modified) (1 diff)
-
doc/manual/Makefile.kmk (modified) (1 diff)
-
src/VBox/Installer/solaris/Makefile.kmk (modified) (3 diffs)
-
src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.kmk
r85048 r85654 340 340 $(APPEND) -t $@ "done" 341 341 342 $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $( PATH_DEVTOOLS)/bin/additions.sh | $$(dir $$@)342 $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/additions.sh | $$(dir $$@) 343 343 $(RM) -f -- "$@" "[email protected]" 344 $(SHELL) $( PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)344 $(SHELL) $(KBUILD_DEVTOOLS)/bin/additions.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,) 345 345 $(MV) -f -- "[email protected]" "$@" 346 346 … … 378 378 $(APPEND) -t $@ "done" 379 379 380 $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip: $(VBOX_SVN_REV_KMK) $( PATH_DEVTOOLS)/bin/documentation.sh | $$(dir $$@)380 $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip: $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/documentation.sh | $$(dir $$@) 381 381 $(RM) -f -- "$@" "[email protected]" 382 $(SHELL) $( PATH_DEVTOOLS)/bin/documentation.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)382 $(SHELL) $(KBUILD_DEVTOOLS)/bin/documentation.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,) 383 383 $(MV) -f -- "[email protected]" "$@" 384 384 … … 439 439 440 440 $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip: \ 441 $(VBOX_SVN_REV_KMK) $( PATH_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)441 $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@) 442 442 $(RM) -f -- "$@" "[email protected]" 443 $(SHELL) $( PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)443 $(SHELL) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,) 444 444 $(MV) -f -- "[email protected]" "$@" 445 445 … … 475 475 476 476 $$(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack: \ 477 $(VBOX_SVN_REV_KMK) $( PATH_DEVTOOLS)/bin/extpacks.sh | $$(dir $$@)477 $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/extpacks.sh | $$(dir $$@) 478 478 $(RM) -f -- "[email protected]" "$@" 479 $(SHELL) $( PATH_DEVTOOLS)/bin/extpacks.sh --cmd fetch --filename "[email protected]" --vbox-version "$(VBOX_VERSION_STRING_NO_PUB)" \479 $(SHELL) $(KBUILD_DEVTOOLS)/bin/extpacks.sh --cmd fetch --filename "[email protected]" --vbox-version "$(VBOX_VERSION_STRING_NO_PUB)" \ 480 480 $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,) 481 481 $(MV) -f -- "[email protected]" "$@" … … 1954 1954 $(QUIET)$(RM) -Rf $(wildcard $(PATH_OUT)/vbox-ose-snap-*) $(wildcard $(PATH_OUT)/VirtualBox-*.tar.bz2) 1955 1955 $(call MSG_L1,Making OSE snapshot at $(PATH_OUT)/vbox-ose-snap-$(VBOX_VERSION_STRING)) 1956 $( PATH_DEVTOOLS)/bin/ose-snapshot.sh $(PATH_OUT)/vbox-ose-snap-$(VBOX_VERSION_STRING)1956 $(KBUILD_DEVTOOLS)/bin/ose-snapshot.sh $(PATH_OUT)/vbox-ose-snap-$(VBOX_VERSION_STRING) 1957 1957 $(call MSG_L1,Creating OSE tarball $(PATH_OUT)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tar.bz2) 1958 1958 $(REDIRECT) -C $(PATH_OUT)/vbox-ose-snap-$(VBOX_VERSION_STRING) -- \ 1959 $( PATH_DEVTOOLS)/bin/ose-tarball.sh $(PATH_OUT)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tar.bz21959 $(KBUILD_DEVTOOLS)/bin/ose-tarball.sh $(PATH_OUT)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tar.bz2 1960 1960 else 1961 1961 $(QUIET)$(RM) $(wildcard $(PATH_OUT)/VirtualBox-*.tar.bz2) 1962 1962 $(call MSG_L1,Creating OSE tarball $(PATH_OUT)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tar.bz2) 1963 1963 $(REDIRECT) -C $(PATH_ROOT) -- \ 1964 $( PATH_DEVTOOLS)/bin/ose-tarball.sh $(PATH_OUT)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tar.bz21964 $(KBUILD_DEVTOOLS)/bin/ose-tarball.sh $(PATH_OUT)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tar.bz2 1965 1965 endif 1966 1966 -
trunk/doc/manual/Config.kmk
r84692 r85654 80 80 ifndef VBOX_OSE 81 81 # use docbook from our tools directory 82 VBOX_PATH_DOCBOOK ?= $( PATH_DEVTOOLS)/common/DocBook/v1.69.183 VBOX_PATH_DOCBOOK_DTD ?= $( PATH_DEVTOOLS)/common/docbook-xml/v4.582 VBOX_PATH_DOCBOOK ?= $(KBUILD_DEVTOOLS)/common/DocBook/v1.69.1 83 VBOX_PATH_DOCBOOK_DTD ?= $(KBUILD_DEVTOOLS)/common/docbook-xml/v4.5 84 84 else 85 85 # use docbook of the build host -
trunk/doc/manual/Makefile.kmk
r82968 r85654 96 96 ifeq ($(KBUILD_HOST),win) 97 97 ifndef VBOX_PDFLATEX 98 VBOX_PDFLATEX := $(firstword $(rsort $(wildcard $( PATH_DEVTOOLS)/win.x86/miktex-portable/*/miktex/bin/pdflatex.exe)))98 VBOX_PDFLATEX := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/miktex-portable/*/miktex/bin/pdflatex.exe))) 99 99 ifneq ($(VBOX_PDFLATEX),) 100 100 VBOX_PDFLATEX_CMD = $(VBOX_PDFLATEX) -halt-on-error -interaction $(VBOX_PDFLATEX_INTERACTION) -
trunk/src/VBox/Installer/solaris/Makefile.kmk
r84944 r85654 517 517 include $(FILE_KBUILD_SUB_FOOTER) 518 518 519 PATH_S10LIBS.x86 := $(sort $(wildcard $( PATH_DEVTOOLS)/solaris.x86/s10libs/v*))519 PATH_S10LIBS.x86 := $(sort $(wildcard $(KBUILD_DEVTOOLS)/solaris.x86/s10libs/v*)) 520 520 ifneq ($(PATH_S10LIBS.x86),) 521 521 PATH_S10LIBS.x86 := $(call lastword,$(PATH_S10LIBS.x86)) 522 522 endif 523 PATH_S10LIBS.amd64 := $(sort $(wildcard $( PATH_DEVTOOLS)/solaris.amd64/s10libs/v*))523 PATH_S10LIBS.amd64 := $(sort $(wildcard $(KBUILD_DEVTOOLS)/solaris.amd64/s10libs/v*)) 524 524 ifneq ($(PATH_S10LIBS.amd64),) 525 525 PATH_S10LIBS.amd64 := $(call lastword,$(PATH_S10LIBS.amd64)) … … 539 539 \ 540 540 $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING),$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso,) \ 541 $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL), $( PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \541 $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL), $(KBUILD_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \ 542 542 \ 543 543 $(if $(VBOX_OSE),,$(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6, \ … … 616 616 617 617 $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL) \ 618 ,$(INSTALL) -s -m 0644 $( PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2 \618 ,$(INSTALL) -s -m 0644 $(KBUILD_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2 \ 619 619 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/libSDL-1.2.so.0,) 620 620 -
trunk/src/libs/xpcom18a4/Makefile.kmk
r84940 r85654 448 448 # glib and libIDL needed by XPCOM on OS/2. 449 449 ifeq ($(VBOX_PATH_GLIB),) 450 VBOX_PATH_GLIB := $(lastword $(sort $(wildcard $( PATH_DEVTOOLS_TRG)/glibidl/*/glibidl/gcc335)))450 VBOX_PATH_GLIB := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/glibidl/*/glibidl/gcc335))) 451 451 endif 452 452 VBOX_PATH_LIBIDL ?= $(VBOX_PATH_GLIB)
Note:
See TracChangeset
for help on using the changeset viewer.
