Codex review-round and clean-ups

Author: zayenz

.github/workflows/build.yml

@@ -7,22 +7,6 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  guard-build-script-refs:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Ensure no stale Perl script references remain in active build paths
-      shell: bash
-      run: |
-        ! rg -n "genvarimp\\.perl|misc/genrc\\.perl" \
-          CMakeLists.txt \
-          cmake/GenerateVarImp.cmake \
-          Makefile.in \
-          misc/genrc.py
-        ! rg -n "PROG_PERL" configure.ac configure.ac.in configure
-
   build-autoconf:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -141,9 +125,9 @@ jobs:
       shell: pwsh
       run: cmake --build "${{ github.workspace }}\\build" --config ${{ env.BUILD_TYPE }}
 
-    - name: Build test binary
+    - name: Check
       shell: pwsh
-      run: cmake --build "${{ github.workspace }}\\build" --config ${{ env.BUILD_TYPE }} --target gecode-test
+      run: cmake --build "${{ github.workspace }}\\build" --config ${{ env.BUILD_TYPE }} --target check
 
   build-autoconf-windows:
     runs-on: windows-latest

.gitignore

@@ -105,3 +105,7 @@ examples/sudoku-advanced
 examples/tsp
 examples/warehouses
 examples/word-square
+
+# Ignore build tree outputs (version metadata lives in top-level
+# gecode-version.m4).
+build/

CMakeLists.txt

@@ -61,6 +61,8 @@ option(GECODE_REGENERATE_VARIMP "Regenerate checked-in var-imp headers during bu
 set(GECODE_FREELIST32_SIZE_MAX "" CACHE STRING "Max freelist size on 32-bit platforms")
 set(GECODE_FREELIST64_SIZE_MAX "" CACHE STRING "Max freelist size on 64-bit platforms")
 set(GECODE_WITH_VIS "" CACHE STRING "Additional .vis files (comma-separated)")
+set(GECODE_LIB_PREFIX "" CACHE STRING "User-defined prefix for generated library basenames")
+set(GECODE_LIB_SUFFIX "" CACHE STRING "User-defined suffix for generated library basenames")
 
 # Compatibility aliases (temporary)
 if(GECODE_USED_ENABLE_THREADS_ALIAS)
@@ -181,57 +183,30 @@ string(REGEX MATCHALL "[^\n]*\n" CONFIG
 #undef PACKAGE_VERSION
 ")
 
-# Pull package info from configure.ac to keep one version source of truth.
-file(READ configure.ac LINES)
-string(REPLACE ";" "<semi>" LINES "${LINES}")
-string(REGEX MATCHALL "[^\n]*\n" LINES "${LINES}")
-set(ah_command FALSE)
-foreach(line "${EXTRA_CONFIG}" ${LINES})
-  string(REPLACE ";" "" line "${line}")
-  if(ah_command)
-    # keep collecting
-  elseif(line MATCHES "AC_INIT\\(([^,]*), *([^,]*), *([^)]*)\\)")
-    set(PACKAGE ${CMAKE_MATCH_1})
-    set(VERSION ${CMAKE_MATCH_2})
-    set(PACKAGE_BUGREPORT ${CMAKE_MATCH_3})
-    message(STATUS "Got VERSION=${VERSION} from configure.ac")
-  elseif(line MATCHES "ac_gecode_soversion=(.*)\n")
-    set(GECODE_SOVERSION "${CMAKE_MATCH_1}")
-  elseif(line MATCHES "ac_gecode_flatzincversion=(.*)\n")
-    set(GECODE_FLATZINC_VERSION "${CMAKE_MATCH_1}")
-  elseif(line MATCHES "AH_BOTTOM\\(\\[(.*)")
-    set(ah_command bottom)
-    set(line "${CMAKE_MATCH_1}")
-  elseif(line MATCHES "AH_VERBATIM[^,]+,(.*)")
-    set(ah_command verbatim)
-    set(line "${CMAKE_MATCH_1}")
-  endif()
+set(GECODE_VERSION_METADATA_FILE "${CMAKE_CURRENT_SOURCE_DIR}/gecode-version.m4")
+if(NOT EXISTS "${GECODE_VERSION_METADATA_FILE}")
+  message(FATAL_ERROR "Missing version metadata file: ${GECODE_VERSION_METADATA_FILE}")
+endif()
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
+  "${GECODE_VERSION_METADATA_FILE}")
+file(READ "${GECODE_VERSION_METADATA_FILE}" GECODE_VERSION_METADATA)
 
-  if(ah_command)
-    set(saved_ah_command ${ah_command})
-    if(line MATCHES "^\\[(.*)")
-      set(line "${CMAKE_MATCH_1}")
-    endif()
-    if(line MATCHES "\\]\\)")
-      set(ah_command FALSE)
-      string(REPLACE "])" "" line "${line}")
-    endif()
-    string(REGEX MATCHALL "[^\n]*\n" sublines "${line}")
-    set(config_add "")
-    foreach(subline ${sublines})
-      set(config_add ${config_add} "${subline}")
-    endforeach()
-    if(saved_ah_command STREQUAL "verbatim")
-      set(CONFIG ${config_add} ${CONFIG})
-    else()
-      set(CONFIG ${CONFIG} "\n" ${config_add})
-    endif()
+function(gecode_extract_version_metadata macro_name output_var)
+  string(REGEX MATCH "m4_define\\(\\[${macro_name}\\], *\\[([^]]+)\\]\\)" _match
+    "${GECODE_VERSION_METADATA}")
+  if(NOT _match)
+    message(FATAL_ERROR
+      "Could not parse ${macro_name} from ${GECODE_VERSION_METADATA_FILE}")
   endif()
-endforeach()
+  set(${output_var} "${CMAKE_MATCH_1}" PARENT_SCOPE)
+endfunction()
 
-if(NOT DEFINED GECODE_SOVERSION)
-  set(GECODE_SOVERSION 51)
-endif()
+gecode_extract_version_metadata("GECODE_M4_VERSION" VERSION)
+gecode_extract_version_metadata("GECODE_M4_SOVERSION" GECODE_SOVERSION)
+gecode_extract_version_metadata("GECODE_M4_FLATZINC_VERSION" GECODE_FLATZINC_VERSION)
+
+set(PACKAGE "GECODE")
+set(PACKAGE_BUGREPORT "users@gecode.org")
 
 set(PACKAGE_NAME ${PACKAGE})
 string(TOLOWER ${PACKAGE} PACKAGE_TARNAME)
@@ -246,8 +221,8 @@ if(VERSION MATCHES "(.*)\\.(.*)\\.(.*)")
     "${CMAKE_MATCH_1} * 100000 + ${CMAKE_MATCH_2} * 100 + ${CMAKE_MATCH_3}")
 endif()
 
-set(GECODE_DLL_USERPREFIX "")
-set(GECODE_DLL_USERSUFFIX "")
+set(GECODE_DLL_USERPREFIX "${GECODE_LIB_PREFIX}")
+set(GECODE_DLL_USERSUFFIX "${GECODE_LIB_SUFFIX}")
 if(GECODE_ENABLE_INT_VARS)
   set(GECODE_HAS_INT_VARS "/**/")
 endif()
@@ -484,6 +459,7 @@ endif()
 function(add_gecode_component_library lib)
   string(TOUPPER ${lib} libupper)
   set(sources ${GECODE_${libupper}_SOURCES})
+  set(component_output_name "${GECODE_LIB_PREFIX}gecode${lib}${GECODE_LIB_SUFFIX}")
   if(lib STREQUAL "float" AND NOT (GECODE_ENABLE_MPFR AND MPFR_FOUND))
     # Keep in sync with Make behavior: skip empty MPFR-only source when MPFR is absent.
     list(REMOVE_ITEM sources "gecode/float/rounding.cpp")
@@ -506,7 +482,7 @@ function(add_gecode_component_library lib)
       target_compile_options(gecode${lib}_shared PRIVATE ${GECODE_VISIBILITY_COMPILE_OPTION})
     endif()
     set_target_properties(gecode${lib}_shared PROPERTIES
-      OUTPUT_NAME gecode${lib}
+      OUTPUT_NAME "${component_output_name}"
       VERSION ${GECODE_PROJECT_VERSION}
       SOVERSION ${GECODE_SOVERSION})
     add_dependencies(gecode${lib}_shared gecode-varimp-gen)
@@ -528,7 +504,8 @@ function(add_gecode_component_library lib)
     if(GECODE_VISIBILITY_COMPILE_OPTION)
       target_compile_options(gecode${lib}_static PRIVATE ${GECODE_VISIBILITY_COMPILE_OPTION})
     endif()
-    set_target_properties(gecode${lib}_static PROPERTIES OUTPUT_NAME gecode${lib})
+    set_target_properties(gecode${lib}_static PROPERTIES
+      OUTPUT_NAME "${component_output_name}")
     add_dependencies(gecode${lib}_static gecode-varimp-gen)
     list(APPEND GECODE_INSTALL_TARGETS gecode${lib}_static)
     list(APPEND GECODE_EXPORT_TARGETS gecode${lib}_static)
@@ -716,10 +693,18 @@ if(GECODE_CAN_BUILD_TESTS)
   endforeach()
 
   add_test(NAME test COMMAND gecode-test ${GECODE_CHECK_ARGS})
-  add_custom_target(check
-    COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -R "^test$"
-    DEPENDS gecode-test
-    USES_TERMINAL)
+  get_property(GECODE_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  if(GECODE_IS_MULTI_CONFIG)
+    add_custom_target(check
+      COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -R "^test$" -C $<CONFIG>
+      DEPENDS gecode-test
+      USES_TERMINAL)
+  else()
+    add_custom_target(check
+      COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -R "^test$"
+      DEPENDS gecode-test
+      USES_TERMINAL)
+  endif()
 else()
   message(WARNING "Skipping gecode-test/check targets because required modules are disabled")
   add_custom_target(check

Makefile.in

@@ -1847,8 +1847,6 @@ doxygen.conf: $(top_srcdir)/doxygen/doxygen.conf.in config.status
 # Documentation
 #
 
-export ENABLEDOCCHM	= @ENABLEDOCCHM@
-export ENABLEDOCDOCSET	= @ENABLEDOCDOCSET@
 ENABLEDOCSEARCH = @ENABLEDOCSEARCH@
 
 .PHONY: doc
@@ -1879,60 +1877,14 @@ stat.hh: $(ALLGECODEHDR:%=$(top_srcdir)/%) $(ALLSRC:%=$(top_srcdir)/%) \
 	$(UVRUN) $(top_srcdir)/misc/genstatistics.py $^ > stat.hh
 
 
-ifeq "@ENABLEDOCCHM@" "yes"
-
-DOCTARGET=GecodeReference.chm
-
-header.html: $(top_srcdir)/misc/doxygen/header.html doxygen.conf
-	grep -v '<form.*form>' < $< > $@
-doxygen.conf.use: doxygen.conf
-	(echo "GENERATE_HTMLHELP = YES"; \
-	 echo "SEARCHENGINE = NO";\
-	 echo "HAVE_DOT = @GECODE_DOXYGEN_DOT@") | \
-		cat $< - > $@
-
-doc: $(ALLGECODEHDR:%=$(top_srcdir)/%) $(VARIMPHDR) \
-	$(ALLSRC:%=$(top_srcdir)/%) $(DOCSRC)
-	mkdir -p doc/html
-	cp -f $(top_srcdir)/misc/doxygen/back.png \
-	$(top_srcdir)/misc/doxygen/gecode-logo-100.png doc/html
-	doxygen doxygen.conf.use
-	mv doc/html/GecodeReference.chm GecodeReference.chm
-
-else
-ifeq "@ENABLEDOCDOCSET@" "yes"
-
-DOCTARGET=org.gecode.@VERSION@.docset
-
-header.html: $(top_srcdir)/misc/doxygen/header.html doxygen.conf
-	grep -v '<form.*form>' < $< > $@
-doxygen.conf.use: doxygen.conf
-	(echo "SEARCHENGINE = NO";\
-	 echo "HAVE_DOT = @GECODE_DOXYGEN_DOT@";\
-	 echo "GENERATE_DOCSET = YES";\
-	 echo "DOCSET_BUNDLE_ID = org.gecode.@VERSION@";\
-	 echo "DOCSET_FEEDNAME = Gecode") | \
-		cat $< - > $@
-
-doc: $(ALLGECODEHDR:%=$(top_srcdir)/%) $(VARIMPHDR) \
-	$(ALLSRC:%=$(top_srcdir)/%) $(DOCSRC)
-	mkdir -p doc/html
-	cp -f $(top_srcdir)/misc/doxygen/back.png \
-	$(top_srcdir)/misc/doxygen/gecode-logo-100.png doc/html
-	doxygen doxygen.conf.use
-	cd doc/html && make
-	mv doc/html/$(DOCTARGET) .
-
-else
 DOCTARGET=doc/html
 
 ifeq "@ENABLEDOCSEARCH@" "yes"
 
 header.html: $(top_srcdir)/misc/doxygen/header.html doxygen.conf
 	cat < $< > $@
 doxygen.conf.use: doxygen.conf
-	(echo "GENERATE_HTMLHELP = NO"; \
-	 echo "SEARCHENGINE = YES"; \
+	(echo "SEARCHENGINE = YES"; \
 	 echo "SERVER_BASED_SEARCH = YES"; \
 	 echo "HAVE_DOT = @GECODE_DOXYGEN_DOT@") | \
 		cat $< - > $@
@@ -1941,14 +1893,13 @@ else
 header.html: $(top_srcdir)/misc/doxygen/header.html doxygen.conf
 	grep -v '<form.*form>' < $< > $@
 doxygen.conf.use: doxygen.conf
-	(echo "GENERATE_HTMLHELP = NO"; \
-	 echo "SEARCHENGINE = NO"; \
+	(echo "SEARCHENGINE = NO"; \
 	 echo "HAVE_DOT = @GECODE_DOXYGEN_DOT@") | \
 		cat $< - > $@
 
 endif
 
-doc: $(ALLGECODEHDR:%=$(top_srcdir)/%) $(VARIMPHDR) \
+doc: mkcompiledirs $(ALLGECODEHDR:%=$(top_srcdir)/%) $(VARIMPHDR) \
 	$(ALLSRC:%=$(top_srcdir)/%) $(DOCSRC)
 	mkdir -p doc/html
 	cp -f $(top_srcdir)/misc/doxygen/back.png \
@@ -1963,9 +1914,6 @@ ifeq "@ENABLEDOCSEARCH@" "yes"
 	rm doc/html/search2.php
 endif
 
-endif
-endif
-
 #
 # Installation
 #
@@ -2116,7 +2064,7 @@ veryclean: clean
 	$(RMF) $(EXAMPLEEXE)
 	$(RMF) $(TESTEXE)
 	$(RMF) $(FLATZINCEXE)
-	$(RMF) doc GecodeReference.chm ChangeLog
+	$(RMF) doc ChangeLog
 	$(RMF) $(ALLOBJ:%$(OBJSUFFIX)=%.gcno) $(TESTOBJ:%$(OBJSUFFIX)=%.gcno)
 	$(RMF) $(ALLOBJ:%$(OBJSUFFIX)=%.gcda) $(TESTOBJ:%$(OBJSUFFIX)=%.gcda)
 

README.md

@@ -7,11 +7,7 @@ constraint-based systems and applications. Gecode provides a
 constraint solver with state-of-the-art performance while being
 modular and extensible.
 
-[master](https://github.com/Gecode/gecode/tree/master):
-[![Build Status master](https://api.travis-ci.org/Gecode/gecode.svg?branch=master)](https://travis-ci.org/Gecode/gecode)
-
-[develop](https://github.com/Gecode/gecode/tree/develop):
-[![Build Status develop](https://api.travis-ci.org/Gecode/gecode.svg?branch=develop)](https://travis-ci.org/Gecode/gecode)
+[![CI](https://github.com/Gecode/gecode/actions/workflows/build.yml/badge.svg)](https://github.com/Gecode/gecode/actions/workflows/build.yml)
 
 ## Getting All the Info You Need...
 
@@ -27,31 +23,50 @@ Gecode comes with
 
 CMake now exposes options aligned with the Autoconf build switches.
 The minimum required CMake version is 3.21.
-Qt discovery uses CMake packages (Qt6 or Qt5).
-For Autoconf, `--enable-qt` now targets Qt 5/Qt 6 via `qmake`/`moc`
-discovery; if suitable Qt tools are unavailable, Qt (and therefore Gist)
-is disabled automatically.
-
-| Configure switch | CMake option | Default |
-|---|---|---|
-| `--enable-shared` | `GECODE_BUILD_SHARED` | `ON` |
-| `--enable-static` | `GECODE_BUILD_STATIC` | `OFF` |
-| `--enable-thread` | `GECODE_ENABLE_THREAD` | `ON` |
-| `--enable-qt` | `GECODE_ENABLE_QT` | `ON` |
-| `--enable-gist` | `GECODE_ENABLE_GIST` | `ON` |
-| `--enable-cpprofiler` | `GECODE_ENABLE_CPPROFILER` | `ON` |
-| `--enable-cbs` | `GECODE_ENABLE_CBS` | `OFF` |
-| `--enable-examples` | `GECODE_ENABLE_EXAMPLES` | `ON` |
-| `--enable-search` | `GECODE_ENABLE_SEARCH` | `ON` |
-| `--enable-int-vars` | `GECODE_ENABLE_INT_VARS` | `ON` |
-| `--enable-set-vars` | `GECODE_ENABLE_SET_VARS` | `ON` |
-| `--enable-float-vars` | `GECODE_ENABLE_FLOAT_VARS` | `ON` |
-| `--enable-minimodel` | `GECODE_ENABLE_MINIMODEL` | `ON` |
-| `--enable-driver` | `GECODE_ENABLE_DRIVER` | `ON` |
-| `--enable-flatzinc` | `GECODE_ENABLE_FLATZINC` | `ON` |
-
-Additional parity-oriented options are available for advanced features,
-including MPFR, allocator/audit toggles, visibility, and freelist sizes.
+`configure.ac` is the canonical autoconf source, and `configure` is generated
+from it.
+Version metadata shared by autoconf and CMake lives in `gecode-version.m4`.
+`build/` is reserved for generated build outputs.
+
+| Autoconf switch | CMake option / mechanism | Status | Notes |
+|---|---|---|---|
+| `--enable-shared` | `GECODE_BUILD_SHARED` | Supported directly | Default `ON` |
+| `--enable-static` | `GECODE_BUILD_STATIC` | Supported directly | Default `OFF` |
+| `--enable-thread` | `GECODE_ENABLE_THREAD` | Supported directly | Default `ON` |
+| `--enable-osx-unfair-mutex` | `GECODE_ENABLE_OSX_UNFAIR_MUTEX` | Supported directly | Default `ON` |
+| `--enable-qt` | `GECODE_ENABLE_QT` | Supported directly | Qt5/Qt6 package discovery |
+| `--enable-gist` | `GECODE_ENABLE_GIST` | Supported directly | Disabled automatically if Qt is unavailable |
+| `--enable-cpprofiler` | `GECODE_ENABLE_CPPROFILER` | Supported directly | Default `ON` |
+| `--enable-cbs` | `GECODE_ENABLE_CBS` | Supported directly | Default `OFF` |
+| `--enable-examples` | `GECODE_ENABLE_EXAMPLES` | Supported directly | Default `ON` |
+| `--enable-search` | `GECODE_ENABLE_SEARCH` | Supported directly | Default `ON` |
+| `--enable-int-vars` | `GECODE_ENABLE_INT_VARS` | Supported directly | Default `ON` |
+| `--enable-set-vars` | `GECODE_ENABLE_SET_VARS` | Supported directly | Default `ON` |
+| `--enable-float-vars` | `GECODE_ENABLE_FLOAT_VARS` | Supported directly | Default `ON` |
+| `--enable-minimodel` | `GECODE_ENABLE_MINIMODEL` | Supported directly | Default `ON` |
+| `--enable-driver` | `GECODE_ENABLE_DRIVER` | Supported directly | Default `ON` |
+| `--enable-flatzinc` | `GECODE_ENABLE_FLATZINC` | Supported directly | Default `ON` |
+| `--enable-mpfr` | `GECODE_ENABLE_MPFR` | Supported directly | Default `ON`; uses `find_package(MPFR)` |
+| `--enable-allocator` | `GECODE_ENABLE_ALLOCATOR` | Supported directly | Default `ON` |
+| `--enable-audit` | `GECODE_ENABLE_AUDIT` | Supported directly | Default `OFF` |
+| `--enable-gcc-visibility` | `GECODE_ENABLE_GCC_VISIBILITY` | Supported directly | Default `ON` |
+| `--with-freelist32-size-max` | `GECODE_FREELIST32_SIZE_MAX` | Supported directly | Cache string |
+| `--with-freelist64-size-max` | `GECODE_FREELIST64_SIZE_MAX` | Supported directly | Cache string |
+| `--with-vis` | `GECODE_WITH_VIS` | Supported directly | Comma-separated list |
+| `--with-lib-prefix` | `GECODE_LIB_PREFIX` | Supported directly | Prefixes generated library basenames |
+| `--with-lib-suffix` | `GECODE_LIB_SUFFIX` | Supported directly | Suffixes generated library basenames |
+| `--enable-debug` | `CMAKE_BUILD_TYPE=Debug` (or multi-config `Debug`) | Mapped to native CMake mechanism | Use standard CMake build-type workflows |
+| `--enable-profile` | Toolchain/CMake compile+link flags | Mapped to native CMake mechanism | Configure profiling via standard compiler flags |
+| `--enable-gcov` | Toolchain/CMake coverage flags | Mapped to native CMake mechanism | Configure coverage instrumentation via compiler/linker flags |
+| `--with-mpfr-include`, `--with-mpfr-lib` | `CMAKE_PREFIX_PATH`, `MPFR_ROOT`, toolchain include/link paths | Mapped to native CMake mechanism | Use CMake package and toolchain discovery |
+| `--with-gmp-include`, `--with-gmp-lib` | Toolchain include/link paths | Mapped to native CMake mechanism | GMP is resolved through MPFR/toolchain linkage |
+| `--with-host-os` | None | Not supported in CMake | Generator/toolchain already determine host/target platform |
+| `--with-compiler-vendor` | None | Not supported in CMake | Compiler is selected through toolchain and generator |
+| `--with-sdk`, `--with-macosx-version-min`, `--with-architectures` | None | Not supported in CMake | Use native CMake/macOS toolchain settings |
+| `--enable-framework` | None | Not supported in CMake | No framework-bundle generator path is implemented |
+| `--enable-resource` | None | Not supported in CMake | No autoconf-style resource toggle in CMake |
+| `--enable-doc-dot`, `--enable-doc-search`, `--enable-doc-tagfile` | None | Not supported in CMake | No parity layer for doxygen doc toggles |
+
 By default, CMake uses checked-in `gecode/kernel/var-type.hpp` and
 `gecode/kernel/var-imp.hpp`; regeneration is opt-in via
 `-DGECODE_REGENERATE_VARIMP=ON`.