aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--VERSION.txt1
-rw-r--r--meson.build4
3 files changed, 5 insertions, 8 deletions
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')