Changeset 3659 in vbox

Timestamp:

Jul 16, 2007 9:33:57 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22933

Message:

VBOX_SVN_REV now contains the best guess for the tree revision. Can be set in LocalConfig.kmk or AutoConfig.kmk.

File:

• trunk/Config.kmk (modified) (3 diffs, 1 prop)

trunk/Config.kmk

@@ -2440 +2440 @@
 # directory. If you don't run it there, you get a consistent sub-tree only.
 #
-VBOX_VERSION_STAMP = $(PATH_OUT)/version-stamp-$(VBOX_VERSION_STRING)
+VBOX_VERSION_STAMP  = $(PATH_OUT)/version-stamp-$(VBOX_VERSION_STRING)
 VBOX_VERSION_HEADER = $(PATH_OUT)/version-generated.h
 VBOX_VERSION_MK     = $(PATH_OUT)/version-generated.mk
@@ -2470 +2470 @@
 $(VBOX_VERSION_MK): $(VBOX_VERSION_STAMP)
         $(call MSG_GENERATE,,$@)
+        $(QUIET)$(RM) -f $@ [email protected]
         $(QUIET)$(MKDIR) -p $(@D)
-        $(QUIET)$(RM) -f $@ [email protected]
         $(QUIET)$(APPEND) [email protected] "VBOX_VERSION_MAJOR = $(VBOX_VERSION_MAJOR)"
         $(QUIET)$(APPEND) [email protected] "VBOX_VERSION_MINOR = $(VBOX_VERSION_MINOR)"
@@ -2487 +2487 @@
 
 #
+# Subversion tree revision.
+#
+# The VBOX_SVN_REV contains our best guess. Use svn info on the
+# root of the treeto determin this it if .svn/entries is found,
+# otherwise fall back on the Config.kmk revision.
+#
+ifndef VBOX_SVN_REV
+ VBOX_SVN_REV_KMK       = $(PATH_OUT)/revision.kmk
+ VBOX_SVN_REV_FALLBACK := $(patsubst %:,,  $Rev$  )
+ VBOX_SVN_DEP          := $(wildcard $(PATH_ROOT)/.svn/entries)
+
+# Rule for generating a timestamp and updating the real thing on change.
+ ifneq ($(VBOX_SVN_DEP),)
+$(VBOX_SVN_REV_KMK).ts: $(VBOX_SVN_DEP)
+ else
+$(VBOX_SVN_REV_KMK).ts: $(PATH_ROOT)/Config.kmk
+ endif
+        $(call MSG_GENERATE,,$(VBOX_SVN_REV_KMK))
+        $(QUIET)$(RM) -f $@
+        $(QUIET)$(MKDIR) -p $(@D)
+ ifneq ($(VBOX_SVN_DEP),)
+        $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(shell svn info $(PATH_ROOT) | $(SED) -e '/^Revision/!d'  -e "s/Revision\: *//")"
+ else
+        $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(VBOX_SVN_REV_FALLBACK)"
+ endif
+        $(QUIET)if test ! -f $(VBOX_SVN_REV_KMK) \
+        || test ! "`$(CAT_EXT) $@`" = "`$(CAT_EXT) $(VBOX_SVN_REV_KMK)`"; \
+        then \
+                $(RM_EXT) -f $(VBOX_SVN_REV_KMK); \
+                $(CP_EXT) -f $@ $(VBOX_SVN_REV_KMK) || exit 1; \
+                echo '* $(VBOX_SVN_REV_KMK) was updated:'; \
+        else \
+                echo '* $(VBOX_SVN_REV_KMK) was not changed:'; \
+        fi
+        $(QUIET)$(CAT_EXT) $(VBOX_SVN_REV_KMK)
+
+# Dependency on timestamp without any commands, so we
+# won't be bother if nothing changed.
+$(VBOX_SVN_REV_KMK): $(VBOX_SVN_REV_KMK).ts
+
+## @todo kBuild: Fix problem with using '$(VBOX_SVN_REV_KMK).ts +| $(VBOX_SVN_REV_KMK)' so the
+# problem with missing $(VBOX_SVN_REV_KMK) and not $(VBOX_SVN_REV_KMK).ts can be addressed
+
+## @todo kbuild: Need $(CMP)!
+
+ include $(VBOX_SVN_REV_KMK)
+endif
+
+
+#
 # Legacy.
 #