Changeset 68940 in vbox

Timestamp:

Sep 29, 2017 5:00:20 PM (7 years ago)

Author:

vboxsync

Message:

Config.kmk: split out release verion information into Version.kmk.
bugref:9009: Release process: improvements

This change moves the main version-related variable in Config.kmk into a new,
separate configuration file. It also changes the VBOX_VERSION_STRING logic
to hard code the current way of creating it (major.minor.build[_prerelease]-
[publisher]). VBOX_RELEASE_EXACT_MATCH is currently set in Version.kmk to
force a consistent build when the prelease variable is set. Please feel
free to introduce something nicer if this troubles you.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Version.kmk (added)

trunk/Config.kmk

@@ -199 +199 @@
 endif
 
-
-#
-# The VirtualBox version.
-#
-
-# Major version.
-VBOX_VERSION_MAJOR = 5
-# Minor version.
-VBOX_VERSION_MINOR = 2
-# 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 = 0
+include $(PATH_ROOT)/Version.kmk
+
 # The raw version string. This *must not* contain any other information/fields than
 # major, minor and build revision (as it is now) -- also will be used for host/guest version
 # comparison.
 VBOX_VERSION_STRING_RAW = $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
-# This can be overridden in LocalConfig.kmk or elsewhere.
-# For the convension, see checks near the end of Config.kmk.
-VBOX_BUILD_PUBLISHER =
 # Full version string (may include more than just x.y.z, but no spaces or other problematic chars).
 # Note! The BETA[n],ALPHA[n],RC[n] indicators should be inserted before the
 #       publisher so that RTStrVersionCompare have a chance of comparing
 #       prerelease from different publishers correctly.
+VBOX_VERSION_SUFFIX=$(ifeq $(VBOX_VERSION_PRERELEASE),,,_$(VBOX_VERSION_PRERELEASE))
 VBOX_VERSION_STRING = $(VBOX_VERSION_STRING_RAW)_RC1$(VBOX_BUILD_PUBLISHER)
-# Just the BETA[n],ALPHA[n],RC[n] indicators. Set to empty string for release.
-VBOX_VERSION_PRERELEASE = RC1
-# Force a release-type build with exactly matching Additions etc, even if
-# our numbering does not say this is a release build.
-VBOX_RELEASE_EXACT_MATCH =
 
 # Force the additions.sh script to get an exact additions build when we're doing the release.
 ifeq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
-  VBOX_RELEASE_EXACT_MATCH=1
+  ifeq ($VBOX_VERSION_PRERELEASE),)
+    VBOX_RELEASE_EXACT_MATCH=1
+  endif
 endif
 ifneq ($(VBOX_RELEASE_EXACT_MATCH),)
-# export VBOX_ADDITIONS_SH_MODE     = release
-# export VBOX_DOCUMENTATION_SH_MODE = release
-# export VBOX_EFI_SH_MODE           = release
-# export VBOX_EXTPACKS_SH_MODE      = release
+ export VBOX_ADDITIONS_SH_MODE     = release
+ export VBOX_DOCUMENTATION_SH_MODE = release
+ export VBOX_EFI_SH_MODE           = release
+ export VBOX_EXTPACKS_SH_MODE      = release
 endif