xnu-4570.51.1.tar.gz

[apple/xnu.git] / config / newvers.pl

diff --git a/config/newvers.pl b/config/newvers.pl
index 7b41feac448b2b21a404d0de1bbfe4a20ee2e307..f093b3378e14bffd0dea991b384d9034fe7b2488 100755 (executable)
--- a/config/newvers.pl
+++ b/config/newvers.pl
@@ -96,16 +96,35 @@ my $RC_STRING = $ENV{'RC_ProjectNameAndSourceVersion'} . "~" . $ENV{'RC_ProjectB
 # need to synthesize the directory name to be more interesting.
 #
 
 # need to synthesize the directory name to be more interesting.
 #
 

+sub describe {
+  my ($basename) = @_;
+
+  # get a git tag if we can
+  my $tag = `git describe --dirty 2>/dev/null`;
+  chomp $tag;
+  if ($? != 0 or $tag !~ /^xnu-([^\s\n]+)$/) {
+    return $basename;
+  }
+
+  # If basename is just 'xnu' then replace it with the tag.  Otherwise add
+  # the tag in brackets.
+  if ($basename eq 'xnu') {
+    return $tag
+  } else {
+    return "${basename}[$tag]"
+  }
+}
+

 if ($BUILD_OBJPATH =~ m,^$BUILD_SRCROOT/(.*)$,) {
 if ($BUILD_OBJPATH =~ m,^$BUILD_SRCROOT/(.*)$,) {

-    $BUILD_OBJROOT = basename($BUILD_SRCROOT) . "/" . $1;
+    $BUILD_OBJROOT = describe(basename($BUILD_SRCROOT)) . "/" . $1;

 } elsif ($BUILD_OBJPATH =~ m,^$BUILD_OBJROOT/(.*)$,) {
 } elsif ($BUILD_OBJPATH =~ m,^$BUILD_OBJROOT/(.*)$,) {

-    if (defined($RC_STRING)) {
+  if (defined($RC_STRING)) {

        $BUILD_OBJROOT = $RC_STRING . "/" . $1;
        $BUILD_OBJROOT = $RC_STRING . "/" . $1;

-    } else {
-       $BUILD_OBJROOT = basename($BUILD_OBJROOT) . "/" . $1;
-    }
+  } else {
+       $BUILD_OBJROOT = describe(basename($BUILD_OBJROOT)) . "/" . $1;
+  }

 } else {
 } else {

-    # Use original OBJROOT
+  # Use original OBJROOT

 }
 
 my $rawvers = &ReadFile($versfile);
 }
 
 my $rawvers = &ReadFile($versfile);