mirror of
https://github.com/Klipper3d/klipper.git
synced 2025-07-07 15:07:33 -06:00
util: Fix versioning when gitdir is absent (#809)
The gitdir previously could be absent and produce a version of "" in spite of checks for it. Fixed. Parent directories with shlex-interpreted characters in their names could be misinterpreted. Removed shlex parsing. Packagers may want to remove the git history to slim down the package size, so add an option for using a file 'version' in the klippy directory to set version without using git. Signed-Off-By: Lucas Fink <software@lfcode.ca>
This commit is contained in:
parent
f57c29442c
commit
a33792f07e
4 changed files with 88 additions and 12 deletions
31
scripts/make_version.py
Normal file
31
scripts/make_version.py
Normal file
|
@ -0,0 +1,31 @@
|
|||
#!/usr/bin/env python2
|
||||
# Get the version number for klippy
|
||||
#
|
||||
# Copyright (C) 2018 Lucas Fink <software@lfcode.ca>
|
||||
#
|
||||
# This file may be distributed under the terms of the GNU GPLv3 license.
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import argparse
|
||||
import os
|
||||
import sys
|
||||
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__), '../klippy'))
|
||||
|
||||
import util
|
||||
|
||||
|
||||
def main(argv):
|
||||
p = argparse.ArgumentParser()
|
||||
p.add_argument(
|
||||
'distroname',
|
||||
help='Name of distro this package is intended for'
|
||||
)
|
||||
args = p.parse_args()
|
||||
print(util.get_git_version(from_file=False),
|
||||
args.distroname.replace(' ', ''), sep='-')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main(sys.argv[1:])
|
Loading…
Add table
Add a link
Reference in a new issue