Merge branch 'stable' into 'main'
This commit is contained in:
commit
37d90ebac4
7
wscript
7
wscript
|
@ -654,12 +654,13 @@ class ladish_dist(Scripting.Dist):
|
||||||
fun = 'dist'
|
fun = 'dist'
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
Dist.__init__(self)
|
Scripting.Dist.__init__(self)
|
||||||
if Options.options.distname:
|
if Options.options.distname:
|
||||||
self.base_name = Options.options.distname
|
self.base_name = Options.options.distname
|
||||||
else:
|
else:
|
||||||
try:
|
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:
|
except:
|
||||||
self.base_name = APPNAME + '-' + VERSION
|
self.base_name = APPNAME + '-' + VERSION
|
||||||
self.base_name += Options.options.distsuffix
|
self.base_name += Options.options.distsuffix
|
||||||
|
@ -675,7 +676,7 @@ class ladish_dist(Scripting.Dist):
|
||||||
return self.base_name
|
return self.base_name
|
||||||
|
|
||||||
def get_excl(self):
|
def get_excl(self):
|
||||||
excl = Dist.get_excl(self)
|
excl = Scripting.Dist.get_excl(self)
|
||||||
|
|
||||||
excl += ' .gitmodules'
|
excl += ' .gitmodules'
|
||||||
excl += ' GTAGS'
|
excl += ' GTAGS'
|
||||||
|
|
Loading…
Reference in New Issue