Changeset 69114 in vbox for trunk

Timestamp:

Oct 17, 2017 4:51:13 PM (7 years ago)

Author:

vboxsync

Message:

Config.kmk: Fixed incomplete VBOX_VERSION_STRING change in r118207 when introducing Version.kmk where the VBOX_VERSION_PRERELEASE was ignored. Looks like VBOX_VERSION_SUFFIX was supposed to replace _RC1 in VBOX_VERSION_STRING, but it didn't and was wrong. Removed it to avoid unnecessary indirection.

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -209 +209 @@
 #       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)
+VBOX_VERSION_STRING = $(VBOX_VERSION_STRING_RAW)$(addprefix _,$(VBOX_VERSION_PRERELEASE))$(VBOX_BUILD_PUBLISHER)
 
 # Force the additions.sh script to get an exact additions build when we're doing the release.