Use existing build_timestamp to extract year with format specifier

Co-authored-by: Flole998 <9951871+Flole998@users.noreply.github.com>

diff --git a/Makefile b/Makefile
index 571f565b1406dc43fd6cec0bf2f1474ca256cabf..5e9688fbb44ae98217ce0afce4a3343e55216c88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -761,19 +761,15 @@ include ${ROOTDIR}/support/${OSENV}.mk
 
 # Build files
 DATE_FMT = %Y-%m-%dT%H:%M:%S%z
-YEAR_FMT = %Y
 ifdef SOURCE_DATE_EPOCH
        BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)"  2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)")
-       BUILD_YEAR ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(YEAR_FMT)"  2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(YEAR_FMT)" 2>/dev/null || date -u "+$(YEAR_FMT)")
 else
        BUILD_DATE ?= $(shell date "+$(DATE_FMT)")
-       BUILD_YEAR ?= $(shell date "+$(YEAR_FMT)")
 endif
 $(BUILDDIR)/timestamp.c: FORCE
        @mkdir -p $(dir $@)
        @echo '#include "build.h"' > $@
        @echo 'const char* build_timestamp = "'$(BUILD_DATE)'";' >> $@
-       @echo 'const char* build_year = "'$(BUILD_YEAR)'";' >> $@
 
 $(BUILDDIR)/timestamp.o: $(BUILDDIR)/timestamp.c
        $(pCC) $(CFLAGS) -c -o $@ $<

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 0cd952859dc6175343942a23a140cf4afc01830d..5313b2f10002a73b82acfdad9eb535c4650eb396 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -187,10 +187,10 @@ page_about(http_connection_t *hc, const char *remain, void *opaque)
 
   htsbuf_qprintf(hq, "<center class=\"about-tab\">\n\
 <div class=\"about-title\">HTS Tvheadend %s</div>\n\
-<p>&copy; 2006 - %s Andreas Smas, Jaroslav Kysela, Adam Sutton, et al.</p>\n\
+<p>&copy; 2006 - %.4s Andreas Smas, Jaroslav Kysela, Adam Sutton, et al.</p>\n\
 <p><img class=\"logobig\" src=\"static/img/logobig.png\"></p>\n\
 <p><a href=\"https://tvheadend.org\">https://tvheadend.org</a></p>\n",
-    tvheadend_version, build_year);
+    tvheadend_version, build_timestamp);
 
   htsbuf_qprintf(hq, "<p>%s \n\
 <a target=\"_blank\" href=\"http://www.extjs.com/\">ExtJS</a>. \

diff --git a/support/configure.inc b/support/configure.inc
index ba950dd4418812560049596b668a6c0ace4f1a58..905685cb5d4ea7d1b9cd190dbb1c6ea6ce09832b 100755 (executable)
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -574,7 +574,6 @@ EOF
   cat >> "${CONFIG_H}" <<EOF
 extern const char* build_config_str;
 extern const char* build_timestamp;
-extern const char* build_year;
 EOF
 
   # Create C source