Merge branch 'gcos4gnucobol-3.x' of https://github.com/OCamlPro/gnucobol

 into engboris-imp-directive

.github/workflows/macos.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install pkg-config automake libtool help2man texinfo bison berkeley-db@4 json-c
+          brew install automake libtool help2man texinfo bison berkeley-db@4 json-c
           opt="/opt/homebrew/opt"
           echo "$opt/pkg-config/bin" >> $GITHUB_PATH
           echo "LDFLAGS=-L$opt/berkeley-db@4/lib ${LDFLAGS}" >> $GITHUB_ENV
@@ -54,6 +54,7 @@ jobs:
           cd _build
           ../configure --enable-cobc-internal-checks \
                        --enable-hardening \
+                       --with-curses=ncurses \
                        --prefix /opt/cobol/gnucobol-gcos \
 
       - name: make

.gitpod.yml

@@ -3,17 +3,17 @@ image: gitpod/workspace-c
 
 tasks:
 
-- name: setup coding environment on Ubuntu 20.04
+- name: setup coding environment on Ubuntu 22.04
   before: |
     # note: sadly we need this to be done every time as only /workspace is kept, but linked
     #       against those dependencies; and also we do want to recompile after adjustments
     #       this can all be dropped as soon as we would use a prepared docker
     sudo apt update && sudo apt upgrade -y
     sudo apt install -y build-essential libgmp-dev libdb-dev libjson-c-dev ncurses-dev libxml2-dev \
-         automake libtool flex bison help2man texinfo \
+         automake libtool flex bison help2man gettext texinfo \
          lcov \
          clangd bear
-    # sudo apt install gettext texlive-base  # for make dist (po/*, doc/gnucobol.pdf)
+    # sudo apt install texlive-base  # for make dist (doc/gnucobol.pdf)
     gp sync-done system-prepare
 
 - name: building GnuCOBOL

ChangeLog

@@ -1,4 +1,18 @@
 
+2024-12-08  Simon Sobisch <[email protected]>
+
+	* configure.ac: fix check for curses functions if panel headers are found
+
+2024-10-30  Simon Sobisch <[email protected]>
+
+	* configure.ac: added logic to check for PANEL support which
+	  is required for the new multiple window support
+
+2024-10-02  Simon Sobisch <[email protected]>
+
+	* configure.ac: new options --with-pkgversion=PKG and --with-bugurl=URL
+	  see NEWS, currently only used in version and help output
+
 2024-09-29  Simon Sobisch <[email protected]>
 
 	* configure.ac: drop COB_LI_IS_LL in favor of existing COB_32_BIT_LONG

NEWS

@@ -20,9 +20,11 @@ NEWS - user visible changes				-*- outline -*-
    customization can be done using COB_PROF_FILE, COB_PROF_MAX_DEPTH and
    COB_PROF_FORMAT
 
-** new runtime configuraiton COB_HIDE_CURSOR, allows to hide the cursor during
+** new runtime configuration COB_HIDE_CURSOR, allows to hide the cursor during
    extended ScreenIO operations
 
+** added multiple window functionality with new system function CBL_GC_WINDOW
+
   more work in progress
 
 * Changes that potentially effect recompilation of existing programs:
@@ -97,6 +99,13 @@ NEWS - user visible changes				-*- outline -*-
    this is used for character encoding support, which otherwise is only provided
    partially
 
+** configure now accepts --with-bugurl=URL which can be used to output a link
+   to an external or local URL (like file://) instead of the bug mailing list
+
+** configure now accepts --with-pkgversion=PKG which can be used to customize
+   the version output with a free-standing string (like revision number or
+   package manager version)
+
 ** use the "default" -shared flag to build dynamic libraries on macOS
    so as to fix testuite issues with recent macOS versions
 

THANKS

@@ -50,15 +50,16 @@ Sergey Kashyrin - For his work on:
 
 And continuing this amazing support:
 Arnold Trembley <[email protected]> - Win32 packaging and user support
-Chuck Haatvedt <[email protected]> - Work on optimized BCD handling
+Chuck Haatvedt <[email protected]> - Work on optimized BCD handling,
+   general numeric performance and screenio extensions like WCB
 Ludwin Janvier <[email protected]> - patches for build/packaging issues
 Hans-Martin Rasch - Work on compiler syntax
 Michel Gouget - Work on syntax - IS
 Bill Klein - The mainstay for COBOL questions
 Frank Swarbrick - Work on compiler syntax
 Warren Gay - For testing systems we didn't even know we supported!
    (e.g. old DEC Alpha systems)
-Fabrizio Calabretta - Work on the internal EXTFH interface
+Fabrizio Calabretta - Work on the OpenCOBOL internal EXTFH interface
 
 Gary L. Cutler <[email protected]> and Vincent B. Coen <[email protected]> for
 writing and maintaining the GnuCOBOL Programmer's Guide.

bin/ChangeLog

@@ -1,4 +1,12 @@
 
+2024-10-02  Simon Sobisch <[email protected]>
+
+	* cobcrun.c (cobcrun_print_version): build and package data only
+	  shown in verbose mode;
+	  PACKAGE_NAME may now be overwritten by PKGVERSION (new configure option)
+	* cobcrun.c (cobcrun_print_usage): handle PACKAGE_BUGREPORT_URL as
+	  alternative to mailing list, now resolved by PACKAGE_BUGREPORT
+
 2023-07-24  Simon Sobisch <[email protected]>
 
 	* cob-config.in: prevent warning to use datadir, but not datarootdir;
@@ -291,7 +299,7 @@
 	  then you can switch easily.
 
 
-Copyright 2004-2008,2010,2012,2014-2023 Free Software Foundation, Inc.
+Copyright 2004-2008,2010,2012,2014-2024 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004-2012, 2014-2024 Free Software Foundation, Inc.
    Written by Roger While, Simon Sobisch, Brian Tiffin
 
    This file is part of GnuCOBOL.
@@ -70,43 +70,47 @@ static const struct option long_options[] = {
 
 
 /**
- * Display cobcrun build and version date
+ * Display cobcrun version info, optional with build and version date
  */
 static void
 cobcrun_print_version (void)
 {
-	char	cob_build_stamp[COB_MINI_BUFF];
-	char	month[64];
-	int status, day, year;
-
-	/* Set up build time stamp */
-	memset (cob_build_stamp, 0, (size_t)COB_MINI_BUFF);
-	memset (month, 0, sizeof(month));
-	day = 0;
-	year = 0;
-	status = sscanf (__DATE__, "%63s %d %d", month, &day, &year);
-	/* LCOV_EXCL_START */
-	if (status != 3) {
-		snprintf (cob_build_stamp, (size_t)COB_MINI_MAX,
-			"%s %s", __DATE__, __TIME__);
-	/* LCOV_EXCL_STOP */
-	} else {
-		snprintf (cob_build_stamp, (size_t)COB_MINI_MAX,
-			  "%s %2.2d %4.4d %s", month, day, year, __TIME__);
-	}
-
-	printf ("cobcrun (%s) %s.%d\n", PACKAGE_NAME, PACKAGE_VERSION, PATCH_LEVEL);
-	puts ("Copyright (C) 2023 Free Software Foundation, Inc.");
-	printf (_("License GPLv3+: GNU GPL version 3 or later <%s>"), "https://gnu.org/licenses/gpl.html");
+	printf ("cobcrun (%s) %s.%d\n",
+		PACKAGE_NAME, PACKAGE_VERSION, PATCH_LEVEL);
+	puts ("Copyright (C) 2024 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"
 	        "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."));
-	printf (_("Written by %s"), "Roger While, Simon Sobisch, Brian Tiffin");
 	putchar ('\n');
-	printf (_("Built     %s"), cob_build_stamp);
-	putchar ('\n');
-	printf (_("Packaged  %s"), COB_TAR_DATE);
+	printf (_("Written by %s"), "Roger While, Simon Sobisch, Brian Tiffin");
 	putchar ('\n');
+	if (verbose_output) {
+		char	cob_build_stamp[COB_MINI_BUFF];
+		char	month[64];
+		int status, day, year;
+
+		/* Set up build time stamp */
+		memset (cob_build_stamp, 0, (size_t)COB_MINI_BUFF);
+		memset (month, 0, sizeof(month));
+		day = 0;
+		year = 0;
+		status = sscanf (__DATE__, "%63s %d %d", month, &day, &year);
+		/* LCOV_EXCL_START */
+		if (status != 3) {
+			snprintf (cob_build_stamp, (size_t)COB_MINI_MAX,
+				"%s %s", __DATE__, __TIME__);
+		/* LCOV_EXCL_STOP */
+		} else {
+			snprintf (cob_build_stamp, (size_t)COB_MINI_MAX,
+				"%s %2.2d %4.4d %s", month, day, year, __TIME__);
+		}
+		printf (_("Built     %s"), cob_build_stamp);
+		putchar ('\n');
+		printf (_("Packaged  %s"), COB_TAR_DATE);
+		putchar ('\n');
+	}
 }
 
 /**
@@ -140,12 +144,20 @@ cobcrun_print_usage (char * prog)
 			"                                  and any basename to the module preload list\n"
 			"                                  (COB_LIBRARY_PATH and/or COB_PRELOAD)"));
 	putchar ('\n');
-	printf (_("Report bugs to: %s\n" 
-			  "or (preferably) use the issue tracker via the home page."), "[email protected]");
+#ifndef PACKAGE_BUGREPORT_URL
+	printf (_("Report bugs to: %s\n"
+	          "or (preferably) use the issue tracker via the home page."),
+			PACKAGE_BUGREPORT);
 	putchar ('\n');
-	printf (_("GnuCOBOL home page: <%s>"), "https://www.gnu.org/software/gnucobol/");
+#else
+	puts (_("For bug reporting instructions, please see:"));
+	printf ("%s.\n", PACKAGE_BUGREPORT_URL);
+#endif
+	printf (_("GnuCOBOL home page: <%s>"),
+		"https://www.gnu.org/software/gnucobol/");
 	putchar ('\n');
-	printf (_("General help using GNU software: <%s>"), "https://www.gnu.org/gethelp/");
+	printf (_("General help using GNU software: <%s>"),
+		"https://www.gnu.org/gethelp/");
 	putchar ('\n');
 }
 

build_windows/ChangeLog.txt

@@ -1,4 +1,8 @@
 
+2024-10-07  Simon Sobisch <[email protected]>
+
+	* set_env_vs_dist: supporting space-included paths (not recommended)
+
 2024-05-15  Simon Sobisch <[email protected]>
 
 	* makedist.cmd: cater for new different library names
@@ -315,7 +319,7 @@
 
 	* update for subfolder vc10
 
-2014-07-07  Philipp B�hme <[email protected]>
+2014-07-07  Philipp B�hme <[email protected]>
 
 	* minor bugfix (tpyos) for subfolder vc12
 
@@ -326,7 +330,7 @@
 	* updated all project files
 	* added subfolder vc11
 
-2014-06-20  Philipp B�hme <[email protected]>
+2014-06-20  Philipp B�hme <[email protected]>
 
 	* added project files - subfolders: vc7, vc8, vc9, vc10, vc12 
 	  (original project files and resource files version_cobc.rc,