From 096f3418a6eb250fcd66ad112805745fd5672901 Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Tue, 17 Sep 2019 16:36:00 -0700 Subject: [PATCH] scripts makefile: add back leading "v" to hardcoded version string This reverts the code changes from 2019-09-05T02:46:59Z!mikeonthecomputer@gmail.com. Keeps the "v" from appearing in file names, while still being a bit nice to see on the title screen. --- Makefile | 2 +- scripts/makejson | 3 +++ scripts/makepkgs | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ffc82292..891736c8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause -VERSION=$(shell git describe --abbrev=8 --dirty 2>/dev/null || echo 0.11.3) +VERSION=$(shell git describe --abbrev=8 --dirty 2>/dev/null || echo v0.11.3) WADS=wads ASCIIDOC=asciidoc ASCIIDOC_MAN=a2x -f manpage diff --git a/scripts/makejson b/scripts/makejson index 20ae633e..2312d537 100755 --- a/scripts/makejson +++ b/scripts/makejson @@ -34,6 +34,9 @@ json_file = os.getenv("JSON") if version is None: sys.stderr.write("Version is not specified for release\n") sys.exit(1) +if version[0] is "v": + # Strip the leading "v" from versioning + version = version[1:] if json_file is None: sys.stderr.write("JSON file not specified!\n") diff --git a/scripts/makepkgs b/scripts/makepkgs index a48ebf50..f321d8e9 100755 --- a/scripts/makepkgs +++ b/scripts/makepkgs @@ -24,6 +24,9 @@ version = os.getenv("VERSION") if version is None: sys.stderr.write("Version not specified for release\n") sys.exit(1) +if version[0] is "v": + # Strip the leading "v" from versioning + version = version[1:] path = os.path.dirname(FILES[0]) basename = os.path.basename(FILES[0])