diff options
Diffstat (limited to 'Config.kmk')
| -rw-r--r-- | Config.kmk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Config.kmk b/Config.kmk index ffd0979d4..bf989666e 100644 --- a/Config.kmk +++ b/Config.kmk @@ -154,7 +154,7 @@ VBOX_VERSION_MINOR = 0 # This is the current build number. It should be increased every time we publish a # new build. The define is available in every source file. Only even build numbers # will be published, odd numbers are set during development. -VBOX_VERSION_BUILD = 8 +VBOX_VERSION_BUILD = 10 # Full version string (may include more than just x.y.z, but no spaces or other problematic chars). VBOX_VERSION_STRING = $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) # Force the additions.sh script to get an exact additions build when we're doing the release. @@ -254,6 +254,8 @@ VBOX_WITH_DOCS = 1 #VBOX_WITH_DOCS_FROM_BUILD_SERVER = 1 # Include documentation in the package VBOX_WITH_DOCS_PACKING = 1 +# Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM) +VBOX_WITH_DOCS_CHM = 1 # Don't bother with documentation, overrides VBOX_WITH_DOCS. # This is not used by makefiles, only Config.kmk, see below. #VBOX_WITHOUT_DOCS = 1 @@ -1356,7 +1358,7 @@ VBOX_PATH_MSITRAN ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiTran.Exe VBOX_PATH_MSIDB ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiDb.Exe VBOX_PATH_WISUBSTG ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSubStg.vbs VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSumInf.vbs -VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1 +VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1-r2 VBOX_PATH_CABSDK ?= $(PATH_DEVTOOLS)/win.x86/cabsdk/r1 VBOX_PATH_MAKECAB ?= $(VBOX_PATH_CABSDK)/BIN/MAKECAB.EXE @@ -3787,7 +3789,7 @@ endif SVN ?= svn$(HOSTSUFF_EXE) VBOX_SVN_REV_KMK = $(PATH_OUT)/revision.kmk ifndef VBOX_SVN_REV - VBOX_SVN_REV_FALLBACK := $(patsubst %:,, $Rev: 53138 $ ) + VBOX_SVN_REV_FALLBACK := $(patsubst %:,, $Rev: 54097 $ ) VBOX_SVN_DEP := $(wildcard $(PATH_ROOT)/.svn/entries) ifeq ($(which $(SVN)),) VBOX_SVN_DEP := |