From 0dd6aca3333953e52f507c8744247e129c7f5aee Mon Sep 17 00:00:00 2001 From: tsukumi Date: Fri, 25 Aug 2023 23:33:59 +0000 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=95=B0=E5=91=A8=E3=82=8A=E3=81=AE?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aribb25/config.h.in | 6 ++++++ aribb25/td.c | 11 +++++------ aribb25/version_b1.c | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/aribb25/config.h.in b/aribb25/config.h.in index 77ac201..113e08d 100644 --- a/aribb25/config.h.in +++ b/aribb25/config.h.in @@ -1,6 +1,12 @@ #ifndef CONFIG_H #define CONFIG_H +#define ARIBB1_MAJOR_VERSION @ARIBB1_MAJOR_VERSION@ +#define ARIBB1_MINOR_VERSION @ARIBB1_MINOR_VERSION@ +#define ARIBB1_PATCH_VERSION @ARIBB1_PATCH_VERSION@ +#define ARIBB1_VERSION_NUMBER "@ARIBB1_VERSION_NUMBER@" +#define ARIBB1_VERSION_STRING "@ARIBB1_VERSION_STRING@" + #define ARIBB25_MAJOR_VERSION @ARIBB25_MAJOR_VERSION@ #define ARIBB25_MINOR_VERSION @ARIBB25_MINOR_VERSION@ #define ARIBB25_PATCH_VERSION @ARIBB25_PATCH_VERSION@ diff --git a/aribb25/td.c b/aribb25/td.c index 5a8ed1b..38b889c 100644 --- a/aribb25/td.c +++ b/aribb25/td.c @@ -1,10 +1,9 @@ -#define VERSION_STRING "0.2.8" - #include #include #include #include #include +#include #include #include @@ -100,19 +99,19 @@ static void show_usage() #ifdef ENABLE_ARIB_STREAM_TEST // arib-b1-stream-test・arib-b25-stream-test #ifdef ENABLE_ARIB_STD_B1 - _ftprintf(stderr, _T("arib-b1-stream-test - ARIB STD-B1 test program version %s\n"), _T(VERSION_STRING)); + _ftprintf(stderr, _T("arib-b1-stream-test - ARIB STD-B1 test program version %s (%s)\n"), _T(ARIBB1_VERSION_STRING), _T(BUILD_GIT_REVISION)); _ftprintf(stderr, _T("usage: arib-b1-stream-test [options] \n")); #else - _ftprintf(stderr, _T("arib-b25-stream-test - ARIB STD-B25 test program version %s\n"), _T(VERSION_STRING)); + _ftprintf(stderr, _T("arib-b25-stream-test - ARIB STD-B25 test program version %s (%s)\n"), _T(ARIBB25_VERSION_STRING), _T(BUILD_GIT_REVISION)); _ftprintf(stderr, _T("usage: arib-b25-stream-test [options] \n")); #endif #else // b1・b25 #ifdef ENABLE_ARIB_STD_B1 - _ftprintf(stderr, _T("b1 - ARIB STD-B1 test program version %s\n"), _T(VERSION_STRING)); + _ftprintf(stderr, _T("b1 - ARIB STD-B1 test program version %s (%s)\n"), _T(ARIBB1_VERSION_STRING), _T(BUILD_GIT_REVISION)); _ftprintf(stderr, _T("usage: b1 [options] src.m2t dst.m2t [more pair ..]\n")); #else - _ftprintf(stderr, _T("b25 - ARIB STD-B25 test program version %s\n"), _T(VERSION_STRING)); + _ftprintf(stderr, _T("b25 - ARIB STD-B25 test program version %s (%s)\n"), _T(ARIBB25_VERSION_STRING), _T(BUILD_GIT_REVISION)); _ftprintf(stderr, _T("usage: b25 [options] src.m2t dst.m2t [more pair ..]\n")); #endif #endif diff --git a/aribb25/version_b1.c b/aribb25/version_b1.c index 2642f3a..55d6ce0 100644 --- a/aribb25/version_b1.c +++ b/aribb25/version_b1.c @@ -9,7 +9,7 @@ const char elf_interp[] __attribute__((section(".interp"))) = ELF_INTERP; void show_version(void) { - fprintf(stderr, "libaribb1.so - ARIB STD-B1 shared library version %s (%s)\n", ARIBB25_VERSION_STRING, BUILD_GIT_REVISION); + fprintf(stderr, "libaribb1.so - ARIB STD-B1 shared library version %s (%s)\n", ARIBB1_VERSION_STRING, BUILD_GIT_REVISION); fprintf(stderr, " built with %s %s on %s\n", BUILD_CC_NAME, BUILD_CC_VERSION, BUILD_OS_NAME); _exit(0); }