Remove gcdiff and adjust testsuite

Author: ddeclerck

.github/workflows/windows-msvc.yml

@@ -182,18 +182,9 @@ jobs:
           sed 's/x64\/Debug/${{ env.ARCHDIR }}\/${{ matrix.target }}/g' atlocal_win > atlocal
           autom4te --lang=autotest -I ./testsuite.src ./testsuite.at -o ./testsuite
 
-      - name: Build gcdiff
-        run: |
-          set PATH="%GITHUB_WORKSPACE%\build_windows\%ARCHDIR%\${{ matrix.target }}";%PATH%
-          call "%VCVARS%"
-          cd bin
-          cobc -x gcdiff.c
-
       - name: Run testsuite
         continue-on-error: true
         run: |
-          rem Needed for the testsuite to find gcdiff
-          set PATH="%GITHUB_WORKSPACE%\bin";%PATH%
           rem Needed for now because the paths compiled in have trailing slashes - cl.exe does not like that
           set COB_CFLAGS=/I"%GITHUB_WORKSPACE%" /I"%GITHUB_WORKSPACE%\build_windows"
           rem Needed so mpir.h can be found

.gitignore

@@ -83,7 +83,6 @@ ipch
 /bin/cobcrun
 /bin/cobcrun.1
 /bin/cobfile
-/bin/gcdiff
 /cobc/cobc
 /cobc/cobc.1
 /cobc/parser.c

AUTHORS

@@ -12,6 +12,4 @@ Distributed under GNU LGPL.
 was extracted from GLIB 2.2.2 and modified by Keisuke Nishida
 and Roger While. Distributed under GNU LGPL.
 
-* bin/gcdiff.c was written by Ron Norman
-
 * libcob/reportio.c was written by Ron Norman

CMakeLists.txt

@@ -252,17 +252,3 @@ target_include_directories(cobcrun PUBLIC
 )
 
 target_link_libraries(cobcrun cob)
-
-add_executable(gcdiff bin/gcdiff.c)
-
-set_property(TARGET gcdiff PROPERTY RUNTIME_OUTPUT_DIRECTORY bin)
-
-target_include_directories(gcdiff PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cobc>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/build_windows>
-)
-
-target_link_libraries(gcdiff cob)
-
-

NOTES

@@ -239,7 +239,6 @@ C    bin/Makefile.am	  modified here and again for 1396
 
 r1396
 --- Merging r1396 into '.':
-A    bin/gcdiff.c      ok
 
 r1398
 --- Merging r1398 into '.':
@@ -250,7 +249,6 @@ r1401
 U    AUTHORS	  	  ok
 C    bin/ChangeLog	  merged
 U    bin/cobcrun.c
-U    bin/gcdiff.c
 
 r1402
 --- Merging r1402 into '.':
@@ -261,18 +259,15 @@ r1402
    C build_windows/vc8		reverted
    C build_windows/vc9		reverted
 C    build_windows/ChangeLog.txt	merged
-A    build_windows/version_gcdiff.rc	ok
 
 r1404
 --- Merging r1403 through r1404 into '.':
 C    bin/ChangeLog
-U    bin/gcdiff.c
 dry-run produced above output, but actual merge showed no conflict. 
 
 r1405
 --- Merging r1404 through r1405 into '.':
 C    bin/ChangeLog	  merged
-U    bin/gcdiff.c	  ok
 
 r1410
 --- Merging r1410 into '.':

TODO

@@ -202,8 +202,6 @@ https://sourceforge.net/p/gnucobol/code/HEAD/tree/external-doc/guide/
 
 7.1 General issues
 
-- Decide what to do about gcdiff, especially under MSVC; replacing with $DIFF should be okay in most cases (possibly adding the -b/--ignore-trailing-space option); few cases require adjustment because of date/time output
-
 - Correctly implement delay-loading under MSVC
 
 - Possibly drop usage of external cobxref
@@ -218,6 +216,8 @@ https://sourceforge.net/p/gnucobol/code/HEAD/tree/external-doc/guide/
 
 - Testsuite: run the DB and IX modules multiple times if configured for multiple backends
 
+- Testuite: the report produced by test LINAGE and LINAGE-COUNTER sample (run_file.at) as trailing spaces in trunk, while it does not in 3.x; for now we use sed to strip the trailing spaces
+
 7.2 CHECKMEs, TODOs and #if-0'ed code
 
 - Investigate the two CHECKMEs about bdb_close_cursor in fbdb.c:ix_bdb_write_internal

bin/ChangeLog

@@ -1,4 +1,8 @@
 
+2025-05-20  David Declerck <[email protected]>
+
+	* gcdiff.c: removed as no longer needed
+
 2024-12-09  Simon Sobisch <[email protected]>
 
 	* Makefile.am (cobconfig.1, cobcrun.1): add description using help2man -n
@@ -366,7 +370,7 @@
 	  then you can switch easily.
 
 
-Copyright 2004-2008,2010,2012,2014-2024 Free Software Foundation, Inc.
+Copyright 2004-2008,2010,2012,2014-2025 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/Makefile.am

@@ -20,12 +20,11 @@
 # along with GnuCOBOL.  If not, see <https://www.gnu.org/licenses/>.
 
 bin_SCRIPTS = cob-config
-bin_PROGRAMS = cobcrun gcdiff cobfile
+bin_PROGRAMS = cobcrun cobfile
 cobcrun_SOURCES = cobcrun.c
 dist_man_MANS = cobcrun.1 cob-config.1
 COBCRUN = cobcrun$(EXEEXT)
 
-gcdiff_sources = gcdiff.c
 cobfile_sources = cobfile.c
 
 COMMON_LIBS = $(top_builddir)/libcob/libcob.la \
@@ -35,7 +34,6 @@ COMMON_LIBS = $(top_builddir)/libcob/libcob.la \
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 cobcrun_LDADD = $(COMMON_LIBS)
-gcdiff_LDADD = $(COMMON_LIBS)
 cobfile_LDADD =$(COMMON_LIBS)
 
 # Add rules for code-coverage testing, as provided AX_CODE_COVERAGE