Changeset 109228 in vbox

Timestamp:

May 12, 2025 4:43:20 PM (11 days ago)

Author:

vboxsync

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

168812

Message:

Config.kmk,configure: Attempt at getting the svn revision from a git commit log in case the source code is from a git repository, bugref:10900

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• configure (modified) (1 diff)

trunk/Config.kmk

@@ -9402 +9402 @@
 #
 SVN                    ?= svn$(HOSTSUFF_EXE)
+GIT                    ?= git$(HOSTSUFF_EXE)
 VBOX_SVN_REV_KMK        = $(PATH_OUT)/revision.kmk
 ifndef VBOX_SVN_REV
@@ -9407 +9408 @@
  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))
+ VBOX_GIT_DEP          := $(firstword $(wildcard $(PATH_ROOT)/.git/config $(abspath $(PATH_ROOT)/../.git/config) $(abspath $(PATH_ROOT)/../../.git/config)))
  ifeq ($(which $(SVN)),)
   VBOX_SVN_DEP         :=
  endif
+ ifeq ($(which $(GIT)),)
+  VBOX_GIT_DEP         :=
+ endif
+
+ ifneq ($(VBOX_GIT_DEP),)
+  #
+  # VBOX_SVN_REV_CONFIG_FALLBACK is not properly populated for a git checkout,
+  # as the $Rev$ is not expanded, so we have to set it based on the information in the repo.
+  #
+  VBOX_SVN_REV_FALLBACK := $(shell $(GIT) log -1 $(PATH_ROOT)/Config.kmk | $(SED) -e 's/^[ \t]*//' -e '/svn:sync-xref-src-repo-rev\: r/!d' -e 's/svn:sync-xref-src-repo-rev\: r*//; t a; :a q')
+ endif
 
  # Rule for generating a timestamp and updating the real thing on change.
- $(VBOX_SVN_REV_KMK).ts +| $(VBOX_SVN_REV_KMK): $(if $(VBOX_SVN_DEP), $(VBOX_SVN_DEP), $(PATH_ROOT)/Config.kmk)
+ $(VBOX_SVN_REV_KMK).ts +| $(VBOX_SVN_REV_KMK): $(if $(VBOX_SVN_DEP), $(VBOX_SVN_DEP), $(if $(VBOX_GIT_DEP), $(VBOX_GIT_DEP), $(PATH_ROOT)/Config.kmk)) 
         $(call MSG_GENERATE,,$(VBOX_SVN_REV_KMK))
         $(QUIET)$(RM) -f $@ [email protected]
@@ -9423 +9436 @@
         $(QUIET)$(RM) -f [email protected]
  else
-        $(QUIET)$(APPEND) $@ 'export VBOX_SVN_REV=$(VBOX_SVN_REV_FALLBACK)'
+  ifneq ($(VBOX_GIT_DEP),)
+        -$(REDIRECT) -E 'LC_ALL=C' -wo [email protected] -- $(GIT) log -1 $(PATH_ROOT)
+        $(SED) -e 's/^[ \t]*//' -e '/svn:sync-xref-src-repo-rev\: r/!d' -e 's/svn:sync-xref-src-repo-rev\: r*/export VBOX_SVN_REV=/; t a; :a q' --output $@ [email protected]
+        $(QUIET)$(RM) -f [email protected]
+  else
+        $(QUIET)$(APPEND) $@ 'export VBOX_SVN_REV=$(VBOX_SVN_REV_FALLBACK)'
+  endif
  endif
         $(QUIET)$(CP) --changed -fv $@ $(VBOX_SVN_REV_KMK)

trunk/configure

@@ -175 +175 @@
 QT6MAJ=6
 QT6MIN=6
-KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
+#
+# Git submodules can only mirror whole repositories, not sub directories,
+# meaning that kBuild is residing a level deeper than with svn externals.
+#
+if [ -d "`cd \`dirname $0\`; pwd`/kBuild/kBuild" ]; then
+  KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild/kBuild"
+else
+  KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
+fi
 DEVDIR="`cd \`dirname $0\`; pwd`/tools"
 if [ -d "/lib/modules/`uname -r`/build" ]; then