diff options
author | Tim Rühsen <tim.ruehsen@gmx.de> | 2020-05-04 13:03:56 +0000 |
---|---|---|
committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2020-05-04 13:03:56 +0000 |
commit | cb5171409a8e8e9b6127e0acaa0136411b46fcd0 (patch) | |
tree | de7b147b28cdf3e5cf3ef5284f658d9b54c06189 | |
parent | 4d8f3321158528ae47d4c62382911196ab80f338 (diff) | |
parent | 5a58370864e04f5dbb05b0ae453e6fa592a93175 (diff) | |
download | gnutls-cb5171409a8e8e9b6127e0acaa0136411b46fcd0.tar.gz |
Merge branch 'tmp-reproducible-build' into 'master'
New make target 'update-copyright-year'
Closes #980
See merge request gnutls/gnutls!1241
-rw-r--r-- | cfg.mk | 7 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/args-std.def.in | 2 |
3 files changed, 7 insertions, 6 deletions
@@ -43,7 +43,6 @@ local-checks-to-skip = sc_GPL_version sc_bindtextdomain \ sc_two_space_separator_in_usage VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|gtk-doc.make|m4/pkg|doc/fdl-1.3.texi|src/.*\.bak|src/crywrap/|(devel/perlasm/|lib/accelerated/x86/|build-aux/|gl/|src/libopts/|tests/suite/ecore/|doc/protocol/).*$$ -update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=1 # Explicit syntax-check exceptions. exclude_file_name_regexp--sc_copyright_check = ^./gnulib/.*$$ @@ -78,6 +77,12 @@ glimport: echo "If everything looks well, commit the gnulib update with:" echo " git commit -m "Update gnulib submodule" gnulib" +# Update Copyright year in tools and docs + +update-copyright-year: + $(AM_V_at)$(SED) -i "s/\"2000-[0-9]\{4,\}\"/\"2000-`date +%Y`\"/g" src/args-std.def.in + $(AM_V_at)$(SED) -i "s/ 2001-[0-9]\{4,\} / 2001-`date +%Y` /g" doc/gnutls.texi + # Code Coverage clang: diff --git a/configure.ac b/configure.ac index fb24986bb6..de4c54d508 100644 --- a/configure.ac +++ b/configure.ac @@ -1092,10 +1092,6 @@ AC_DEFINE([fread_file], [_gnutls_fread_file], [static lib rename]) AC_DEFINE([read_file], [_gnutls_read_file], [static lib rename]) AC_DEFINE([read_binary_file], [_gnutls_read_binary_file], [static lib rename]) -dnl Some variables needed in makefiles -YEAR=`date +%Y` -AC_SUBST([YEAR], $YEAR) - dnl configuration options for config file parsing (inih) AC_DEFINE([INI_MAX_LINE], 2048, [inih maximum line size]) AC_DEFINE([INI_ALLOW_INLINE_COMMENTS], 1, [whether to allowin inline comments]) diff --git a/src/args-std.def.in b/src/args-std.def.in index 93634a1857..4a92c448d2 100644 --- a/src/args-std.def.in +++ b/src/args-std.def.in @@ -10,7 +10,7 @@ no-misuse-usage; export = '#include <gettext.h>'; copyright = { - date = "2000-@YEAR@"; + date = "2000-2020"; owner = "Free Software Foundation, and others"; author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; " "see /usr/share/doc/gnutls/AUTHORS for a complete list."; |