header cleanup

* general: revert change 2019-06-05 - all header files that are included from the system use <include.h>, "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

@@ -1,4 +1,12 @@
 
+2022-01-03  Simon Sobisch <[email protected]>
+
+	* general: revert change 2019-06-05 - all header files that are included
+	  from the system use <include.h>, "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 <[email protected]>
 
 	* 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.

bin/ChangeLog

@@ -1,4 +1,8 @@
 
+2022-01-03  Simon Sobisch <[email protected]>
+
+	* cobcrun.c: include libcob headers relative and tarstamp.h early
+
 2021-05-27  Simon Sobisch <[email protected]>
 
 	* 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.

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 <https://www.gnu.org/licenses/>.
 */
 
+#include "tarstamp.h"
 #include "config.h"
 
 #include <stdio.h>
@@ -32,10 +33,8 @@
 #include <unistd.h>
 #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"

build_windows/ChangeLog.txt

@@ -1,4 +1,9 @@
 
+2022-01-03  Simon Sobisch <[email protected]>
+
+	* general: project files - only include "build_windows" and top_srcdir;
+	  for cobc.vcxproj: have auxiliary compiler files included
+
 2021-11-06  Simon Sobisch <[email protected]>
 
 	* config.h.in: moved references to PACKACAGE_defines after the define,

build_windows/version_cobc.rc

@@ -1,12 +1,12 @@
 #include <windows.h>
 
-#include <tarstamp.h>
-#include <config.h>
+#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."

build_windows/version_cobcrun.rc

@@ -1,12 +1,12 @@
 #include <windows.h>
 
-#include <tarstamp.h>
-#include <config.h>
+#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."

build_windows/version_libcob.rc

@@ -1,12 +1,12 @@
 #include <windows.h>
 
-#include <tarstamp.h>
-#include <config.h>
+#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."

build_windows/vs2005/cobc.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\.."
 				PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"

build_windows/vs2008/cobc.vcproj

@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\.."
 				PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"

build_windows/vs2010/cobc.vcxproj

@@ -81,16 +81,16 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(SolutionDir)..\..\cobc;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..;$(SolutionDir)..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -284,6 +284,42 @@
     <None Include="..\..\cobc\ppparse.def" />
     <None Include="..\..\cobc\warning.def" />
     <None Include="..\..\cobc\ChangeLog" />
+    <None Include="..\..\config\acu-strict.conf" />
+    <None Include="..\..\config\acu.conf" />
+    <None Include="..\..\config\acu.words" />
+    <None Include="..\..\config\bs2000-strict.conf" />
+    <None Include="..\..\config\bs2000.conf" />
+    <None Include="..\..\config\bs2000.words" />
+    <None Include="..\..\config\ChangeLog" />
+    <None Include="..\..\config\cobol2002.conf" />
+    <None Include="..\..\config\cobol2002.words" />
+    <None Include="..\..\config\cobol2014.conf" />
+    <None Include="..\..\config\cobol2014.words" />
+    <None Include="..\..\config\cobol85.conf" />
+    <None Include="..\..\config\cobol85.words" />
+    <None Include="..\..\config\default.conf" />
+    <None Include="..\..\config\ibm-strict.conf" />
+    <None Include="..\..\config\ibm.conf" />
+    <None Include="..\..\config\ibm.words" />
+    <None Include="..\..\config\lax.conf-inc" />
+    <None Include="..\..\config\mf-strict.conf" />
+    <None Include="..\..\config\mf.conf" />
+    <None Include="..\..\config\mf.words" />
+    <None Include="..\..\config\mvs-strict.conf" />
+    <None Include="..\..\config\mvs.conf" />
+    <None Include="..\..\config\mvs.words" />
+    <None Include="..\..\config\realia-strict.conf" />
+    <None Include="..\..\config\realia.conf" />
+    <None Include="..\..\config\realia.words" />
+    <None Include="..\..\config\rm-strict.conf" />
+    <None Include="..\..\config\rm.conf" />
+    <None Include="..\..\config\rm.words" />
+    <None Include="..\..\config\xopen.conf" />
+    <None Include="..\..\copy\ChangeLog" />
+    <None Include="..\..\copy\screenio.cpy" />
+    <None Include="..\..\copy\sqlca.cpy" />
+    <None Include="..\..\copy\sqlda.cpy" />
+    <None Include="..\..\copy\xfhfcd.cpy" />
     <None Include="..\..\libcob\exception-io.def" />
     <None Include="..\..\libcob\exception.def" />
     <None Include="..\..\libcob\system.def" />