Merge

.github/workflows/macos.yml

@@ -26,15 +26,11 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install automake help2man texinfo bison berkeley-db@4
-          opt="/usr/local/opt"; \
-          for d in automake help2man bison texinfo berkeley-db@4; do \
-            test -d "$opt/$d/bin" && echo "$opt/$d/bin" >> $GITHUB_PATH; \
-            test -d "$opt/$d/lib" && export LDFLAGS="-L$opt/$d/lib $LDFLAGS"; \
-            test -d "$opt/$d/include" && export CPPFLAGS="-I$opt/$d/include $CPPFLAGS"; \
-          done; \
-          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV; \
-          echo "CPPFLAGS=${CPPFLAGS}" >> $GITHUB_ENV
+          brew install pkg-config 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
+          echo "CPPFLAGS=-I$opt/berkeley-db@4/include ${CPPFLAGS}" >> $GITHUB_ENV
 
       - name: Set git user
         run: |
@@ -64,7 +60,7 @@ jobs:
         with:
           name: config.log
           path: _build/config.log
-#       if: failure()
+        if: failure()
 
       - name: make
         run: |

.gitpod.yml

@@ -0,0 +1,60 @@
+
+image: gitpod/workspace-c
+
+tasks:
+
+- name: setup coding environment on Ubuntu 20.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 \
+         lcov
+    # sudo apt install gettext texlive-base  # for make dist (po/*, doc/gnucobol.pdf)
+    gp sync-done system-prepare
+
+- name: building GnuCOBOL
+  init: |
+    mkdir -p $GITPOD_REPO_ROOTS/_build
+    cd $GITPOD_REPO_ROOTS/_build
+    gp sync-await system-prepare
+    ../autogen.sh
+    ../configure --enable-cobc-internal-checks --enable-debug --enable-code-coverage
+    make --jobs=$(nproc)
+  command: |
+    cd $GITPOD_REPO_ROOTS/_build
+    gp sync-done build-finish
+
+- name: running GnuCOBOL tests with coverage
+  command: |
+    gp sync-await build-finish
+    cd $GITPOD_REPO_ROOTS/_build
+    half_jobs=$(( $(nproc) / 2 ))
+    nice make --jobs=${half_jobs} check-code-coverage TESTSUITEFLAGS="--jobs=${half_jobs}"
+
+- name: running NIST85 tests
+  command: |
+    gp sync-await build-finish
+    cd $GITPOD_REPO_ROOTS/_build
+    half_jobs=$(( $(nproc) / 2 ))
+    nice make -C tests/cobol85 --jobs=${half_jobs} test
+
+# disabled as the download takes too long
+#- name: running GnuCOBOL distribution tests with testuite
+#  command: |
+#    gp sync-await build-finish
+#    cd $GITPOD_REPO_ROOTS/_build
+#    half_jobs=$(( $(nproc) / 2 ))
+#    nice make --jobs=${half_jobs} distcheck TESTSUITEFLAGS="--jobs=${half_jobs}"
+
+vscode:
+  extensions:
+    - llvm-vs-code-extensions.vscode-clangd
+    - maelvalais.autoconf
+    - Dizy.lex-flex-yacc-bison
+    - ryanluker.vscode-coverage-gutters
+    - tenninebt.vscode-koverage
+    - meronz.manpages
+    - webfreak.debug

ChangeLog

@@ -1,4 +1,15 @@
 
+2024-05-14  David Declerck <david.declerck@ocamlpro.com>
+
+	* configure.ac: update flags for building dynamic libraries on macOS
+	  (helps fixing testsuite issues on recent macOS versions)
+
+2024-05-02  Simon Sobisch <simonsobisch@gnu.org>
+
+	* configure.ac: use pkg-config (with a fallback to ncurses-config) for
+	  getting link / compile information for ncurses/ncursesw; now honoring
+	  NCURSES_CONFIG, NCURSES_LIBS and NCURSES_FLAGS; document XML2_CONFIG
+
 2023-10-17  David Declerck <david.declerck@ocamlpro.com>
 
 	* configure.ac: add checks to allow using stdint.h and inttypes.h
@@ -1579,7 +1590,7 @@
 	* Version 0.9 released.
 
 
-Copyright 2002-2023 Free Software Foundation, Inc.
+Copyright 2002-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.

NEWS

@@ -1,6 +1,6 @@
 NEWS - user visible changes				-*- outline -*-
 
- GnuCOBOL 3.3     (planned January 2023)
+ GnuCOBOL 3.3     (planned ASAP)
 
  work in progress
 
@@ -71,6 +71,14 @@ NEWS - user visible changes				-*- outline -*-
    $b for executable basename, $d for date in YYYYMMDD format, $t for time
    in HHMMSS format (before, only $$ was available for pid)
 
+* New build features
+
+** configure now uses pkg-config/ncurses-config to search for ncurses and
+   honors NCURSES_LIBS and NCURSES_CFLAGS
+
+** use the "default" -shared flag to build dynamic libraries on macOS
+   so as to fix testuite issues with recent macOS versions
+
 * Known issues in 3.x
 
 ** testsuite:

build_windows/ChangeLog.txt

@@ -1,4 +1,13 @@
 
+2024-05-15  Simon Sobisch <simonsobisch@gnu.org>
+
+	* makedist.cmd: cater for new different library names
+	* version_cobc.rc, version_libcob.rc: updated date + rev
+
+2024-05-14  David Declerck <david.declerck@ocamlpro.com>
+
+	* general for libcob: add missing profiling.c
+
 2023-07-07  Simon Sobisch <simonsobisch@gnu.org>
 
 	* general for cobc: include new replace.c
@@ -324,7 +333,7 @@
 	  version_libcob.rc, version_cobcrun.rc provided by Simon)
 
 
-Copyright 2014-2023 Free Software Foundation, Inc.
+Copyright 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.

build_windows/makedist.cmd

@@ -1,4 +1,4 @@
-:: Copyright (C) 2014-2023 Free Software Foundation, Inc.
+:: Copyright (C) 2014-2024 Free Software Foundation, Inc.
 :: Written by Simon Sobisch, Edward Hart
 ::
 :: This file is part of GnuCOBOL.
@@ -347,13 +347,12 @@ if exist "%copy_from%\libvbisam.dll" (
    echo No ISAM handler found.
 )
 
-:: Copy the intl libraries.
+:: Copy the intl library.
 call :copy_lib_if_exists "intl"    %copy_to_bin% "libintl.dll"
-call :copy_lib_if_exists "intl"    %copy_to_bin% "libiconv.dll"
 
 :: Copy the cJSON library.
-call :copy_lib_if_exists "cJSON"   %copy_to_bin% "cjson.dll"
-call :copy_lib_if_exists "cJSON"   %copy_to_bin% "json-c.dll"
+call :copy_lib_if_exists "cJSON"   %copy_to_bin% "*cjson.dll"
+call :copy_lib_if_exists "JSON-c"  %copy_to_bin% "*json-c.dll"
 
 :: Copy the curses library.
 call :copy_lib_if_exists "curses"  %copy_to_bin% "pdcurses*.dll"
@@ -362,10 +361,10 @@ call :copy_lib_if_exists "curses"  %copy_to_bin% "pdcurses*.dll"
 call :copy_lib_if_exists "XML"     %copy_to_bin% "libxml2.dll"
 call :copy_lib_if_exists "zlib"    %copy_to_bin% "zlib*.dll"
 call :copy_lib_if_exists "charset" %copy_to_bin% "libcharset.dll"
-call :copy_lib_if_exists "lzma"    %copy_to_bin% "lzma*.dll"
+call :copy_lib_if_exists "lzma"    %copy_to_bin% "*lzma*.dll"
 
 :: Copy the iconv library.
-call :copy_lib_if_exists "libiconv.dll" %copy_to_bin% "iconv"
+call :copy_lib_if_exists "iconv"   %copy_to_bin% "libiconv.dll"
 
 goto :eof
 

build_windows/ocide/libcob.dll.cpj

@@ -47,6 +47,7 @@
 				<FILE NAME="..\..\libcob\mlio.c" TITLE="mlio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\move.c" TITLE="move.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\numeric.c" TITLE="numeric.c" CLEAN="0"/>
+				<FILE NAME="..\..\libcob\profiling.c" TITLE="profiling.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\reportio.c" TITLE="reportio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\screenio.c" TITLE="screenio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\strings.c" TITLE="strings.c" CLEAN="0"/>

build_windows/version_cobc.rc

@@ -4,7 +4,7 @@
 #include "config.h"
 
 #include "../libcob/version.h"
-#define VCS_REF 5112
+#define VCS_REF 5257
 
 #define STRINGIZE_DETAIL_(v) #v
 #define STRINGIZE(v) STRINGIZE_DETAIL_(v)
@@ -44,7 +44,7 @@ VS_VERSION_INFO    VERSIONINFO
       VALUE "FileDescription",  PACKAGE_NAME " compiler, supporting most COBOL dialects with lots of extensions"
       VALUE "FileVersion",      STRINGIZE(__LIBCOB_VERSION)"."STRINGIZE(__LIBCOB_VERSION_MINOR)"."STRINGIZE(__LIBCOB_VERSION_PATCHLEVEL)"."STRINGIZE(VCS_REF)
       VALUE "InternalName",     "cobc"
-      VALUE "LegalCopyright",   "Copyright (C) 2001-2023 Free Software Foundation, Inc."
+      VALUE "LegalCopyright",   "Copyright (C) 2001-2024 Free Software Foundation, Inc."
       VALUE "LegalTrademarks",  "Compiler: GNU General Public License v3 - see COPYING,\x0ADocumentation: GNU Free Documentation License."
       VALUE "OriginalFilename", "cobc.exe"
       VALUE "ProductName",      PACKAGE_NAME " compiler"
@@ -55,7 +55,7 @@ VS_VERSION_INFO    VERSIONINFO
       VALUE "SpecialBuild",     ""
 
       /* Non-Standard entries */
-      VALUE "Build",            "July 2023"
+      VALUE "Build",            "May 2024"
       VALUE "Developer",        "Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Edward Hart and many others (see AUTHORS and THANKS)"
       VALUE "Support",          "https://www.gnu.org/software/gnucobol/"
       VALUE "Users",            "Unlimited."

build_windows/version_libcob.rc

@@ -4,7 +4,7 @@
 #include "config.h"
 
 #include "../libcob/version.h"
-#define VCS_REF 5059
+#define VCS_REF 5257
 
 #define STRINGIZE_DETAIL_(v) #v
 #define STRINGIZE(v) STRINGIZE_DETAIL_(v)
@@ -44,7 +44,7 @@ VS_VERSION_INFO    VERSIONINFO
       VALUE "FileDescription",  PACKAGE_NAME " runtime, supporting most COBOL dialects with lots of extensions"
       VALUE "FileVersion",      STRINGIZE(__LIBCOB_VERSION)"."STRINGIZE(__LIBCOB_VERSION_MINOR)"."STRINGIZE(__LIBCOB_VERSION_PATCHLEVEL)"."STRINGIZE(VCS_REF)
       VALUE "InternalName",     "libcob"
-      VALUE "LegalCopyright",   "Copyright (C) 2001-2023 Free Software Foundation, Inc."
+      VALUE "LegalCopyright",   "Copyright (C) 2001-2024 Free Software Foundation, Inc."
       VALUE "LegalTrademarks",  "Runtime: GNU Lesser General Public License v3 - see COPYING.LESSER,\x0ADocumentation: GNU Free Documentation License."
       VALUE "OriginalFilename", "libcob.dll"
       VALUE "ProductName",      PACKAGE_NAME " runtime library"
@@ -55,7 +55,7 @@ VS_VERSION_INFO    VERSIONINFO
       VALUE "SpecialBuild",     ""
 
       /* Non-Standard entries */
-      VALUE "Build",            "May 2023"
+      VALUE "Build",            "May 2024"
       VALUE "Developer",        "Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, Edward Hart and many others (see AUTHORS and THANKS)"
       VALUE "Support",          "https://www.gnu.org/software/gnucobol/"
       VALUE "Users",            "Unlimited."

build_windows/vs2005/libcob.vcproj

@@ -227,6 +227,10 @@
 				RelativePath="..\..\libcob\numeric.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libcob\profiling.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libcob\reportio.c"
 				>

build_windows/vs2008/libcob.vcproj

@@ -223,6 +223,10 @@
 				RelativePath="..\..\libcob\numeric.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libcob\profiling.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libcob\reportio.c"
 				>

build_windows/vs2010/libcob.vcxproj

@@ -174,6 +174,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -206,4 +207,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build_windows/vs2010/libcob.vcxproj.filters

@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>

build_windows/vs2012/libcob.vcxproj

@@ -176,6 +176,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -208,4 +209,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build_windows/vs2012/libcob.vcxproj.filters

@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>

build_windows/vs2013/libcob.vcxproj

@@ -177,6 +177,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -209,4 +210,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build_windows/vs2013/libcob.vcxproj.filters

@@ -54,6 +54,9 @@
     <ClCompile Include="..\..\libcob\mlio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -96,4 +99,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>

build_windows/vs2015/libcob.vcxproj

@@ -168,6 +168,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />
@@ -200,4 +201,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>