diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildcommands.py | 12 | ||||
| -rwxr-xr-x | scripts/logextract.py | 10 | ||||
| -rw-r--r-- | scripts/make_version.py | 31 |
3 files changed, 4 insertions, 49 deletions
diff --git a/scripts/buildcommands.py b/scripts/buildcommands.py index fa4303ed..a9043394 100644 --- a/scripts/buildcommands.py +++ b/scripts/buildcommands.py @@ -8,6 +8,7 @@ import sys, os, subprocess, optparse, logging, shlex, socket, time, traceback import json, zlib sys.path.append("./klippy") +import klippy.klippy import msgproto FILEHEADER = """ @@ -555,18 +556,9 @@ def check_output(prog): return "" -# Obtain version info from "git" program -def git_version(): - if not os.path.exists(".git"): - logging.debug("No '.git' file/directory found") - return "" - ver = check_output("git describe --always --tags --long --dirty").strip() - logging.debug("Got git version: %s" % (repr(ver),)) - return ver - def build_version(extra, cleanbuild): - version = git_version() + version = klippy.klippy.__version__ if not version: cleanbuild = False version = "?" diff --git a/scripts/logextract.py b/scripts/logextract.py index 3050ff0b..d6da323d 100755 --- a/scripts/logextract.py +++ b/scripts/logextract.py @@ -645,11 +645,7 @@ class GatherShutdown: if first is not None and last > first + 5.0: self.finalize() return False - if ( - line.startswith("Git version") - or line.startswith("Start printer at") - or line == "===== Config file =====" - ): + if line.startswith("Start printer at") or line == "===== Config file =====": self.finalize() return False return True @@ -702,9 +698,7 @@ def main(): continue recent_lines.clear() handler = None - if line.startswith("Git version"): - last_git = format_comment(line_num, line) - elif line.startswith("Start printer at"): + if line.startswith("Start printer at"): last_start = format_comment(line_num, line) elif line == "===== Config file =====": handler = GatherConfig(configs, line_num, recent_lines, logname) diff --git a/scripts/make_version.py b/scripts/make_version.py deleted file mode 100644 index 7a48018a..00000000 --- a/scripts/make_version.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/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)["version"], - args.distroname.replace(" ", ""), - sep="-", - ) - - -if __name__ == "__main__": - main(sys.argv[1:]) |