Merge branch 'stable' into 'main'

LADI · Nov 26, 2023 · 37d90eb · 37d90eb
2 parents ad9f04a + 4e73e70
commit 37d90eb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/wscript b/wscript
@@ -654,12 +654,13 @@ class ladish_dist(Scripting.Dist):
     fun = 'dist'
 
     def __init__(self):
-        Dist.__init__(self)
+        Scripting.Dist.__init__(self)
         if Options.options.distname:
             self.base_name = Options.options.distname
         else:
             try:
-                self.base_name = self.cmd_and_log("LANG= git describe --tags", quiet=Context.BOTH).splitlines()[0]
+                sha = self.cmd_and_log("LANG= git rev-parse --short HEAD", quiet=Context.BOTH).splitlines()[0]
+                self.base_name = APPNAME + '-' + VERSION + "-g" + sha
             except:
                 self.base_name = APPNAME + '-' + VERSION
         self.base_name += Options.options.distsuffix
@@ -675,7 +676,7 @@ class ladish_dist(Scripting.Dist):
         return self.base_name
 
     def get_excl(self):
-        excl = Dist.get_excl(self)
+        excl = Scripting.Dist.get_excl(self)
 
         excl += ' .gitmodules'
         excl += ' GTAGS'