From 6af138421aaf60fe157ee6cd21d961063d07c087 Mon Sep 17 00:00:00 2001 From: sf-mensch Date: Sun, 16 Oct 2022 07:48:59 +0000 Subject: [PATCH] follow-up to "moving out version definitions to own header" r4775 libversion.h as libcob/version.h libcob: * Makefile.am: distribution of version.h build_windows: * makedist.cmd: cater for new header files --- build_windows/ChangeLog.txt | 3 ++- build_windows/makedist.cmd | 5 ++++- build_windows/version_cobc.rc | 4 ++-- build_windows/version_cobcrun.rc | 4 ++-- build_windows/version_libcob.rc | 4 ++-- libcob/ChangeLog | 3 ++- libcob/Makefile.am | 3 ++- libcob/common.h | 4 +--- libcob/{libversion.h => version.h} | 3 +++ 9 files changed, 20 insertions(+), 13 deletions(-) rename libcob/{libversion.h => version.h} (94%) diff --git a/build_windows/ChangeLog.txt b/build_windows/ChangeLog.txt index 7c0936d90..329ad57d6 100644 --- a/build_windows/ChangeLog.txt +++ b/build_windows/ChangeLog.txt @@ -4,8 +4,9 @@ * added statement.def to all cobc and libcob projects, new libversion.h to libcob * version_cobc, version_cobcrun, version_libcob: use simple - libversion.h instead of full common.h, preventing + version.h instead of full common.h, preventing resource compilers to stumble over C definitions + * makedist.cmd: cater for new header files 2022-10-01 Simon Sobisch diff --git a/build_windows/makedist.cmd b/build_windows/makedist.cmd index 95e9c0a2f..7c4c13c40 100644 --- a/build_windows/makedist.cmd +++ b/build_windows/makedist.cmd @@ -1,4 +1,4 @@ -:: Copyright (C) 2014-2021 Free Software Foundation, Inc. +:: Copyright (C) 2014-2022 Free Software Foundation, Inc. :: Written by Simon Sobisch, Edward Hart :: :: This file is part of GnuCOBOL. @@ -134,7 +134,10 @@ mkdir include mkdir include\libcob copy "%cob_source_path%libcob.h" include\ 1>nul copy "%cob_source_path%libcob\common.h" include\libcob\ 1>nul +copy "%cob_source_path%libcob\version.h" include\libcob\ 1>nul +copy "%cob_source_path%libcob\cobgetopt.h" include\libcob\ 1>nul copy "%cob_source_path%libcob\exception*.def" include\libcob\ 1>nul +copy "%cob_source_path%libcob\statement.def" include\libcob\ 1>nul echo Copying translations... mkdir po diff --git a/build_windows/version_cobc.rc b/build_windows/version_cobc.rc index 58e6a07a0..26dc98a58 100644 --- a/build_windows/version_cobc.rc +++ b/build_windows/version_cobc.rc @@ -3,8 +3,8 @@ #include "tarstamp.h" #include "config.h" -#include "../libcob/libversion.h" -#define VCS_REF 4775 +#include "../libcob/version.h" +#define VCS_REF 4776 #define STRINGIZE_DETAIL_(v) #v #define STRINGIZE(v) STRINGIZE_DETAIL_(v) diff --git a/build_windows/version_cobcrun.rc b/build_windows/version_cobcrun.rc index 9551e51ea..410163e93 100644 --- a/build_windows/version_cobcrun.rc +++ b/build_windows/version_cobcrun.rc @@ -3,8 +3,8 @@ #include "tarstamp.h" #include "config.h" -#include "../libcob/libversion.h" -#define VCS_REF 4775 +#include "../libcob/version.h" +#define VCS_REF 4776 #define STRINGIZE_DETAIL_(v) #v #define STRINGIZE(v) STRINGIZE_DETAIL_(v) diff --git a/build_windows/version_libcob.rc b/build_windows/version_libcob.rc index bf0bbe639..0bb8e4cff 100644 --- a/build_windows/version_libcob.rc +++ b/build_windows/version_libcob.rc @@ -3,8 +3,8 @@ #include "tarstamp.h" #include "config.h" -#include "../libcob/libversion.h" -#define VCS_REF 4775 +#include "../libcob/version.h" +#define VCS_REF 4776 #define STRINGIZE_DETAIL_(v) #v #define STRINGIZE(v) STRINGIZE_DETAIL_(v) diff --git a/libcob/ChangeLog b/libcob/ChangeLog index 75692c96e..789d3dc06 100644 --- a/libcob/ChangeLog +++ b/libcob/ChangeLog @@ -1,7 +1,8 @@ 2022-10-15 Simon Sobisch - * libversion.h: nre file, moving out version definitions from common.h + * version.h, Makefile.am: new file, moving out version + definitions from common.h * common.h: drop COB_WITHOUT_EXCEPTIONS, which was added only for resource compilers, which should now include libversion.h * common.c (cob_runtime_warning_external, cob_runtime_warning): diff --git a/libcob/Makefile.am b/libcob/Makefile.am index a8c628c3f..eec9a0a17 100644 --- a/libcob/Makefile.am +++ b/libcob/Makefile.am @@ -43,7 +43,8 @@ AM_LDFLAGS = $(COB_FIX_LIB) EXTRA_DIST = coblocal.h system.def pkgincludedir = $(includedir)/libcob -pkginclude_HEADERS = common.h cobgetopt.h exception.def exception-io.def statement.def +pkginclude_HEADERS = common.h version.h cobgetopt.h \ + exception.def exception-io.def statement.def # Add rules for code-coverage testing, as provided by AX_CODE_COVERAGE include $(top_srcdir)/aminclude_static.am diff --git a/libcob/common.h b/libcob/common.h index 4cf94d67b..f14305376 100644 --- a/libcob/common.h +++ b/libcob/common.h @@ -1597,7 +1597,7 @@ struct cobjmp_buf { #endif /* version definition and related functions from common.c */ -#include "libversion.h" /* located and installed next to common.h */ +#include "version.h" /* located and installed next to common.h */ /*******************************/ @@ -1609,8 +1609,6 @@ COB_EXPIMP const char* cob_get_sig_name (int); COB_EXPIMP const char* cob_get_sig_description (int); COB_EXPIMP void print_info (void); COB_EXPIMP void print_info_detailed (const int); -COB_EXPIMP void print_version (void); -COB_EXPIMP void print_version_summary (void); COB_EXPIMP int cob_load_config (void); COB_EXPIMP void print_runtime_conf (void); diff --git a/libcob/libversion.h b/libcob/version.h similarity index 94% rename from libcob/libversion.h rename to libcob/version.h index e9c393b30..c10bd016e 100644 --- a/libcob/libversion.h +++ b/libcob/version.h @@ -37,4 +37,7 @@ COB_EXPIMP const char *libcob_version (void); COB_EXPIMP int set_libcob_version (int *, int *, int *); +COB_EXPIMP void print_version (void); +COB_EXPIMP void print_version_summary (void); + #endif