Skip to content

Commit

Permalink
build system update
Browse files Browse the repository at this point in the history
* configure.ac: require autoconf 2.70 and drop check for lex-library with noyywrap option for AC_PROG_LEX
* HACKING: document dependencies autoconf 2.70 and automake 1.16 and several smaller text updates
* Makefile.am (checkmanual-code-coverage, checkall-code-coverage): new targets removing the need to do that manually
* build_aux/ltmain.sh, m4/libtool.m4, m4/ltoptions.m4, m4/ltversion.m4

cobc:
* pplex.l, scanner.l: use noyywrap option instead of manually defining related code parts
  • Loading branch information
sf-mensch committed Sep 27, 2024
1 parent 7b3047c commit 10daa94
Show file tree
Hide file tree
Showing 12 changed files with 1,102 additions and 847 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@

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

* build_aux/ltmain.sh, m4/libtool.m4, m4/ltoptions.m4, m4/ltversion.m4:
update libtool from 2.46 to 2.53, dropping all manual patches
* configure.ac: require autoconf 2.70 and drop check for lex-library with
noyywrap option for AC_PROG_LEX
* HACKING: document dependencies autoconf 2.70 and automake 1.16 and
several smaller text updates
* Makefile.am (checkmanual-code-coverage, checkall-code-coverage): new
targets removing the need to do that manually
* DEPENDENCIES: added perl for running NIST85

2024-09-09 Simon Sobisch <[email protected]>
Expand Down
18 changes: 9 additions & 9 deletions HACKING
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ following extra packages need to be installed with versions equal or greater.
If you build from VCS the tools in the first 4 lists are always needed.

For running "autogen.sh" (necessary after VCS checkout) / reconfigure:
o autoconf 2.64
o automake 1.13
o libtool 2.2.6
o autoconf 2.70
o automake 1.16
o libtool 2.2.6 (2.5.3 highly+ suggested, can be easily installed locally)
o m4 1.4.12

If you modify top-level configure.ac or Makefile.am in any directory then
you will need to run "autoreconf -I m4" to regenerate the necessary files.
If you modify top-level configure.ac or Makefile.am in any directory and rerun
"make", the build system will regenerate the necessary files.

If you want to update to a newer automake/libtool version or get errors
about wrong version numbers in m4 run "autoreconf -vfi -I m4" instead.
If you want to update to a different automake/libtool version or get errors
about wrong version numbers in m4 run "autogen.sh install" instead.

For compiling (when changing flex/bison sources):
For compiling (when changing pparser/scanner sources):
o Bison 2.3 (will be changed to 3.6 with GnuCOBOL 4)
o Flex 2.5.35

Expand Down Expand Up @@ -108,4 +108,4 @@ OR # if you want to compare with an
There should be no difference shown as long as the "old version" passed
the same tests as the new version - given the example above: there was
no support for REPORT WRITER in 2.2 so there would be an expected failure
of the RW tests).
of the RW tests.
15 changes: 12 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,18 @@ vcs-update:
distbin distbin-gzip distbin-bzip2 distbin-lzip distbin-xz

test: all
cd tests && $(MAKE) $(AM_MAKEFLAGS) test
cd tests && $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) test
checkmanual: all
cd tests && $(MAKE) $(AM_MAKEFLAGS) checkmanual
cd tests && $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) checkmanual

checkall: check test


@CODE_COVERAGE_ENABLED_TRUE@checkmanual-code-coverage:
@CODE_COVERAGE_ENABLED_TRUE@ -$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -k checkmanual
@CODE_COVERAGE_ENABLED_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
@CODE_COVERAGE_ENABLED_FALSE@checkmanual-code-coverage: check-code-coverage

@CODE_COVERAGE_ENABLED_TRUE@checkall-code-coverage:
@CODE_COVERAGE_ENABLED_TRUE@ -$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -k checkall
@CODE_COVERAGE_ENABLED_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
@CODE_COVERAGE_ENABLED_FALSE@checkall-code-coverage: check-code-coverage
2 changes: 1 addition & 1 deletion build_aux/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
without uname(1) [removed 2014-01-25] from old version


Copyright 2015-2023 Free Software Foundation, Inc.
Copyright 2015-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.
Loading

0 comments on commit 10daa94

Please sign in to comment.