From 3210068d2ad21d5370a93d13132d6bcecbe91aa5 Mon Sep 17 00:00:00 2001 From: sf-mensch Date: Mon, 14 Mar 2022 21:45:42 +0000 Subject: [PATCH] minor updates --- DEPENDENCIES.md | 18 +++++++++--------- README.md | 8 ++++---- build_windows/gcvsvars.cmd | 8 ++++---- cobc/cobc.c | 2 +- cobc/config.c | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index b549eb8fa..266459ff7 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -7,7 +7,7 @@ compilation phase, and dynamic libraries linked either to `libcob`, or to the compiled binary (the compiled version of your COBOL program). Packaging systems, particularly on Linux, sometimes include only the run-time components in the main package, and split the -compile-time pieces off to a "development" package. +compile-time pieces off to a "development" package. You need both. Header files are required for compilation, and libraries for run-time support. @@ -23,31 +23,31 @@ GnuCOBOL requires *one of* the following external libraries to be installed for decimal arithmetic: * [GNU MP](https://gmplib.org) (libgmp) 4.1.2 or later. -* [MPIR](http://mpir.org) (libgmp - MPIR gmp-compat) 1.3.1 or later. -This is preferred when compiling on Windows with other compilers than gcc. +* [MPIR](http://mpir.org) (libgmp - MPIR gmp-compat) 1.3.1 or later. +This is preferred when compiling on Windows with other compilers than gcc. GNU MP and MPIR are distributed under GNU Lesser General Public License. Seldom Required =============== -CnuCOBOL requires support for dynamic linking, a feature of nearly all +GnuCOBOL requires support for dynamic linking, a feature of nearly all target operating systems. Among those that include it are Windows, Solaris, Linux, any BSD, and recent versions of AIX (>= 5.1) and HP-UX (>= 11.1). -If your OS is some flavor of Unix and has no support for -**dlopen**(3), it can be provided by +If your OS is some flavor of Unix or DOS and has no support for **dlopen**(3), +it can be provided by * [GNU Libtool](https://www.gnu.org/software/libtool/libtool.html) (libltdl) -`libltdl` is used to implement dynamic CALL statements. +`libltdl` is used to implement dynamic CALL statements on those systems. GNU Libtool is distributed under GNU Lesser General Public License. Not Required ============ - (but helpful) +(but helpful) All dependencies discussed from this point forward support optional features of GnuCOBOL. @@ -92,7 +92,7 @@ by *one* of the following: * [PDCurses](https://pdcurses.org/) or [PDCursesMod](https://github.com/Bill-Gray/PDCursesMod/), especially for MinGW and native windows ports - + PDCurses is distributed as Public Domain. * Unix curses (if supplied by your OS) diff --git a/README.md b/README.md index c31e493bb..7106f6948 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[GnuCOBOL}(https://www.gnu.org/software/gnucobol/) is a free +[GnuCOBOL](https://www.gnu.org/software/gnucobol/) is a free COBOL compiler licensed under the GNU Public License (GPL). It implements a substantial part of the COBOL 85, COBOL 2002 and COBOL 2014 standards, as well as many extensions @@ -147,7 +147,7 @@ see HACKING. Further information about the project, including the source code repository, history, and frequently asked questions, may be found at -* https://www.gnu.org/software/gnucobol/ -* https://sourceforge.net/projects/gnucobol -* https://savannah.gnu.org/projects/gnucobol +* https://www.gnu.org/software/gnucobol/ +* https://sourceforge.net/projects/gnucobol +* https://savannah.gnu.org/projects/gnucobol diff --git a/build_windows/gcvsvars.cmd b/build_windows/gcvsvars.cmd index ed0247321..e3348c6d4 100644 --- a/build_windows/gcvsvars.cmd +++ b/build_windows/gcvsvars.cmd @@ -1,4 +1,4 @@ -:: Copyright (C) 2014-2020 Free Software Foundation, Inc. +:: Copyright (C) 2014-2020,2022 Free Software Foundation, Inc. :: Written by Simon Sobisch, Edward Hart :: :: This file is part of GnuCOBOL. @@ -58,7 +58,7 @@ if "%errorlevel%" == "0" ( :: Visual Studio 2017 and newer: no VS150COMNTOOLS globally or vsvars any more... :: check if available, otherwise check on set "found=" -for %%v in (2019 2017) do ( +for %%v in (2022 2019 2017) do ( if not "%found%" == "" goto :eof call :vsvars_current %%v ) @@ -67,8 +67,8 @@ if not "%found%" == "" ( goto :setup_gc ) -:: Visual Studio 2015, 2013, 2012, 2010, 2008, 2005 -for %%v in ("%VS140COMNTOOLS%" "%VS120COMNTOOLS%" "%VS110COMNTOOLS%" "%VS100COMNTOOLS%" "%VS90COMNTOOLS%" "%VS80COMNTOOLS%") do ( +:: Visual Studio 2015, 2013, 2012, 2010, 2008 +for %%v in ("%VS140COMNTOOLS%" "%VS120COMNTOOLS%" "%VS110COMNTOOLS%" "%VS100COMNTOOLS%" "%VS90COMNTOOLS%") do ( if not "%found%" == "" goto :eof call :vsvars_old "%%v" ) diff --git a/cobc/cobc.c b/cobc/cobc.c index 693b4b453..379358450 100644 --- a/cobc/cobc.c +++ b/cobc/cobc.c @@ -4063,7 +4063,7 @@ process_filename (const char *filename) fn->demangle_source = cb_encode_program_id (fbasename, 0, cb_fold_call); /* Check input file type */ - if (strcasecmp (extension, "i") == 0) { + if (cb_strcasecmp (extension, "i") == 0) { /* Already preprocessed */ fn->need_preprocess = 0; } else diff --git a/cobc/config.c b/cobc/config.c index dab62065e..ac7e9f4db 100644 --- a/cobc/config.c +++ b/cobc/config.c @@ -424,8 +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? + /* 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;