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 <brandon.maier@collins.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

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; \

VERSION.txt

@@ -0,0 +1 @@
+1.7.0

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')