Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/gnucobol-3.x' into gcos4gnucob…
Browse files Browse the repository at this point in the history
…ol-3.x
  • Loading branch information
ddeclerck committed Sep 19, 2024
2 parents fe28973 + cd346a6 commit f36f150
Show file tree
Hide file tree
Showing 20 changed files with 1,471 additions and 612 deletions.
6 changes: 3 additions & 3 deletions ABOUT-NLS
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ people who like their own language and write it well, and who are also
able to synergize with other translators speaking the same language.
Each translation team has its own mailing list. The up-to-date list of
teams can be found at the Free Translation Project's homepage,
'https://translationproject.org/', in the "Teams" area.
'http://translationproject.org/', in the "Teams" area.

If you'd like to volunteer to _work_ at translating messages, you
should become a member of the translating team for your own language.
Expand Down Expand Up @@ -1357,7 +1357,7 @@ mere existence a PO file and its wide availability in a distribution.
If Jun 2014 seems to be old, you may fetch a more recent copy of this
'ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix
with full percentage details can be found at
'https://translationproject.org/extra/matrix.html'.
'http://translationproject.org/extra/matrix.html'.

1.5 Using 'gettext' in new packages
===================================
Expand All @@ -1376,4 +1376,4 @@ Free Translation Project is also available for packages which are not
developed inside the GNU project. Therefore the information given above
applies also for every other Free Software Project. Contact
'[email protected]' to make the '.pot' files available
to the translation teams.
to the translation teams.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

2024-09-09 Simon Sobisch <[email protected]>

* README: add documentation for "make checkmanual"

2024-08-10 Simon Sobisch <[email protected]>

* DEPENDENCIES, NEWS: document usage of libiconv
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ The following libraries ARE required WHEN :

JSON-C is distributed under Expat License.

5) charachter encoding support is needed and iconv is not provided
5) character encoding support is needed and iconv is not provided
as part of libc

BOTH runtime AND development components required.
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Support for GENERATE JSON is provided by *one* of the following:
JSON-C is distributed under Expat License.


charachter encoding support
character encoding support
----------------------------

Support for partial character encoding is provided directly,
Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ NEWS - user visible changes -*- outline -*-
** use the "default" -shared flag to build dynamic libraries on macOS
so as to fix testuite issues with recent macOS versions

** "make checkmanual" was extended to be also usable with tmux and
allows to override the test runner and to attach for screen/tmux sessions,
see README for further details

* Known issues in 3.x

** testsuite:
Expand Down
17 changes: 17 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,23 @@ Tests
make checkall


You may also optionally perform a series of semi-manual tests to
verify a working extended screenio.
make checkmanual
The test execution is automatic but the user needs to check for
the expected result. See tests/run_prog_manual.sh for tweaking the
test runner used (which is otherwise deduced from the environment),
either in that script or via TESTRUNNER environment variable.

** NOTE **
The semi-manual tests need either "xterm", GNU "screen" or "tmux"
installed and will run within a detached "cmd" on MSYS based
systems otherwise.
For running with screen or tmux execute the following from
a separate terminal, directly after running the testsuite:
tests/run_prog_manual.sh attach
... and leave that using "exit" at the end of the tests

============

The following is only interesting for advanced use.
Expand Down
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,33 @@ If the the COBOL85 testsuite is not already in the build- or source-tree,
`make test` will download it. For details see tests/cobol85/README.

** NOTE **
The language interpreter "perl" is required to run COBOL85 tests.
The language interpreter `perl` is required to run COBOL85 tests.


If you want to run both testsuites you can run

* `make checkall`


You may also optionally perform a series of semi-manual tests to
verify a working extended screenio.

* `make checkmanual`

The test execution is automatic but the user needs to check for
the expected result. See `tests/run_prog_manual.sh` for tweaking the
test runner used (which is otherwise deduced from the environment),
either in that script or via TESTRUNNER environment variable.

** NOTE **
The semi-manual tests need either `xterm`, GNU `screen` or `tmux`
installed and will run within a detached `cmd.exe` on MSYS based
systems otherwise.
For running with screen or tmux execute the following from
a separate terminal, directly after running the testsuite:
`tests/run_prog_manual.sh attach`
... and leave that using `exit` at the end of the tests

Installation
============

Expand Down
4 changes: 4 additions & 0 deletions bin/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
* cob-config.in: echo in same order as arguments; add missing
arguments (--bindir,--libdir,--datadir,--mandir,--includedir)

2023-01-02 Simon Sobisch <[email protected]>

* cobcrun.c: use libcob's cob_getenv_direct instead of getenv

2022-10-18 Simon Sobisch <[email protected]>

* cobcrun.c: minor validation - check for empty parameters
Expand Down
12 changes: 9 additions & 3 deletions build_aux/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

2024-09-02 Simon Sobisch <[email protected]>

* ar-lib, config.guess, config.rpath, config.sub, texinfo.tex: updated
to recent versions from
https://git.savannah.gnu.org/cgit/gnulib.git/tree/build-aux/

2023-06-03 Simon Sobisch <[email protected]>

* config.sub, texinfo.tex: updated to recent versions from
Expand All @@ -22,13 +28,13 @@

* bootstrap: drop tarstamp.h generation, done via make
* config.guess, config.sub: updated to recent versions from
git.savannah.gnu.org/gitweb/?p=config.git
https://git.savannah.gnu.org/cgit/config.git

2022-06-30 Simon Sobisch <[email protected]>

* config.guess, config.rpath, install-sh, mkinstalldirs, texinfo.tex:
updated to recent versions from
git.savannah.gnu.org/gitweb/?p=config.git
https://git.savannah.gnu.org/cgit/config.git

2022-05-30 Simon Sobisch <[email protected]>

Expand All @@ -43,7 +49,7 @@
2022-01-07 Simon Sobisch <[email protected]>

* config.sub, config.guess: updated to recent versions from
git.savannah.gnu.org/gitweb/?p=config.git to solve build issues
https://git.savannah.gnu.org/cgit/config.git to solve build issues
on different machines

2021-10-11 Simon Sobisch <[email protected]>
Expand Down
14 changes: 11 additions & 3 deletions build_aux/ar-lib
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Wrapper for Microsoft lib.exe

me=ar-lib
scriptversion=2019-07-04.01; # UTC
scriptversion=2024-06-19.01; # UTC

# Copyright (C) 2010-2019 Free Software Foundation, Inc.
# Copyright (C) 2010-2019,2024 Free Software Foundation, Inc.
# Written by Peter Rosin <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -105,11 +105,15 @@ case $1 in
Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
Members may be specified in a file named with @FILE.
Report bugs to <[email protected]>.
GNU Automake home page: <https://www.gnu.org/software/automake/>.
General help using GNU software: <https://www.gnu.org/gethelp/>.
EOF
exit $?
;;
-v | --v*)
echo "$me, version $scriptversion"
echo "$me (GNU Automake) $scriptversion"
exit $?
;;
esac
Expand All @@ -135,6 +139,10 @@ do
AR="$AR $1"
shift
;;
-nologo | -NOLOGO)
# We always invoke AR with -nologo, so don't need to add it again.
shift
;;
*)
action=$1
shift
Expand Down
Loading

0 comments on commit f36f150

Please sign in to comment.