LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1-stable' into 'stable'

This commit is contained in:
Nedko Arnaudov 2023-11-26 17:17:19 +02:00
parent 4ee9d9e8cd 36c489e43c
commit 4e73e70d8c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wscript
View File

@ -719,12 +719,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
@ -740,7 +741,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'