blob: a7118dc13fceace448286aa5a8b5ed2ac01d593e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
|
--- /Makefile 2020-06-18 17:49:19.339016246 -0500
+++ /Makefile 2020-06-18 17:55:11.200700094 -0500
@@ -1181,9 +1181,8 @@
LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
SRC_PKG_BASE := stone_soup
-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
+SRC_VERSION := $(shell cat util/release_ver)
MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
-RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
export SRC_VERSION
|
