Skip to content

Commit 0cb3eab

Browse files
committed
Merge remote-tracking branch 'upstream/gnucobol-3.x' into gcos4gnucobol-3.x
2 parents 080e756 + aa297a7 commit 0cb3eab

File tree

16 files changed

+412
-1721
lines changed

16 files changed

+412
-1721
lines changed

ABOUT-NLS

Lines changed: 1 addition & 1379 deletions
Large diffs are not rendered by default.

ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11

2+
2025-03-27 Simon Sobisch <simonsobisch@gnu.org>
3+
4+
* configure.ac: fix --without-iconv; use iconv includes, if necessary;
5+
use libtool link
6+
7+
2025-03-16 Simon Sobisch <simonsobisch@gnu.org>
8+
9+
* configure.ac: support setting of PANEL_LIBS independent of CURSES_LIBS
10+
* ABOUT-NLS, INSTALL: replaced by current versions
11+
212
2025-02-11 Simon Sobisch <simonsobisch@gnu.org>
313

414
* configure.ac: fix warning for \ in AC_CHECK_FUNCS by dropping them
@@ -14,6 +24,10 @@
1424
* configure.ac: only check for IBM/OpenWatcom/Sun's C compilers if not
1525
running under GCC / clang
1626

27+
2024-12-09 Simon Sobisch <simonsobisch@gnu.org>
28+
29+
* Makefile.am (FILES_TO_BE_EXECUTABLE): added doc/cobcinfo.sh
30+
1731
2024-12-08 Simon Sobisch <simonsobisch@gnu.org>
1832

1933
* configure.ac: fix check for curses functions if panel headers are found

INSTALL

Lines changed: 237 additions & 240 deletions
Large diffs are not rendered by default.

Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Makefile gnucobol
33
#
4-
# Copyright (C) 2003-2012, 2014-2020, 2023 Free Software Foundation, Inc.
4+
# Copyright (C) 2003-2012, 2014-2020, 2023-2024 Free Software Foundation, Inc.
55
# Written by Keisuke Nishida, Roger While, Simon Sobisch
66
#
77
# This file is part of GnuCOBOL.
@@ -51,7 +51,8 @@ FILES_TO_BE_EXECUTABLE = $(dist_noinst_SCRIPTS) \
5151
configure tests/testsuite tests/testsuite_manual tests/listings-sed.sh \
5252
build_aux/config.guess build_aux/config.sub build_aux/config.rpath \
5353
build_aux/depcomp build_aux/install-sh build_aux/ltmain.sh build_aux/mdate-sh \
54-
build_aux/missing build_aux/mkinstalldirs build_aux/ylwrap
54+
build_aux/missing build_aux/mkinstalldirs build_aux/ylwrap \
55+
doc/cobcinfo.sh
5556

5657
tarstamps = $(top_distdir)/tarstamp.h tarstamp.h
5758

bin/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
2024-12-09 Simon Sobisch <simonsobisch@gnu.org>
3+
4+
* Makefile.am (cobconfig.1, cobcrun.1): add description using help2man -n
5+
26
2024-10-02 Simon Sobisch <simonsobisch@gnu.org>
37

48
* cobcrun.c (cobcrun_print_version): build and package data only

bin/Makefile.am

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Makefile gnucobol/bin
33
#
4-
# Copyright (C) 2001-2012, 2014, 2017-2020 Free Software Foundation, Inc.
4+
# Copyright (C) 2001-2012, 2014, 2017-2020, 2024 Free Software Foundation, Inc.
55
# Written by Roger While, Simon Sobisch
66
#
77
# This file is part of GnuCOBOL.
@@ -46,18 +46,21 @@ MAINTAINERCLEANFILES = cobcrun.1
4646
HELPSOURCES_COBCRUN = cobcrun.c $(top_srcdir)/configure.ac
4747
HELPSOURCES_COBCONFIG = cob-config.in $(top_srcdir)/configure.ac
4848
HELP2MAN_OPTS = --info-page=$(PACKAGE)
49+
HELP2MAN_OPTS_COBCRUN = $(HELP2MAN_OPTS) -v "-qV" -n "starts the COBOL runtime environment with optional configuration and displays active configuration details"
50+
HELP2MAN_OPTS_COBCONFIG = $(HELP2MAN_OPTS) -n "prints configuration variables for libcob"
4951

5052
if MAKE_HAS_PREREQ_ONLY
5153
cobcrun.1: $(HELPSOURCES_COBCRUN) | $(COBCRUN)
52-
"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) $(COBCRUN)
54+
"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCRUN) $(COBCRUN)
5355
else
5456
cobcrun.1: $(HELPSOURCES_COBCRUN)
55-
"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) $(COBCRUN)
57+
"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCRUN) $(COBCRUN)
5658
endif
5759

5860
if MAKE_HAS_PREREQ_ONLY
5961
cob-config.1: $(HELPSOURCES_COBCONFIG) | ./cob-config
60-
$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) ./cob-config
62+
$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCONFIG) ./cob-config
6163
else
62-
$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) ./cob-config
64+
cob-config.1: $(HELPSOURCES_COBCONFIG)
65+
$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCONFIG) ./cob-config
6366
endif

build_aux/ChangeLog

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
2025-02-13 Simon Sobisch <simonsobisch@gnu.org>
3+
4+
* pre-inst-env.in: drop COB_ON_CYGWIN as it is set via atlocal for
5+
testsuite checks
6+
* missing: updated to recent version from
7+
https://git.savannah.gnu.org/cgit/automake.git/tree/lib/
8+
29
2024-09-02 Simon Sobisch <simonsobisch@gnu.org>
310

411
* ar-lib, config.guess, config.rpath, config.sub, texinfo.tex: updated
@@ -186,7 +193,7 @@
186193
without uname(1) [removed 2014-01-25] from old version
187194

188195

189-
Copyright 2015-2024 Free Software Foundation, Inc.
196+
Copyright 2015-2025 Free Software Foundation, Inc.
190197

191198
Copying and distribution of this file, with or without modification, are
192199
permitted provided the copyright notice and this notice are preserved.

build_aux/compile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#! /bin/sh
22
# Wrapper for compilers which do not understand '-c -o'.
33

4-
scriptversion=2018-03-07.03; # UTC
4+
scriptversion=2024-06-19.01; # UTC
55

6-
# Copyright (C) 1999-2020 Free Software Foundation, Inc.
6+
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
77
# Written by Tom Tromey <tromey@cygnus.com>.
88
#
99
# This program is free software; you can redistribute it and/or modify
@@ -143,7 +143,7 @@ func_cl_wrapper ()
143143
# configure might choose to run compile as 'compile cc -o foo foo.c'.
144144
eat=1
145145
case $2 in
146-
*.o | *.[oO][bB][jJ])
146+
*.o | *.lo | *.[oO][bB][jJ])
147147
func_file_conv "$2"
148148
set x "$@" -Fo"$file"
149149
shift
@@ -248,14 +248,17 @@ If you are trying to build a whole package this is not the
248248
right script to run: please start by reading the file 'INSTALL'.
249249
250250
Report bugs to <bug-automake@gnu.org>.
251+
GNU Automake home page: <https://www.gnu.org/software/automake/>.
252+
General help using GNU software: <https://www.gnu.org/gethelp/>.
251253
EOF
252254
exit $?
253255
;;
254256
-v | --v*)
255-
echo "compile $scriptversion"
257+
echo "compile (GNU Automake) $scriptversion"
256258
exit $?
257259
;;
258260
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
261+
clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
259262
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
260263
func_cl_wrapper "$@" # Doesn't return...
261264
;;

build_aux/missing

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#! /bin/sh
2-
# Common wrapper for a few potentially missing GNU programs.
2+
# Common wrapper for a few potentially missing GNU and other programs.
33

4-
scriptversion=2017-12-05.17gnucobol; # UTC
4+
scriptversion=2024-12-03.03; # UTC
55

6-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
6+
# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
7+
8+
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
79
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
810

911
# This program is free software; you can redistribute it and/or modify
@@ -54,18 +56,20 @@ Options:
5456
-v, --version output version information and exit
5557
5658
Supported PROGRAM values:
57-
aclocal autoconf autoheader autom4te automake makeinfo
58-
bison yacc flex lex help2man
59+
aclocal autoconf autogen autoheader autom4te automake autoreconf
60+
bison flex help2man lex makeinfo perl yacc
5961
6062
Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
6163
'g' are ignored when checking the name.
6264
63-
Send bug reports to <bug-automake@gnu.org>."
65+
Report bugs to <bug-automake@gnu.org>.
66+
GNU Automake home page: <https://www.gnu.org/software/automake/>.
67+
General help using GNU software: <https://www.gnu.org/gethelp/>."
6468
exit $?
6569
;;
6670

6771
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
68-
echo "missing $scriptversion (GNU Automake)"
72+
echo "missing (GNU Automake) $scriptversion"
6973
exit $?
7074
;;
7175

@@ -108,7 +112,7 @@ gnu_software_URL=https://www.gnu.org/software
108112
program_details ()
109113
{
110114
case $1 in
111-
aclocal|automake)
115+
aclocal|automake|autoreconf)
112116
echo "The '$1' program is part of the GNU Automake package:"
113117
echo "<$gnu_software_URL/automake>"
114118
echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
@@ -123,6 +127,9 @@ program_details ()
123127
echo "<$gnu_software_URL/m4/>"
124128
echo "<$perl_URL>"
125129
;;
130+
*)
131+
:
132+
;;
126133
esac
127134
}
128135

@@ -137,48 +144,55 @@ give_advice ()
137144
printf '%s\n' "'$1' is $msg."
138145

139146
configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
147+
autoheader_deps="'acconfig.h'"
148+
automake_deps="'Makefile.am'"
149+
aclocal_deps="'acinclude.m4'"
140150
case $normalized_program in
151+
aclocal*)
152+
echo "You should only need it if you modified $aclocal_deps or"
153+
echo "$configure_deps."
154+
;;
141155
autoconf*)
142-
echo "You should only need it if you modified 'configure.ac',"
143-
echo "or m4 files included by it."
144-
program_details 'autoconf'
156+
echo "You should only need it if you modified $configure_deps."
157+
;;
158+
autogen*)
159+
echo "You should only need it if you modified a '.def' or '.tpl' file."
160+
echo "You may want to install the GNU AutoGen package:"
161+
echo "<$gnu_software_URL/autogen/>"
145162
;;
146163
autoheader*)
147-
echo "You should only need it if you modified 'acconfig.h' or"
164+
echo "You should only need it if you modified $autoheader_deps or"
148165
echo "$configure_deps."
149-
program_details 'autoheader'
150166
;;
151167
automake*)
152-
echo "You should only need it if you modified 'Makefile.am' or"
153-
echo "$configure_deps."
154-
program_details 'automake'
155-
;;
156-
aclocal*)
157-
echo "You should only need it if you modified 'acinclude.m4' or"
168+
echo "You should only need it if you modified $automake_deps or"
158169
echo "$configure_deps."
159-
program_details 'aclocal'
160170
;;
161-
autom4te*)
171+
autom4te*)
162172
echo "You might have modified some maintainer files that require"
163173
echo "the 'autom4te' program to be rebuilt."
164-
program_details 'autom4te'
174+
;;
175+
autoreconf*)
176+
echo "You should only need it if you modified $aclocal_deps or"
177+
echo "$automake_deps or $autoheader_deps or $automake_deps or"
178+
echo "$configure_deps."
165179
;;
166180
bison*|yacc*)
167181
echo "You should only need it if you modified a '.y' file."
168182
echo "You may want to install the GNU Bison package:"
169183
echo "<$gnu_software_URL/bison/>"
170184
;;
171-
lex*|flex*)
172-
echo "You should only need it if you modified a '.l' file."
173-
echo "You may want to install the Fast Lexical Analyzer package:"
174-
echo "<$flex_URL>"
175-
;;
176185
help2man*)
177186
echo "You should only need it if you modified a dependency" \
178187
"of a man page."
179188
echo "You may want to install the GNU Help2man package:"
180189
echo "<$gnu_software_URL/help2man/>"
181190
;;
191+
lex*|flex*)
192+
echo "You should only need it if you modified a '.l' file."
193+
echo "You may want to install the Fast Lexical Analyzer package:"
194+
echo "<$flex_URL>"
195+
;;
182196
makeinfo*)
183197
echo "You should only need it if you modified a '.texi' file, or"
184198
echo "any other file indirectly affecting the aspect of the manual."
@@ -189,6 +203,12 @@ give_advice ()
189203
echo "want to install GNU make:"
190204
echo "<$gnu_software_URL/make/>"
191205
;;
206+
perl*)
207+
echo "You should only need it to run GNU Autoconf, GNU Automake, "
208+
echo " assorted other tools, or if you modified a Perl source file."
209+
echo "You may want to install the Perl 5 language interpreter:"
210+
echo "<$perl_URL>"
211+
;;
192212
*)
193213
echo "You might have modified some files without having the proper"
194214
echo "tools for further handling them. Check the 'README' file, it"
@@ -197,6 +217,7 @@ give_advice ()
197217
echo "case some other package contains this missing '$1' program."
198218
;;
199219
esac
220+
program_details "$normalized_program"
200221
}
201222

202223
give_advice "$1" | sed -e '1s/^/WARNING: /' \
@@ -207,7 +228,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
207228
exit $st
208229

209230
# Local variables:
210-
# eval: (add-hook 'write-file-hooks 'time-stamp)
231+
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
211232
# time-stamp-start: "scriptversion="
212233
# time-stamp-format: "%:y-%02m-%02d.%02H"
213234
# time-stamp-time-zone: "UTC0"

build_aux/pre-inst-env.in

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# pre-inst-env gnucobol
44
#
5-
# Copyright (C) 2017,2019-2020,2023 Free Software Foundation, Inc.
5+
# Copyright (C) 2017, 2019-2020, 2023, 2025 Free Software Foundation, Inc.
66
# Written by Mathieu Lirzin, Simon Sobisch
77
#
88
# This file is part of GnuCOBOL.
@@ -25,10 +25,6 @@ PATH="@abs_top_builddir@/cobc:@abs_top_builddir@/bin:${PATH}"
2525
export PATH
2626

2727

28-
# trigger the preference of local instead of installed files
29-
#GNUCOBOL_UNINSTALLED=1
30-
#export GNUCOBOL_UNINSTALLED
31-
3228
# let atlocal know that there's less to setup
3329
GNUCOBOL_ENV_SETUP=1
3430
export GNUCOBOL_ENV_SETUP
@@ -54,14 +50,7 @@ export COB_CONFIG_DIR COB_COPY_DIR
5450
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
5551
export COB_LIBRARY_PATH
5652

57-
# ensure we don't execute windows paths within programs generated by cygwin
58-
# by passing a hint
59-
if test "$OSTYPE" = "cygwin"; then
60-
COB_ON_CYGWIN=1
61-
export COB_ON_CYGWIN
62-
fi
63-
64-
# not robust check, but better than none
53+
# not robust check, and only works for GNU bash; but much better than none
6554
if test "x${BASH_SOURCE}" != "x" -a "${BASH_SOURCE}" != "$0"; then
6655
echo "This script should not be sourced but called instead!"
6756
else

0 commit comments

Comments
 (0)