Changeset 81610 in vbox for trunk

Timestamp:

Oct 31, 2019 4:50:28 PM (5 years ago)

Author:

vboxsync

Message:

Config.kmk, Version.kmk: Improve fallback revision guessing. Splitting off Version.kmk made it a lot less precise, which is fixed now.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• Version.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -7698 +7698 @@
 # tree to determine this it if .svn/wc.db or .svn/entries is found (the former
 # also up to two directory levels higher to allow for checkouts of the entire
-# repository), otherwise fall back on the Config.kmk revision.
+# repository), otherwise fall back on maximum value of Config.kmk and
+# Version.kmk revision.
 #
 # Makefile rules using this information shall list $(VBOX_SVN_REV_KMK) as a
@@ -7706 +7707 @@
 VBOX_SVN_REV_KMK        = $(PATH_OUT)/revision.kmk
 ifndef VBOX_SVN_REV
- VBOX_SVN_REV_FALLBACK := $(patsubst %:,,  $Rev$  )
+ VBOX_SVN_REV_CONFIG_FALLBACK := $(patsubst %:,,  $Rev$  )
+ VBOX_SVN_REV_FALLBACK := $(if-expr $(VBOX_SVN_REV_CONFIG_FALLBACK) > $(VBOX_SVN_REV_VERSION_FALLBACK),$(VBOX_SVN_REV_CONFIG_FALLBACK),$(VBOX_SVN_REV_VERSION_FALLBACK))
  VBOX_SVN_DEP          := $(firstword $(wildcard $(PATH_ROOT)/.svn/wc.db $(abspath $(PATH_ROOT)/../.svn/wc.db) $(abspath $(PATH_ROOT)/../../.svn/wc.db) $(PATH_ROOT)/.svn/entries))
  ifeq ($(which $(SVN)),)

trunk/Version.kmk

@@ -34 +34 @@
 # our numbering does not say this is a release build, by setting this non-empty.
 VBOX_RELEASE_EXACT_MATCH =
+
+# Fallback revision when there is no other source. See Config.kmk.
+VBOX_SVN_REV_VERSION_FALLBACK := $(patsubst %:,,  $Rev$  )