From 0f5864567745c50e481b132538969b87259891e3 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 1 Aug 2023 23:45:55 +0000 Subject: move release version into VERSION.txt To synchronize the release version of the Makefile and Meson build systems, pull the version info from a shared file. Meson requires that the shared library version follow the X.Y.Z numbering scheme. But the Makefile supported building shared libraries with an EXTRAVERSION appended, for example X.Y.Z-rc1. We want to keep the output of both systems the same to avoid issues, so we drop support for the Makefile EXTRAVERSION. Signed-off-by: Brandon Maier Signed-off-by: David Gibson --- Makefile | 8 ++------ VERSION.txt | 1 + meson.build | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 VERSION.txt diff --git a/Makefile b/Makefile index c0b68a2..fc4a133 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,11 @@ # # Version information will be constructed in this order: -# EXTRAVERSION might be "-rc", for example. +# DTC_VERSION release version as MAJOR.MINOR.PATCH # LOCAL_VERSION is likely from command line. # CONFIG_LOCALVERSION from some future config system. # -VERSION = 1 -PATCHLEVEL = 7 -SUBLEVEL = 0 -EXTRAVERSION = +DTC_VERSION = $(shell cat VERSION.txt) LOCAL_VERSION = CONFIG_LOCALVERSION = @@ -103,7 +100,6 @@ endif # Rules for versioning # -DTC_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) VERSION_FILE = version_gen.h CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ diff --git a/VERSION.txt b/VERSION.txt new file mode 100644 index 0000000..bd8bf88 --- /dev/null +++ b/VERSION.txt @@ -0,0 +1 @@ +1.7.0 diff --git a/meson.build b/meson.build index 8f5fea5..17cb135 100644 --- a/meson.build +++ b/meson.build @@ -1,8 +1,8 @@ project('dtc', 'c', - version: '1.7.0', + version: files('VERSION.txt'), license: ['GPL2+', 'BSD-2'], default_options: 'werror=true', - meson_version: '>=0.56.0' + meson_version: '>=0.57.0' ) cc = meson.get_compiler('c') -- cgit v1.1