Merge branch 'gnucobol-3.x' into gcos4gnucobol-3.x

ChangeLog

@@ -1,4 +1,9 @@
 
+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

@@ -94,6 +94,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
 

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,

build_windows/config.h.in

@@ -768,6 +768,9 @@
 /* Define to 1 if you have the <xcurses.h> header file. */
 /* #undef HAVE_XCURSES_H */
 
+/* Define as const if the declaration of iconv() needs const. */
+/* #undef ICONV_CONST */
+
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 /* #undef LT_OBJDIR */
 
@@ -780,6 +783,9 @@
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "[email protected]"
 
+/* Bug URL instead of mailing list */
+/* #undef PACKAGE_BUGREPORT_URL */
+
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "GnuCOBOL"
 
@@ -798,6 +804,9 @@
 /* Define a patch level (numeric, max. 8 digits) */
 #define PATCH_LEVEL COB_NUM_TAR_DATE
 
+/* PKG version string */
+#define PKGVERSION "(" PACKAGE_NAME ") "
+
 
 // Use \ to escape things, for example \\ for using in paths
 // Use \" for paths with spaces

build_windows/set_env_vs_x64.cmd

@@ -1,4 +1,4 @@
-:: Copyright (C) 2014-2020 Free Software Foundation, Inc.
+:: Copyright (C) 2014-2020,2024 Free Software Foundation, Inc.
 :: Written by Simon Sobisch, Edward Hart
 ::
 :: This file is part of GnuCOBOL.
@@ -36,4 +36,4 @@ if %errorlevel% equ 0 (
   set "stay_open=x"
 )
 
-call %~dp0gcvsvars.cmd %*
+call "%~dp0gcvsvars.cmd" %*

build_windows/set_env_vs_x64.dist.tmpl.cmd

@@ -1,4 +1,4 @@
-:: Copyright (C) 2014-2020 Free Software Foundation, Inc.
+:: Copyright (C) 2014-2020,2024 Free Software Foundation, Inc.
 :: Written by Simon Sobisch, Edward Hart
 ::
 :: This file is part of GnuCOBOL.
@@ -36,4 +36,4 @@ if %errorlevel% equ 0 (
   set "stay_open=x"
 )
 
-call %~dp0gcvsvars.cmd %*
+call "%~dp0gcvsvars.cmd" %*

build_windows/set_env_vs_x86.cmd

@@ -1,4 +1,4 @@
-:: Copyright (C) 2014-2020 Free Software Foundation, Inc.
+:: Copyright (C) 2014-2020,2024 Free Software Foundation, Inc.
 :: Written by Simon Sobisch, Edward Hart
 ::
 :: This file is part of GnuCOBOL.
@@ -39,4 +39,4 @@ if %errorlevel% equ 0 (
   set "stay_open=x"
 )
 
-call %~dp0gcvsvars.cmd %*
+call "%~dp0gcvsvars.cmd" %*

build_windows/set_env_vs_x86.dist.tmpl.cmd

@@ -36,4 +36,4 @@ if %errorlevel% equ 0 (
   set "stay_open=x"
 )
 
-call %~dp0gcvsvars.cmd %*
+call "%~dp0gcvsvars.cmd" %*

cobc/ChangeLog

@@ -1,4 +1,17 @@
 
+2024-10-02  Simon Sobisch <[email protected]>
+
+	* pplex.l (output_line_directive): extracted from other places and
+	  extended to output compile from stdin as <stdin>
+	* codegen.c (output_cobol_info): output compile from stdin as <stdin>
+	* cobc.c (cobc_print_version, cobc_print_shortversion,
+	  process_command_line): build and package data only shown in verbose mode
+	  which does not output the verbose "process" calls by default;
+	  PACKAGE_NAME may now be overwritten by PKGVERSION (new configure option)
+	* help.c (cobc_print_usage): handle PACKAGE_BUGREPORT_URL as
+	  alternative to mailing list, now resolved by PACKAGE_BUGREPORT
+	* cobc.c (cobc_sig_handler): skip abort message for SIGPIPE
+
 2024-10-01  Nicolas Berthier <[email protected]>
 
 	* tree.c (validate_indexed_key_field): warn about ignored collating
@@ -1330,7 +1343,7 @@
 	* codegen.c (output_perform_call): use statement reference to generate
 	  separate comment for PERFORM procedure or USE procedure
 	* flag.def, codegen.c: new -fsection-exit-check
-	  (cb_flag_section_exit_check) and -fimplicit-goback-check 
+	  (cb_flag_section_exit_check) and -fimplicit-goback-check
 	  (cb_flag_implicit_goback_check)
 	* tree.h (cb_progam), parser.y (perform_procedure): add and set
 	   perform_thru_list for internal checks
@@ -2379,7 +2392,7 @@
 
 2021-01-25  Simon Sobisch <[email protected]>
 
-	* reserved.c: fixed context attribute of acu-extension POS 
+	* reserved.c: fixed context attribute of acu-extension POS
 	* parser.y, reserved.c, tree.h, cobc.h: added acu-extension
 	  MOVE WITH CONVERSION as PENDING
 
@@ -2410,7 +2423,7 @@
 
 	* field.c, pplex.l, tree.c, typeck.c: fixed warning option querying enum
 	  instead of actual value via cb_warn_opt_val
-	
+
 2020-12-09  Ron Norman <[email protected]>
 
 	* cobc.c: now calls cob_get_sig_name from common.c to get signal name
@@ -2426,7 +2439,7 @@
 	* typeck.c (syntax_check_ml_gen_name_list): additional parameter is_xml
 	  to distinguish between XML and JSON generation (messages, possible rules)
 	* typeck.c (syntax_check_ml_gen_name_list): check of NAME ... IS OMITTED
-	
+
 2020-12-17  Simon Sobisch <[email protected]>
 
 	bug #571 revised:
@@ -2655,7 +2668,7 @@
 2020-10-12  Ron Norman <[email protected]>
 
 	* typeck.c: Flag internal variables with 'flag_real_binary'
-	* codegen.c: Emit USAGE INDEX and internal binary variables 
+	* codegen.c: Emit USAGE INDEX and internal binary variables
 	  as COB_TYPE_NUMERIC_COMP5
 
 2020-10-06  Simon Sobisch <[email protected]>
@@ -3137,8 +3150,8 @@
 
 2020-02-10  Ron Norman <[email protected]>
 
-	* cobc.c, cobc.h, codegen.c, help.c, warning.def: 
-		Add new define CB_ERRWARNDEF
+	* cobc.c, cobc.h, codegen.c, help.c, warning.def:
+	  Add new define CB_ERRWARNDEF
 
 2020-02-05  Ron Norman <[email protected]>
 
@@ -3307,7 +3320,7 @@
 2019-09-15  Ron Norman <[email protected]>
 
 	* cobc.h: For HPUX set COB_ALLOW_UNALIGNED as undefined
-	* typeck.c: Emit ADD/SUBTRACT shortcut for COMP-5 only 
+	* typeck.c: Emit ADD/SUBTRACT shortcut for COMP-5 only
 	            if COB_ALLOW_UNALIGNED defined
 	* tree.h: Revert 'lock_mode' back to an 'int'
 	* codegen.c: Changes for 'lock_mode' being an 'int'
@@ -7329,7 +7342,7 @@
 2015-04-27  Ron Norman <[email protected]>
 
 	* config.c: don't store configuration values additional to the setting
-	
+
 2015-04-14  Ron Norman <[email protected]>
 
 	* cobc.c codegen.c common.h tree.h parser.y typeck.c: