Commit 0f9bd012 authored by Daniel Salzman's avatar Daniel Salzman

Extend version format for better automation, remove redundant gnu-flavor files

See m4/knot-version.m4
parent 799af5a1
Pipeline #34346 passed with stages
in 11 minutes and 19 seconds
Ľuboš Slovák
Marek Vavruša
Jan Kadlec
Daniel Salzman
Jan Včelák
Dominik Táborský
Vítězslav Kříž
Filip Široký
Vladimír Čunát
Libor Peltan
Mark Karpilovskij
Ondřej Surý
Ondřej Filip
Knot DNS 2.7.0-dev (2018-xx-xx)
===============================
Knot DNS 2.6.0 (2017-09-29)
===========================
......
Knot DNS was originally written by CZ.NIC Labs. It would not be what
it is today without the invaluable help of these people, who have
reported problems, suggested improvements, or submitted actual code.
Please help us keep this list complete and free from errors. Also see
the AUTHORS file for the list of people with contributions significant
enough to warrant copyright assignment.
Anton Shterenlikht
Geert Hendrickx
Michal 'vorner' Vaner
Ondřej Caletka
Anand Buddhdev
Robert Edmonds
# -*- Autoconf -*-
AC_PREREQ([2.60])
m4_define([knot_VERSION_MAJOR],2)dnl
m4_define([knot_VERSION_MINOR],7)dnl
m4_define([knot_VERSION_PATCH],0)dnl
m4_define([knot_VERSION_EXTRA],-dev)dnl
m4_define([knot_PKG_VERSION],[knot_VERSION_MAJOR.knot_VERSION_MINOR.knot_VERSION_PATCH]knot_VERSION_EXTRA)dnl
m4_define([knot_VERSION_MAJOR], 2)dnl
m4_define([knot_VERSION_MINOR], 7)dnl
m4_define([knot_VERSION_PATCH], )dnl Leave empty if the master branch!
m4_include([m4/knot-version.m4])
AC_INIT([knot], knot_PKG_VERSION, [knot-dns@labs.nic.cz])
configure_params="$*"
AM_INIT_AUTOMAKE([gnits subdir-objects no-dist-gzip dist-xz -Wall -Werror])
AM_INIT_AUTOMAKE([foreign std-options subdir-objects no-dist-gzip dist-xz -Wall -Werror])
AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([src/knot])
AC_CONFIG_HEADERS([src/config.h])
......@@ -21,7 +18,6 @@ AC_CANONICAL_HOST
AC_SUBST([KNOT_VERSION_MAJOR], knot_VERSION_MAJOR)
AC_SUBST([KNOT_VERSION_MINOR], knot_VERSION_MINOR)
AC_SUBST([KNOT_VERSION_PATCH], knot_VERSION_PATCH)
AC_SUBST([KNOT_VERSION_EXTRA], knot_VERSION_EXTRA)
AC_CONFIG_FILES([src/libknot/version.h
src/libdnssec/version.h
......@@ -535,7 +531,7 @@ AM_CONDITIONAL([HAVE_SPHINXBUILD], test "$SPHINXBUILD" != "false")
AM_CONDITIONAL([HAVE_PDFLATEX], test "$PDFLATEX" != "false")
AM_CONDITIONAL([HAVE_MAKEINFO], test "$MAKEINFO" != "false")
result_msg_base=" $PACKAGE $VERSION
result_msg_base=" Knot DNS $VERSION
Target: $host_os $host_cpu
Compiler: ${CC}
......
################################################################################
# Knot DNS versions are as follows
#
# <MAJOR>.<MINOR>.dev[.<TIMESTAMP>.<HASH>] Build from the master branch
# <MAJOR>.<MINOR>.<PATCH>[.<TIMESTAMP>.<HASH>] Build from a feature branch
#
# If the repository is not available or if HEAD is tagged,
# the optional part is missing!
#
# Example: 2.7.dev.1521027664.5e69ccc
################################################################################
#m4_define([knot_VERSION_MAJOR], 2)dnl
#m4_define([knot_VERSION_MINOR], 7)dnl
#m4_define([knot_VERSION_PATCH], )dnl
m4_define([PATCH], m4_ifblank(knot_VERSION_PATCH, [dev], knot_VERSION_PATCH))dnl
m4_define([GIT_HASH], m4_esyscmd_s(git rev-parse --short HEAD 2>/dev/null))dnl
m4_define([GIT_TAG], m4_esyscmd_s(git describe --exact-match 2>/dev/null))dnl
m4_define([TIMESTAMP], m4_esyscmd_s(date -u +'%s' 2>/dev/null))dnl
m4_define([GIT_INFO], m4_ifblank(GIT_TAG, m4_ifnblank(GIT_HASH, .TIMESTAMP.GIT_HASH, []), []))dnl
m4_define([knot_PKG_VERSION], [knot_VERSION_MAJOR.knot_VERSION_MINOR.PATCH]GIT_INFO)dnl
/* Copyright (C) 2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -19,7 +19,6 @@
#define DNSSEC_VERSION_MAJOR @KNOT_VERSION_MAJOR@
#define DNSSEC_VERSION_MINOR @KNOT_VERSION_MINOR@
#define DNSSEC_VERSION_PATCH @KNOT_VERSION_PATCH@
#define DNSSEC_VERSION_EXTRA "@KNOT_VERSION_EXTRA@"
#define DNSSEC_VERSION_HEX ((DNSSEC_VERSION_MAJOR << 16) | \
(DNSSEC_VERSION_MINOR << 8) | \
......
/* Copyright (C) 2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -19,7 +19,6 @@
#define KNOT_VERSION_MAJOR @KNOT_VERSION_MAJOR@
#define KNOT_VERSION_MINOR @KNOT_VERSION_MINOR@
#define KNOT_VERSION_PATCH @KNOT_VERSION_PATCH@
#define KNOT_VERSION_EXTRA "@KNOT_VERSION_EXTRA@"
#define KNOT_VERSION_HEX ((KNOT_VERSION_MAJOR << 16) | \
(KNOT_VERSION_MINOR << 8) | \
......
/* Copyright (C) 2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -19,7 +19,6 @@
#define ZSCANNER_VERSION_MAJOR @KNOT_VERSION_MAJOR@
#define ZSCANNER_VERSION_MINOR @KNOT_VERSION_MINOR@
#define ZSCANNER_VERSION_PATCH @KNOT_VERSION_PATCH@
#define ZSCANNER_VERSION_EXTRA "@KNOT_VERSION_EXTRA@"
#define ZSCANNER_VERSION_HEX ((ZSCANNER_VERSION_MAJOR << 16) | \
(ZSCANNER_VERSION_MINOR << 8) | \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment