From 7bc61bfb58b7d7aada17e00e465d654f565de1c7 Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Wed, 27 Feb 2019 10:27:38 +0100
Subject: [PATCH] Added symbolic version string to the '-v' option of
executables (bug 544861) - Implemented for the compiler by Harald Welte
Change-Id: Ib68539dee1f6e7f39b1023fe9ef055079e17b98d
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
compiler2/main.cc | 1 +
compiler2/makefile.c | 1 +
core/Parallel_main.cc | 1 +
core/ProfMerge_main.cc | 1 +
core/Single_main.cc | 1 +
repgen/logfilter.c | 1 +
repgen/logformat.l | 1 +
repgen/logmerge.c | 1 +
xsdconvert/converter.cc | 1 +
9 files changed, 9 insertions(+)
diff --git a/compiler2/main.cc b/compiler2/main.cc
index e6a43882f..4f81285f7 100644
--- a/compiler2/main.cc
+++ b/compiler2/main.cc
@@ -956,6 +956,7 @@ int main(int argc, char *argv[])
if (vflag) {
fputs("TTCN-3 and ASN.1 Compiler for the TTCN-3 Test Executor\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
"Compiled with: " C_COMPILER_VERSION "\n", stderr);
fputs("Using ", stderr);
diff --git a/compiler2/makefile.c b/compiler2/makefile.c
index b8f21cde4..58ff4154d 100644
--- a/compiler2/makefile.c
+++ b/compiler2/makefile.c
@@ -5286,6 +5286,7 @@ int main(int argc, char *argv[])
if (vflag) {
fputs("Makefile Generator for the TTCN-3 Test Executor\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
"Compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
diff --git a/core/Parallel_main.cc b/core/Parallel_main.cc
index 85d37d5b2..62cc3999f 100644
--- a/core/Parallel_main.cc
+++ b/core/Parallel_main.cc
@@ -174,6 +174,7 @@ static boolean process_options(int argc, char *argv[], int& ret_val,
// version printout
fputs("TTCN-3 Host Controller (parallel mode)\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date (Base Library): " __DATE__ " " __TIME__ "\n"
"Base Library was compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
diff --git a/core/ProfMerge_main.cc b/core/ProfMerge_main.cc
index a4eaf34ac..b709cdfe5 100644
--- a/core/ProfMerge_main.cc
+++ b/core/ProfMerge_main.cc
@@ -154,6 +154,7 @@ int main(int argc, char* argv[])
else {
fputs("Profiler and Code Coverage Merge Tool for the TTCN-3 Test Executor\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
"Compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
diff --git a/core/Single_main.cc b/core/Single_main.cc
index 93eefd3f2..5fb423394 100644
--- a/core/Single_main.cc
+++ b/core/Single_main.cc
@@ -184,6 +184,7 @@ int main(int argc, char *argv[])
} else if (vflag) {
fputs("TTCN-3 Test Executor (single mode)\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date (Base Library): " __DATE__ " " __TIME__ "\n"
"Base Library was compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
diff --git a/repgen/logfilter.c b/repgen/logfilter.c
index 26b0ec3f3..c87fc97c3 100644
--- a/repgen/logfilter.c
+++ b/repgen/logfilter.c
@@ -250,6 +250,7 @@ int main(int argc,char *argv[])
} else if (vflag) {
fputs("Log Filter for the TTCN-3 Test Executor\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
"Compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
diff --git a/repgen/logformat.l b/repgen/logformat.l
index f7c523ca2..f873edde9 100644
--- a/repgen/logformat.l
+++ b/repgen/logformat.l
@@ -505,6 +505,7 @@ int main(int argc, char *argv[])
} else if (vflag) {
fputs("Log Formatter for the TTCN-3 Test Executor\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
"Compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
diff --git a/repgen/logmerge.c b/repgen/logmerge.c
index a8b5972ce..a0fffcf04 100644
--- a/repgen/logmerge.c
+++ b/repgen/logmerge.c
@@ -619,6 +619,7 @@ int main(int argc,char *argv[])
if(vflag) {
fputs("Log Merger for the TTCN-3 Test Executor\n"
"Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
"Compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
diff --git a/xsdconvert/converter.cc b/xsdconvert/converter.cc
index 07413b4b0..a397a49c8 100644
--- a/xsdconvert/converter.cc
+++ b/xsdconvert/converter.cc
@@ -272,6 +272,7 @@ static void printUsage(const char * argv0) {
static void printVersion() {
fputs("Product number: " PRODUCT_NUMBER "\n"
+ "Version: " VERSION_STRING "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
"Compiled with: " C_COMPILER_VERSION "\n\n"
COPYRIGHT_STRING "\n\n", stderr);
--
GitLab