From 84675f4a60329911f961f9d95ae29fe84a8dc3e6 Mon Sep 17 00:00:00 2001 From: sf-mensch Date: Mon, 3 Jan 2022 22:32:28 +0000 Subject: [PATCH] header cleanup * general: revert change 2019-06-05 - all header files that are included from the system use , "local.h" is used otherwise with the exceptions of to-be-installed headers which include files that have a local reference to each other after installation (common.h + and exceptions.def) * libcob: * coblocal.h, common.h: moved some internal limits to coblocal.h * bin/cobcrun.c: include libcob headers relative and tarstamp.h early * build_windows: * project adjustments - only include "build_windows" and top_srcdir * additional for cobc.vcxproj: have auxiliary compiler files included for search and fast-adjustment --- ChangeLog | 10 +- bin/ChangeLog | 6 +- bin/cobcrun.c | 11 +- build_windows/ChangeLog.txt | 5 + build_windows/version_cobc.rc | 12 +- build_windows/version_cobcrun.rc | 12 +- build_windows/version_libcob.rc | 12 +- build_windows/vs2005/cobc.vcproj | 2 +- build_windows/vs2008/cobc.vcproj | 2 +- build_windows/vs2010/cobc.vcxproj | 44 ++++++- build_windows/vs2010/cobc.vcxproj.filters | 117 +++++++++++++++++++ build_windows/vs2010/cobcrun.vcxproj | 8 +- build_windows/vs2010/libcob.vcxproj | 8 +- build_windows/vs2012/cobc.vcxproj | 44 ++++++- build_windows/vs2012/cobc.vcxproj.filters | 123 +++++++++++++++++++- build_windows/vs2012/cobcrun.vcxproj | 8 +- build_windows/vs2012/libcob.vcxproj | 8 +- build_windows/vs2013/cobc.vcxproj | 44 ++++++- build_windows/vs2013/cobc.vcxproj.filters | 117 +++++++++++++++++++ build_windows/vs2013/cobcrun.vcxproj | 8 +- build_windows/vs2013/libcob.vcxproj | 8 +- build_windows/vs2015/cobc.vcxproj | 44 ++++++- build_windows/vs2015/cobc.vcxproj.filters | 117 +++++++++++++++++++ build_windows/vs2015/cobcrun.vcxproj | 8 +- build_windows/vs2015/libcob.vcxproj | 8 +- build_windows/vs2017/cobc.vcxproj | 44 ++++++- build_windows/vs2017/cobc.vcxproj.filters | 117 +++++++++++++++++++ build_windows/vs2017/cobcrun.vcxproj | 8 +- build_windows/vs2017/libcob.vcxproj | 8 +- build_windows/vs2019/cobc.vcxproj | 46 +++++++- build_windows/vs2019/cobc.vcxproj.filters | 117 +++++++++++++++++++ build_windows/vs2019/cobcrun.vcxproj | 10 +- build_windows/vs2019/libcob.vcxproj | 10 +- build_windows/vs2019/libcob.vcxproj.filters | 2 +- build_windows/vs2019/libsupport.vcxproj | 2 - cobc/cobc.c | 16 ++- cobc/cobc.h | 6 +- cobc/codegen.c | 7 +- cobc/codeoptim.c | 4 +- cobc/config.c | 8 +- cobc/error.c | 4 +- cobc/field.c | 5 +- cobc/help.c | 5 +- cobc/pplex.l | 4 +- cobc/ppparse.y | 4 +- cobc/reserved.c | 4 +- cobc/scanner.l | 4 +- cobc/tree.c | 5 +- cobc/typeck.c | 4 +- config/runtime.cfg | 5 +- libcob.h | 4 +- libcob/ChangeLog | 6 +- libcob/call.c | 10 +- libcob/cobgetopt.c | 8 +- libcob/coblocal.h | 22 +++- libcob/common.c | 8 +- libcob/common.h | 26 +---- libcob/exception.def | 2 +- libcob/fileio.c | 4 +- libcob/intrinsic.c | 4 +- libcob/mlio.c | 6 +- libcob/move.c | 9 +- libcob/numeric.c | 6 +- libcob/reportio.c | 6 +- libcob/screenio.c | 6 +- libcob/strings.c | 6 +- libcob/termio.c | 6 +- 67 files changed, 1151 insertions(+), 223 deletions(-) diff --git a/ChangeLog b/ChangeLog index 108f1342c..5e6adb3ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ +2022-01-03 Simon Sobisch + + * general: revert change 2019-06-05 - all header files that are included + from the system use , "local.h" is used otherwise with the + exceptions of to-be-installed headers which include files that have a + local reference to each other after installation (common.h + + and exceptions.def) + 2021-11-02 Simon Sobisch * configure.ac: use `dnl` comments in all places that are not intended be @@ -1370,7 +1378,7 @@ * Version 0.9 released. -Copyright 2002-2021 Free Software Foundation, Inc. +Copyright 2002-2022 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/bin/ChangeLog b/bin/ChangeLog index 9df23d827..d86b17bc8 100644 --- a/bin/ChangeLog +++ b/bin/ChangeLog @@ -1,4 +1,8 @@ +2022-01-03 Simon Sobisch + + * cobcrun.c: include libcob headers relative and tarstamp.h early + 2021-05-27 Simon Sobisch * cobcrun.c: use double-dash for long options @@ -261,7 +265,7 @@ then you can switch easily. -Copyright 2004-2008,2010,2012,2014-2021 Free Software Foundation, Inc. +Copyright 2004-2008,2010,2012,2014-2022 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/bin/cobcrun.c b/bin/cobcrun.c index da8235e52..4c0b04548 100644 --- a/bin/cobcrun.c +++ b/bin/cobcrun.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2004-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2004-2012, 2014-2022 Free Software Foundation, Inc. Written by Roger While, Simon Sobisch, Brian Tiffin This file is part of GnuCOBOL. @@ -18,6 +18,7 @@ along with GnuCOBOL. If not, see . */ +#include "tarstamp.h" #include "config.h" #include @@ -32,10 +33,8 @@ #include #endif -#include "libcob.h" -#include "tarstamp.h" - -#include "libcob/cobgetopt.h" +#include "../libcob/common.h" +#include "../libcob/cobgetopt.h" static int arg_shift = 1; static int print_runtime_wanted = 0; @@ -96,7 +95,7 @@ cobcrun_print_version (void) } printf ("cobcrun (%s) %s.%d\n", PACKAGE_NAME, PACKAGE_VERSION, PATCH_LEVEL); - puts ("Copyright (C) 2021 Free Software Foundation, Inc."); + puts ("Copyright (C) 2022 Free Software Foundation, Inc."); printf (_("License GPLv3+: GNU GPL version 3 or later <%s>"), "https://gnu.org/licenses/gpl.html"); putchar ('\n'); puts (_("This is free software; see the source for copying conditions. There is NO\n" diff --git a/build_windows/ChangeLog.txt b/build_windows/ChangeLog.txt index b6871a529..24b8ba1a3 100644 --- a/build_windows/ChangeLog.txt +++ b/build_windows/ChangeLog.txt @@ -1,4 +1,9 @@ +2022-01-03 Simon Sobisch + + * general: project files - only include "build_windows" and top_srcdir; + for cobc.vcxproj: have auxiliary compiler files included + 2021-11-06 Simon Sobisch * config.h.in: moved references to PACKACAGE_defines after the define, diff --git a/build_windows/version_cobc.rc b/build_windows/version_cobc.rc index 6988c8bed..5d12c3591 100644 --- a/build_windows/version_cobc.rc +++ b/build_windows/version_cobc.rc @@ -1,12 +1,12 @@ #include -#include -#include +#include "tarstamp.h" +#include "config.h" #define COB_WITHOUT_EXCEPTIONS #define COB_WITHOUT_JMP -#include "libcob/common.h" -#define VCS_REF 4209 +#include "../libcob/common.h" +#define VCS_REF 4513 #define STRINGIZE_DETAIL_(v) #v #define STRINGIZE(v) STRINGIZE_DETAIL_(v) @@ -46,7 +46,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", PACKAGE_NAME " compiler, supporting most COBOL dialects with lots of extensions" VALUE "FileVersion", STRINGIZE(__LIBCOB_VERSION)"."STRINGIZE(__LIBCOB_VERSION_MINOR)"."STRINGIZE(__LIBCOB_VERSION_PATCHLEVEL)"."STRINGIZE(VCS_REF) VALUE "InternalName", "cobc" - VALUE "LegalCopyright", "Copyright (C) 2001-2021 Free Software Foundation, Inc." + VALUE "LegalCopyright", "Copyright (C) 2001-2022 Free Software Foundation, Inc." VALUE "LegalTrademarks", "Compiler: GNU General Public License v3 - see COPYING,\x0ADocumentation: GNU Free Documentation License." VALUE "OriginalFilename", "cobc.exe" VALUE "ProductName", PACKAGE_NAME " compiler" @@ -57,7 +57,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "SpecialBuild", "" /* Non-Standard entries */ - VALUE "Build", "Mar 2021" + VALUE "Build", "Jan 2022" VALUE "Developer", "Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Edward Hart and many others (see AUTHORS and THANKS)" VALUE "Support", "https://www.gnu.org/software/gnucobol/" VALUE "Users", "Unlimited." diff --git a/build_windows/version_cobcrun.rc b/build_windows/version_cobcrun.rc index fe09b26ae..ddd79638d 100644 --- a/build_windows/version_cobcrun.rc +++ b/build_windows/version_cobcrun.rc @@ -1,12 +1,12 @@ #include -#include -#include +#include "tarstamp.h" +#include "config.h" #define COB_WITHOUT_EXCEPTIONS #define COB_WITHOUT_JMP -#include "libcob/common.h" -#define VCS_REF 4209 +#include "../libcob/common.h" +#define VCS_REF 4513 #define STRINGIZE_DETAIL_(v) #v #define STRINGIZE(v) STRINGIZE_DETAIL_(v) @@ -46,7 +46,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", PACKAGE_NAME " module loader" VALUE "FileVersion", STRINGIZE(__LIBCOB_VERSION)"."STRINGIZE(__LIBCOB_VERSION_MINOR)"."STRINGIZE(__LIBCOB_VERSION_PATCHLEVEL)"."STRINGIZE(VCS_REF) VALUE "InternalName", "cobcrun" - VALUE "LegalCopyright", "Copyright (C) 2004-2012, 2014-2021 Free Software Foundation, Inc." + VALUE "LegalCopyright", "Copyright (C) 2004-2012, 2014-2022 Free Software Foundation, Inc." VALUE "LegalTrademarks", "Module Loader: GNU General Public License v3 - see COPYING,\x0ADocumentation: GNU Free Documentation License." VALUE "OriginalFilename", "cobcrun.exe" VALUE "ProductName", PACKAGE_NAME " module loader" @@ -57,7 +57,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "SpecialBuild", "" /* Non-Standard entries */ - VALUE "Build", "Mar 2021" + VALUE "Build", "Jan 2022" VALUE "Developer", "Roger While, Simon Sobisch, Brian Tiffin (see AUTHORS and THANKS)" VALUE "Support", "https://www.gnu.org/software/gnucobol/" VALUE "Users", "Unlimited." diff --git a/build_windows/version_libcob.rc b/build_windows/version_libcob.rc index 375cfd0b6..02d001a35 100644 --- a/build_windows/version_libcob.rc +++ b/build_windows/version_libcob.rc @@ -1,12 +1,12 @@ #include -#include -#include +#include "tarstamp.h" +#include "config.h" #define COB_WITHOUT_EXCEPTIONS #define COB_WITHOUT_JMP -#include "libcob/common.h" -#define VCS_REF 4209 +#include "../libcob/common.h" +#define VCS_REF 4513 #define STRINGIZE_DETAIL_(v) #v #define STRINGIZE(v) STRINGIZE_DETAIL_(v) @@ -46,7 +46,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", PACKAGE_NAME " runtime, supporting most COBOL dialects with lots of extensions" VALUE "FileVersion", STRINGIZE(__LIBCOB_VERSION)"."STRINGIZE(__LIBCOB_VERSION_MINOR)"."STRINGIZE(__LIBCOB_VERSION_PATCHLEVEL)"."STRINGIZE(VCS_REF) VALUE "InternalName", "libcob" - VALUE "LegalCopyright", "Copyright (C) 2001-2021 Free Software Foundation, Inc." + VALUE "LegalCopyright", "Copyright (C) 2001-2022 Free Software Foundation, Inc." VALUE "LegalTrademarks", "Runtime: GNU Lesser General Public License v3 - see COPYING.LESSER,\x0ADocumentation: GNU Free Documentation License." VALUE "OriginalFilename", "libcob.dll" VALUE "ProductName", PACKAGE_NAME " runtime library" @@ -57,7 +57,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "SpecialBuild", "" /* Non-Standard entries */ - VALUE "Build", "Mar 2021" + VALUE "Build", "Jan 2022" VALUE "Developer", "Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Edward Hart and many others (see AUTHORS and THANKS)" VALUE "Support", "https://www.gnu.org/software/gnucobol/" VALUE "Users", "Unlimited." diff --git a/build_windows/vs2005/cobc.vcproj b/build_windows/vs2005/cobc.vcproj index c5b7c53c8..83d588c9c 100644 --- a/build_windows/vs2005/cobc.vcproj +++ b/build_windows/vs2005/cobc.vcproj @@ -41,7 +41,7 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) @@ -284,6 +284,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build_windows/vs2010/cobc.vcxproj.filters b/build_windows/vs2010/cobc.vcxproj.filters index da9082df6..7c8a3ad93 100644 --- a/build_windows/vs2010/cobc.vcxproj.filters +++ b/build_windows/vs2010/cobc.vcxproj.filters @@ -22,6 +22,15 @@ {c9882a98-fcb9-40c5-be83-cca99b089812} + + {843a7032-6e87-4f74-925e-8574698c106c} + + + {a4e990ea-24a0-4539-b6bc-da196e9473b8} + + + {05f178ca-efa3-41c6-9edf-1b702e6c7f60} + @@ -93,6 +102,114 @@ Header Files + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + diff --git a/build_windows/vs2010/cobcrun.vcxproj b/build_windows/vs2010/cobcrun.vcxproj index 50b49a6fd..8e3852a65 100644 --- a/build_windows/vs2010/cobcrun.vcxproj +++ b/build_windows/vs2010/cobcrun.vcxproj @@ -81,16 +81,16 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2010/libcob.vcxproj b/build_windows/vs2010/libcob.vcxproj index 76d4edac4..cbcb9c7df 100644 --- a/build_windows/vs2010/libcob.vcxproj +++ b/build_windows/vs2010/libcob.vcxproj @@ -73,16 +73,16 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2012/cobc.vcxproj b/build_windows/vs2012/cobc.vcxproj index 3e6377684..fd3363674 100644 --- a/build_windows/vs2012/cobc.vcxproj +++ b/build_windows/vs2012/cobc.vcxproj @@ -83,18 +83,18 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) @@ -288,6 +288,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build_windows/vs2012/cobc.vcxproj.filters b/build_windows/vs2012/cobc.vcxproj.filters index 9cea5da39..7c8a3ad93 100644 --- a/build_windows/vs2012/cobc.vcxproj.filters +++ b/build_windows/vs2012/cobc.vcxproj.filters @@ -14,13 +14,22 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - {52a26ee8-8710-4e07-bd0a-c645992b0580} + {1fe5076c-204b-4e02-9596-188b8a32470e} - {c8ba0efa-01fd-4bb0-b862-277aca9f93cf} + {8986b486-b27f-43cb-a931-57fc05ac3375} - {e010c45a-73a0-4dfd-85bd-dc395e22a3f3} + {c9882a98-fcb9-40c5-be83-cca99b089812} + + + {843a7032-6e87-4f74-925e-8574698c106c} + + + {a4e990ea-24a0-4539-b6bc-da196e9473b8} + + + {05f178ca-efa3-41c6-9edf-1b702e6c7f60} @@ -93,6 +102,114 @@ Header Files + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + diff --git a/build_windows/vs2012/cobcrun.vcxproj b/build_windows/vs2012/cobcrun.vcxproj index 7b89543c8..159e54490 100644 --- a/build_windows/vs2012/cobcrun.vcxproj +++ b/build_windows/vs2012/cobcrun.vcxproj @@ -83,18 +83,18 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2012/libcob.vcxproj b/build_windows/vs2012/libcob.vcxproj index b49009004..dc50b5427 100644 --- a/build_windows/vs2012/libcob.vcxproj +++ b/build_windows/vs2012/libcob.vcxproj @@ -75,16 +75,16 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2013/cobc.vcxproj b/build_windows/vs2013/cobc.vcxproj index dca088e90..4b52f209b 100644 --- a/build_windows/vs2013/cobc.vcxproj +++ b/build_windows/vs2013/cobc.vcxproj @@ -83,18 +83,18 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) @@ -290,6 +290,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build_windows/vs2013/cobc.vcxproj.filters b/build_windows/vs2013/cobc.vcxproj.filters index da9082df6..7c8a3ad93 100644 --- a/build_windows/vs2013/cobc.vcxproj.filters +++ b/build_windows/vs2013/cobc.vcxproj.filters @@ -22,6 +22,15 @@ {c9882a98-fcb9-40c5-be83-cca99b089812} + + {843a7032-6e87-4f74-925e-8574698c106c} + + + {a4e990ea-24a0-4539-b6bc-da196e9473b8} + + + {05f178ca-efa3-41c6-9edf-1b702e6c7f60} + @@ -93,6 +102,114 @@ Header Files + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + diff --git a/build_windows/vs2013/cobcrun.vcxproj b/build_windows/vs2013/cobcrun.vcxproj index 2e5d01916..dc77a4253 100644 --- a/build_windows/vs2013/cobcrun.vcxproj +++ b/build_windows/vs2013/cobcrun.vcxproj @@ -83,18 +83,18 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2013/libcob.vcxproj b/build_windows/vs2013/libcob.vcxproj index caead4a79..b2ec8b960 100644 --- a/build_windows/vs2013/libcob.vcxproj +++ b/build_windows/vs2013/libcob.vcxproj @@ -63,7 +63,7 @@ true $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) @@ -71,20 +71,20 @@ $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) false diff --git a/build_windows/vs2015/cobc.vcxproj b/build_windows/vs2015/cobc.vcxproj index 2e9431e6c..09e8ea507 100644 --- a/build_windows/vs2015/cobc.vcxproj +++ b/build_windows/vs2015/cobc.vcxproj @@ -83,18 +83,18 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) @@ -288,6 +288,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build_windows/vs2015/cobc.vcxproj.filters b/build_windows/vs2015/cobc.vcxproj.filters index 5c7ed187e..4df780a39 100644 --- a/build_windows/vs2015/cobc.vcxproj.filters +++ b/build_windows/vs2015/cobc.vcxproj.filters @@ -22,6 +22,15 @@ {c9882a98-fcb9-40c5-be83-cca99b089812} + + {843a7032-6e87-4f74-925e-8574698c106c} + + + {a4e990ea-24a0-4539-b6bc-da196e9473b8} + + + {05f178ca-efa3-41c6-9edf-1b702e6c7f60} + @@ -93,6 +102,114 @@ Header Files + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + diff --git a/build_windows/vs2015/cobcrun.vcxproj b/build_windows/vs2015/cobcrun.vcxproj index c4fc418c9..dde7b36a8 100644 --- a/build_windows/vs2015/cobcrun.vcxproj +++ b/build_windows/vs2015/cobcrun.vcxproj @@ -83,18 +83,18 @@ false - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2015/libcob.vcxproj b/build_windows/vs2015/libcob.vcxproj index bd4fac841..f1fdf9421 100644 --- a/build_windows/vs2015/libcob.vcxproj +++ b/build_windows/vs2015/libcob.vcxproj @@ -67,7 +67,7 @@ true $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) @@ -75,20 +75,20 @@ $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) false diff --git a/build_windows/vs2017/cobc.vcxproj b/build_windows/vs2017/cobc.vcxproj index d15d7e314..1a0918f6b 100644 --- a/build_windows/vs2017/cobc.vcxproj +++ b/build_windows/vs2017/cobc.vcxproj @@ -85,18 +85,18 @@ C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) @@ -292,6 +292,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build_windows/vs2017/cobc.vcxproj.filters b/build_windows/vs2017/cobc.vcxproj.filters index 5c7ed187e..4df780a39 100644 --- a/build_windows/vs2017/cobc.vcxproj.filters +++ b/build_windows/vs2017/cobc.vcxproj.filters @@ -22,6 +22,15 @@ {c9882a98-fcb9-40c5-be83-cca99b089812} + + {843a7032-6e87-4f74-925e-8574698c106c} + + + {a4e990ea-24a0-4539-b6bc-da196e9473b8} + + + {05f178ca-efa3-41c6-9edf-1b702e6c7f60} + @@ -93,6 +102,114 @@ Header Files + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + diff --git a/build_windows/vs2017/cobcrun.vcxproj b/build_windows/vs2017/cobcrun.vcxproj index 1c83b9274..8f80844d6 100644 --- a/build_windows/vs2017/cobcrun.vcxproj +++ b/build_windows/vs2017/cobcrun.vcxproj @@ -85,18 +85,18 @@ NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2017/libcob.vcxproj b/build_windows/vs2017/libcob.vcxproj index c93f6b5f0..d77a1b1ab 100644 --- a/build_windows/vs2017/libcob.vcxproj +++ b/build_windows/vs2017/libcob.vcxproj @@ -68,7 +68,7 @@ true $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) @@ -77,13 +77,13 @@ $(Platform)\$(Configuration)\$(TargetName)\ C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) @@ -91,7 +91,7 @@ $(Platform)\$(Configuration)\$(TargetName)\ C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) false diff --git a/build_windows/vs2019/cobc.vcxproj b/build_windows/vs2019/cobc.vcxproj index 691206478..0364a3b30 100644 --- a/build_windows/vs2019/cobc.vcxproj +++ b/build_windows/vs2019/cobc.vcxproj @@ -85,20 +85,18 @@ NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) - NativeRecommendedRules.ruleset + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath) - NativeRecommendedRules.ruleset + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) @@ -294,6 +292,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build_windows/vs2019/cobc.vcxproj.filters b/build_windows/vs2019/cobc.vcxproj.filters index 5c7ed187e..4df780a39 100644 --- a/build_windows/vs2019/cobc.vcxproj.filters +++ b/build_windows/vs2019/cobc.vcxproj.filters @@ -22,6 +22,15 @@ {c9882a98-fcb9-40c5-be83-cca99b089812} + + {843a7032-6e87-4f74-925e-8574698c106c} + + + {a4e990ea-24a0-4539-b6bc-da196e9473b8} + + + {05f178ca-efa3-41c6-9edf-1b702e6c7f60} + @@ -93,6 +102,114 @@ Header Files + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\dialects + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + + + Auxiliary Compiler Files\copybooks + diff --git a/build_windows/vs2019/cobcrun.vcxproj b/build_windows/vs2019/cobcrun.vcxproj index 1602a6acb..8f80844d6 100644 --- a/build_windows/vs2019/cobcrun.vcxproj +++ b/build_windows/vs2019/cobcrun.vcxproj @@ -85,20 +85,18 @@ NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) - NativeRecommendedRules.ruleset + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\bin;$(IncludePath) - NativeRecommendedRules.ruleset + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) diff --git a/build_windows/vs2019/libcob.vcxproj b/build_windows/vs2019/libcob.vcxproj index 752bc3b82..22a231d17 100644 --- a/build_windows/vs2019/libcob.vcxproj +++ b/build_windows/vs2019/libcob.vcxproj @@ -68,9 +68,8 @@ true $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(SolutionDir)..\..\lib;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) - NativeRecommendedRules.ruleset false @@ -78,22 +77,21 @@ $(Platform)\$(Configuration)\$(TargetName)\ NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(SolutionDir)..\..\lib;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(SolutionDir)..\..\lib;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) - NativeRecommendedRules.ruleset $(SolutionDir)..\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ NativeRecommendedRules.ruleset true - $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\libcob;$(SolutionDir)..\..\lib;$(IncludePath) + $(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath) $(OutDir);$(OutDir)..;$(LibraryPath) false diff --git a/build_windows/vs2019/libcob.vcxproj.filters b/build_windows/vs2019/libcob.vcxproj.filters index 4673dcac5..6cab1f966 100644 --- a/build_windows/vs2019/libcob.vcxproj.filters +++ b/build_windows/vs2019/libcob.vcxproj.filters @@ -72,10 +72,10 @@ Header Files + Header Files - Header Files diff --git a/build_windows/vs2019/libsupport.vcxproj b/build_windows/vs2019/libsupport.vcxproj index bfceedb6c..c47f9e74c 100644 --- a/build_windows/vs2019/libsupport.vcxproj +++ b/build_windows/vs2019/libsupport.vcxproj @@ -94,11 +94,9 @@ $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\lib;$(IncludePath) - NativeRecommendedRules.ruleset $(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\lib;$(IncludePath) - NativeRecommendedRules.ruleset diff --git a/cobc/cobc.c b/cobc/cobc.c index 12be020a4..ff52e9a24 100644 --- a/cobc/cobc.c +++ b/cobc/cobc.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. Authors: Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Brian Tiffin, @@ -23,7 +23,8 @@ /* #define DEBUG_REPLACE */ -#include +#include "tarstamp.h" +#include "config.h" #include #include @@ -54,14 +55,11 @@ #include -#include "tarstamp.h" #include "cobc.h" #include "tree.h" -#include "lib/gettext.h" - -#include "libcob/cobgetopt.h" +#include "../libcob/cobgetopt.h" #ifdef COB_INTERNAL_XREF enum xref_type { @@ -308,13 +306,13 @@ const size_t COBC_MEM_SIZE = #define COB_EXCEPTION(code,tag,name,fatal) {name, 0x##code, 0, fatal}, struct cb_exception cb_exception_table[] = { {NULL, 0, 0, 0}, /* CB_EC_ZERO */ -#include "libcob/exception.def" +#include "../libcob/exception.def" {NULL, 0, 0, 0} /* CB_EC_MAX */ }; const struct cb_exception cb_io_exception_table[] = { {NULL, 0, 0, 0}, -#include "libcob/exception-io.def" +#include "../libcob/exception-io.def" {NULL, 0, 0, 0} /* CB_EC_MAX */ }; #undef COB_EXCEPTION @@ -2375,7 +2373,7 @@ static void cobc_print_version (void) { printf ("cobc (%s) %s.%d\n", PACKAGE_NAME, PACKAGE_VERSION, PATCH_LEVEL); - puts ("Copyright (C) 2021 Free Software Foundation, Inc."); + puts ("Copyright (C) 2022 Free Software Foundation, Inc."); printf (_("License GPLv3+: GNU GPL version 3 or later <%s>"), "https://gnu.org/licenses/gpl.html"); putchar ('\n'); puts (_("This is free software; see the source for copying conditions. There is NO\n" diff --git a/cobc/cobc.h b/cobc/cobc.h index 2457e37cd..6729fb47e 100644 --- a/cobc/cobc.h +++ b/cobc/cobc.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart, Ron Norman, Dave Pitts @@ -31,10 +31,10 @@ #include #endif -#include "libcob.h" +#include "../libcob/common.h" #ifdef ENABLE_NLS -#include "gettext.h" /* from lib/ */ +#include "../lib/gettext.h" #define _(s) gettext(s) #define N_(s) gettext_noop(s) #else diff --git a/cobc/codegen.c b/cobc/codegen.c index 878e20dc2..15f6013c2 100644 --- a/cobc/codegen.c +++ b/cobc/codegen.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2003-2021 Free Software Foundation, Inc. + Copyright (C) 2003-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Edward Hart @@ -19,7 +19,7 @@ along with GnuCOBOL. If not, see . */ - +#include "tarstamp.h" #include "config.h" #include @@ -31,7 +31,6 @@ #include #include -#include "tarstamp.h" #include "cobc.h" #include "tree.h" @@ -255,7 +254,7 @@ static unsigned int i_counters[COB_MAX_SUBSCRIPTS]; #define COB_SYSTEM_GEN(cob_name, pmin, pmax, c_name) { cob_name, #c_name, pmax }, static const struct system_table system_tab[] = { -#include "libcob/system.def" +#include "../libcob/system.def" { NULL, NULL, 0 } }; diff --git a/cobc/codeoptim.c b/cobc/codeoptim.c index 13c3421ff..381fbb312 100644 --- a/cobc/codeoptim.c +++ b/cobc/codeoptim.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2006-2012, 2013, 2017-2018 Free Software Foundation, Inc. + Copyright (C) 2006-2012, 2013, 2017-2018, 2022 Free Software Foundation, Inc. Written by Roger While, Ron Norman This file is part of GnuCOBOL. @@ -18,7 +18,7 @@ along with GnuCOBOL. If not, see . */ -#include +#include "config.h" #include #include diff --git a/cobc/config.c b/cobc/config.c index 08158378f..dab62065e 100644 --- a/cobc/config.c +++ b/cobc/config.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2003-2012, 2014-2017, 2019-2021 Free Software Foundation, Inc. + Copyright (C) 2003-2012, 2014-2017, 2019-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include @@ -424,6 +424,8 @@ cb_load_conf (const char *fname, const int prefix_dir) /* Get the name for the configuration file */ if (prefix_dir) { + // CHECKME: would it be useful for at least MinGW to use "all slash" + // if the first slash is a unix slash? snprintf (buff, (size_t)COB_NORMAL_MAX, "%s%c%s", cob_config_dir, SLASH_CHAR, fname); name = buff; @@ -596,7 +598,7 @@ cb_config_entry (char *buff, const char *fname, const int line) } /* if explicit requested: disable */ if (strcmp (val, "default") == 0 - || strcmp (val, "off") == 0) { + || strcmp (val, "off") == 0) { *((const char **)var) = NULL; } else { *((const char **)var) = val; diff --git a/cobc/error.c b/cobc/error.c index 1d3cbe24f..4e44b9d38 100644 --- a/cobc/error.c +++ b/cobc/error.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include diff --git a/cobc/field.c b/cobc/field.c index 8c73d5d28..a0c83848d 100644 --- a/cobc/field.c +++ b/cobc/field.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman, Edward Hart @@ -20,7 +20,7 @@ */ -#include +#include "config.h" #include #include @@ -31,6 +31,7 @@ #include "cobc.h" #include "tree.h" +#include "../libcob/coblocal.h" /* sanity checks */ #if COB_MAX_FIELD_SIZE > INT_MAX diff --git a/cobc/help.c b/cobc/help.c index 0d3c9218b..e07054e92 100644 --- a/cobc/help.c +++ b/cobc/help.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Brian Tiffin, Edward Hart, Dave Pitts @@ -19,12 +19,11 @@ along with GnuCOBOL. If not, see . */ -#include +#include "config.h" #include #include "cobc.h" -#include "lib/gettext.h" void cobc_print_usage (char * prog) diff --git a/cobc/pplex.l b/cobc/pplex.l index 279d10c9b..8b927398f 100644 --- a/cobc/pplex.l +++ b/cobc/pplex.l @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Dave Pitts This file is part of GnuCOBOL. @@ -73,7 +73,7 @@ static int ppwrap (void) { requires_listing_line = 1; \ comment_allowed = 1; -#include +#include "config.h" #ifdef HAVE_UNISTD_H #include diff --git a/cobc/ppparse.y b/cobc/ppparse.y index 29d20e9fe..8d839bb07 100644 --- a/cobc/ppparse.y +++ b/cobc/ppparse.y @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2015-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2015-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart This file is part of GnuCOBOL. @@ -32,7 +32,7 @@ */ %{ -#include +#include "config.h" #include #include diff --git a/cobc/reserved.c b/cobc/reserved.c index f6eb0e42e..31ee2182a 100644 --- a/cobc/reserved.c +++ b/cobc/reserved.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include diff --git a/cobc/scanner.l b/cobc/scanner.l index be0b7c64a..71ee8af50 100644 --- a/cobc/scanner.l +++ b/cobc/scanner.l @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Edwart Hart, Ron Norman @@ -80,7 +80,7 @@ static int yywrap (void) { pic_buff2 = cobc_malloc (pic2_size); \ } -#include +#include "config.h" #include #include diff --git a/cobc/tree.c b/cobc/tree.c index d75976d1c..3c118b422 100644 --- a/cobc/tree.c +++ b/cobc/tree.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman, Edward Hart @@ -20,7 +20,7 @@ */ -#include +#include "config.h" #include #include @@ -41,6 +41,7 @@ #endif #include "cobc.h" +#include "../libcob/coblocal.h" #include "tree.h" #define _PARSER_H /* work around bad Windows SDK header */ #include "parser.h" diff --git a/cobc/typeck.c b/cobc/typeck.c index 26b0b2052..0d7e96647 100644 --- a/cobc/typeck.c +++ b/cobc/typeck.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman, Edward Hart @@ -248,7 +248,7 @@ static const unsigned char cob_refer_ebcdic[256] = { #define COB_SYSTEM_GEN(cob_name, pmin, pmax, c_name) { cob_name, pmin, pmax }, static const struct system_table system_tab[] = { -#include "libcob/system.def" +#include "../libcob/system.def" { NULL, 0, 0 } }; diff --git a/config/runtime.cfg b/config/runtime.cfg index afbbcaeef..581e3e954 100644 --- a/config/runtime.cfg +++ b/config/runtime.cfg @@ -1,6 +1,6 @@ # GnuCOBOL runtime configuration # -# Copyright (C) 2015-2021 Free Software Foundation, Inc. +# Copyright (C) 2015-2022 Free Software Foundation, Inc. # Written by Simon Sobisch, Ron Norman # # This file is part of the GnuCOBOL runtime. @@ -151,7 +151,8 @@ # Parameter name: dump_file # Purpose: to define where COBOL dump output should go # Note: the -fdump=all compile option prepares for dump; -# file is opened for append if name starts with "+" +# file is opened for append if name starts with "+"; +# may be disabled by setting it to "NONE" # Type: string : $$ is replaced by process id # Default: stderr # Example: DUMP_FILE ${HOME}/mytrace.log diff --git a/libcob.h b/libcob.h index a8c6372d5..0210580bc 100644 --- a/libcob.h +++ b/libcob.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2012, 2019 Free Software Foundation, Inc. + Copyright (C) 2002-2012, 2019, 2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch This file is part of GnuCOBOL. @@ -26,7 +26,7 @@ extern "C" { #endif -#include +#include "libcob/common.h" /* below this (system) header file */ #ifdef __cplusplus } diff --git a/libcob/ChangeLog b/libcob/ChangeLog index 38eef08e5..3608fe0f2 100644 --- a/libcob/ChangeLog +++ b/libcob/ChangeLog @@ -1,4 +1,8 @@ +2022-01-03 Simon Sobisch + + * coblocal.h, common.h: moved some internal limits to coblocal.h + 2021-12-03 Simon Sobisch * common.c (print_version_summary) [__PDCURSES__]: show version @@ -4745,7 +4749,7 @@ (cob_init_call): Initialize 'dynamic_reloading'. -Copyright 2002-2021 Free Software Foundation, Inc. +Copyright 2002-2022 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/libcob/call.c b/libcob/call.c index b79d0e1f3..790d29504 100644 --- a/libcob/call.c +++ b/libcob/call.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2003-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2003-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #ifndef _GNU_SOURCE #define _GNU_SOURCE 1 @@ -116,7 +116,7 @@ lt_dlerror (void) /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" #define COB_MAX_COBCALL_PARMS 16 @@ -770,7 +770,7 @@ cob_encode_program_id (const unsigned char *const name, { int pos = 0; /* Encode the initial digit */ - if (unlikely (*name <= (unsigned char)'9' && *name >= (unsigned char)'0')) { + if (unlikely (isdigit(name[0]))) { name_buff[pos++] = (unsigned char)'_'; } /* Encode invalid letters */ @@ -2042,6 +2042,7 @@ cob_get_field_str (const cob_field *f, char *buffer, size_t size) unsigned char pretty = COB_MODULE_PTR->flag_pretty_display; COB_MODULE_PTR->flag_pretty_display = 1; cob_display_common (f, fp); + COB_MODULE_PTR->flag_pretty_display = pretty; #ifndef HAVE_FMEMOPEN { int cur_pos = ftell (fp); @@ -2054,7 +2055,6 @@ cob_get_field_str (const cob_field *f, char *buffer, size_t size) } #endif fclose (fp); - COB_MODULE_PTR->flag_pretty_display = pretty; } } return buffer; diff --git a/libcob/cobgetopt.c b/libcob/cobgetopt.c index 3c2eaf350..9beaf119c 100644 --- a/libcob/cobgetopt.c +++ b/libcob/cobgetopt.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2010-2012, 2014-2016, 2018-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2012, 2014-2016, 2018-2020, 2022 Free Software Foundation, Inc. Modified for use in GnuCOBOL by Roger While, Simon Sobisch */ @@ -21,7 +21,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include "config.h" #include #include @@ -54,7 +54,7 @@ non-option arguments as arguments to the option character '\x01'. */ #ifdef ENABLE_NLS -#include "lib/gettext.h" +#include "../lib/gettext.h" #define _(msgid) gettext(msgid) #define N_(msgid) gettext_noop(msgid) #else @@ -69,7 +69,7 @@ /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "cobgetopt.h" diff --git a/libcob/coblocal.h b/libcob/coblocal.h index 77cfe686d..4a16923db 100644 --- a/libcob/coblocal.h +++ b/libcob/coblocal.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2007-2012, 2014-2022 Free Software Foundation, Inc. Written by Roger While, Simon Sobisch, Ron Norman This file is part of GnuCOBOL. @@ -41,7 +41,7 @@ #ifdef ENABLE_NLS -#include "gettext.h" /* from lib/ */ +#include "../lib/gettext.h" #define _(s) gettext(s) #define N_(s) gettext_noop(s) #else @@ -387,6 +387,24 @@ struct config_tbl { #define SETPOS(member) offsetof(cob_settings,member),sizeof(cobsetptr->member),0,0 +/* max sizes */ + +/* Maximum bytes in a single/group field, + which doesn't contain UNBOUNDED items */ + /* TODO: add compiler configuration for limiting this */ +#ifndef COB_64_BIT_POINTER +#define COB_MAX_FIELD_SIZE 268435456 +#else +#define COB_MAX_FIELD_SIZE 2147483646 +#endif + +/* Maximum bytes in an unbounded table entry + (IBM: old 999999998, current 999999999) */ +#ifndef COB_64_BIT_POINTER +#define COB_MAX_UNBOUNDED_SIZE 999999999 +#else +#define COB_MAX_UNBOUNDED_SIZE 2147483646 +#endif /* Local function prototypes */ COB_HIDDEN void cob_init_numeric (cob_global *); diff --git a/libcob/common.c b/libcob/common.c index d1144a21c..50b712b0e 100644 --- a/libcob/common.c +++ b/libcob/common.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman This file is part of GnuCOBOL. @@ -18,8 +18,8 @@ along with GnuCOBOL. If not, see . */ -#include "config.h" #include "tarstamp.h" +#include "config.h" #include #include @@ -135,8 +135,6 @@ /* end of library headers */ -#include "lib/gettext.h" - /* Force symbol exports */ #define COB_LIB_EXPIMP #include "common.h" @@ -8066,7 +8064,7 @@ print_version (void) printf ("libcob (%s) %s.%d\n", PACKAGE_NAME, PACKAGE_VERSION, PATCH_LEVEL); - puts ("Copyright (C) 2021 Free Software Foundation, Inc."); + puts ("Copyright (C) 2022 Free Software Foundation, Inc."); printf (_("License LGPLv3+: GNU LGPL version 3 or later <%s>"), "https://gnu.org/licenses/lgpl.html"); putchar ('\n'); puts (_("This is free software; see the source for copying conditions. There is NO\n" diff --git a/libcob/common.h b/libcob/common.h index 96fca3a0d..2ea7c36c6 100644 --- a/libcob/common.h +++ b/libcob/common.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2002-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman, Edward Hart @@ -545,11 +545,6 @@ only usable with COB_USE_VC2013_OR_GREATER */ /* End compiler stuff */ -/* TODO: move everything not needed here to coblocal.h */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - /* EBCDIC determination */ @@ -615,22 +610,7 @@ only usable with COB_USE_VC2013_OR_GREATER */ /* Maximum exponent digits (both in literals and floating-point numeric-edited item */ #define COB_FLOAT_DIGITS_MAX 36 -/* Maximum bytes in a single/group field, - which doesn't contain UNBOUNDED items */ -/* TODO: add compiler configuration for limiting this */ -#ifndef COB_64_BIT_POINTER -#define COB_MAX_FIELD_SIZE 268435456 -#else -#define COB_MAX_FIELD_SIZE 2147483646 -#endif - -/* Maximum bytes in an unbounded table entry - (IBM: old 999999998, current 999999999) */ -#ifndef COB_64_BIT_POINTER -#define COB_MAX_UNBOUNDED_SIZE 999999999 -#else -#define COB_MAX_UNBOUNDED_SIZE 2147483646 -#endif +/* note: more (internal-only) limits in coblocal.h */ /* Maximum number of cob_decimal structures */ #define COB_MAX_DEC_STRUCT 32 @@ -794,7 +774,7 @@ enum cob_fatal_error { enum cob_exception_id { COB_EC_ZERO = 0, -#include +#include "exception.def" /* located and installed next to common.h */ COB_EC_MAX }; diff --git a/libcob/exception.def b/libcob/exception.def index 56394714c..9cd643ca4 100644 --- a/libcob/exception.def +++ b/libcob/exception.def @@ -226,7 +226,7 @@ COB_EXCEPTION (1502, COB_EC_FUNCTION_PTR_NULL, /* EC-I-O --> for complete group see external definitions */ -#include "exception-io.def" +#include "exception-io.def" /* located and installed next to common.h */ /* Implementation-defined exception condition */ diff --git a/libcob/fileio.c b/libcob/fileio.c index a7bff91ac..8a368cc16 100644 --- a/libcob/fileio.c +++ b/libcob/fileio.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2002-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman This file is part of GnuCOBOL. @@ -157,7 +157,7 @@ static vb_rtd_t *vbisam_rtd = NULL; /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" #ifdef WITH_ANY_ISAM diff --git a/libcob/intrinsic.c b/libcob/intrinsic.c index c07d46c2d..7548a05a5 100644 --- a/libcob/intrinsic.c +++ b/libcob/intrinsic.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2005-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2005-2012, 2014-2022 Free Software Foundation, Inc. Written by Roger While, Simon Sobisch, Edward Hart, Brian Tiffin This file is part of GnuCOBOL. @@ -43,7 +43,7 @@ #else #error either HAVE_GMP_H or HAVE_MPIR_H needs to be defined #endif -#include "libcob.h" +#include "common.h" #include "coblocal.h" /* Note we include the Cygwin version of windows.h here */ diff --git a/libcob/mlio.c b/libcob/mlio.c index 96ad75441..845f26fec 100644 --- a/libcob/mlio.c +++ b/libcob/mlio.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Free Software Foundation, Inc. + Copyright (C) 2018-2020, 2022 Free Software Foundation, Inc. Written by Edward Hart, Simon Sobisch This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include @@ -28,7 +28,7 @@ /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" #if defined (WITH_XML2) diff --git a/libcob/move.c b/libcob/move.c index 06e8ae170..12ec12973 100644 --- a/libcob/move.c +++ b/libcob/move.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2012, 2014-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2012, 2014-2020, 2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman, Edwart Hard @@ -20,7 +20,7 @@ */ -#include +#include "config.h" #include #include @@ -36,7 +36,7 @@ /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" static cob_global *cobglobptr; @@ -1217,12 +1217,13 @@ cob_move (cob_field *src, cob_field *dst) { int opt; cob_field temp; - unsigned char data[4]; + unsigned char data[2]; if (src == dst) { return; } if (dst->size == 0) { + /* TODO: for dynamic sized items: allocate and go on */ return; } if (unlikely (src->size == 0)) { diff --git a/libcob/numeric.c b/libcob/numeric.c index 76a34d75a..2e589a3a5 100644 --- a/libcob/numeric.c +++ b/libcob/numeric.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #ifndef _GNU_SOURCE #define _GNU_SOURCE 1 @@ -61,7 +61,7 @@ #else #error either HAVE_GMP_H or HAVE_MPIR_H needs to be defined #endif -#include "libcob.h" +#include "common.h" #include "coblocal.h" diff --git a/libcob/reportio.c b/libcob/reportio.c index 5920282ad..7a843a2a1 100644 --- a/libcob/reportio.c +++ b/libcob/reportio.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2021 Free Software Foundation, Inc. + Copyright (C) 2013-2022 Free Software Foundation, Inc. Written by Ron Norman, Simon Sobisch This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include @@ -30,7 +30,7 @@ /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" /* hard limit: */ diff --git a/libcob/screenio.c b/libcob/screenio.c index 22f91c359..eeaf429a0 100644 --- a/libcob/screenio.c +++ b/libcob/screenio.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include @@ -70,7 +70,7 @@ /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" #ifdef HAVE_CURSES_FREEALL diff --git a/libcob/strings.c b/libcob/strings.c index a7d19d505..bb9378d4b 100644 --- a/libcob/strings.c +++ b/libcob/strings.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2014, 2016-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2014, 2016-2020, 2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Edward Hart, Simon Sobisch This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include @@ -31,7 +31,7 @@ /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" enum inspect_type { diff --git a/libcob/termio.c b/libcob/termio.c index eb4d82af2..0e83986ce 100644 --- a/libcob/termio.c +++ b/libcob/termio.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2012, 2014-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc. Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart This file is part of GnuCOBOL. @@ -19,7 +19,7 @@ */ -#include +#include "config.h" #include #include @@ -35,7 +35,7 @@ /* Force symbol exports */ #define COB_LIB_EXPIMP -#include "libcob.h" +#include "common.h" #include "coblocal.h" /* Local variables */