Merge branch 'master' into github-ci

Author: rtoy

.github/workflows/sync.yml

@@ -0,0 +1,44 @@
+# .github/workflows/sync.yml
+name: Sync from Upstream
+
+on:
+  schedule:
+    - cron: '0 * * * *'  # every hour, adjust as needed
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  actions: write
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: Add upstream and sync
+        run: |
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
+
+          git remote add upstream https://git.code.sf.net/p/maxima/code
+          git fetch upstream
+
+          # Save the workflow file before syncing
+          cp .github/workflows/sync.yml /tmp/sync.yml
+
+          # Sync all branches
+          git push origin refs/remotes/upstream/*:refs/heads/* --force-with-lease
+          git push origin --tags --force
+
+          # Restore the workflow file to master
+          git checkout master
+          git reset --hard upstream/master
+          mkdir -p .github/workflows
+          cp /tmp/sync.yml .github/workflows/sync.yml
+          git add .github/workflows/sync.yml
+          git commit -m "Restore sync workflow" --allow-empty
+          git push origin master

ChangeLog

@@ -4,4 +4,9 @@ Maxima 5.49-post change log
 Bug fixes for numbered bugs:
 ----------------------------
  * \#4585 Taylor polynomials involving tangent & a quotient
- * \#4634 Divergent integral simplifies to -1/4 with simplify_sum
+ * \#4634 Divergent integral simplifies to -1/4 with simplify_sum
+
+Changes in the Windows installer:
+---------------------------------
+ * Update SBCL
+ * Update wxWidgets

Makefile.am

@@ -10,7 +10,7 @@ if ENABLE_BUILD_DOCS
    DOC_DIR = doc
 endif
 
-SUBDIRS = admin crosscompile-windows src lisp-utils $(DOC_DIR) interfaces share demo plotting desktopintegration $(LOCALE_DIR) tests
+SUBDIRS = admin crosscompile-windows src lisp-utils $(DOC_DIR) interfaces share demo desktopintegration $(LOCALE_DIR) tests
 
 EXTRA_DIST = \
   common.mk maxima.iss.in \

actions.zip

@@ -845,6 +845,17 @@ if test x"${enable_build_docs}" = xtrue ; then
             AC_MSG_RESULT([${makeinfo_version_string} (6.8 or later preferred)])
 	fi
 
+        dnl If makeinfo supports the classes for the navigation panel, enable
+        dnl CSS styling for the panel.  This support was added in 7.2.90.
+        if test ${makeinfo_version} -ge 70290; then
+           NAV_PANEL_CSS="$(cat | tr -s '\n' ' ' <<EOF
+<link rel="stylesheet"
+      type="text/css"
+      href="nav-panel.css">
+EOF
+)"
+        fi
+        
         dnl Enable JS highlighting of examples in the HTML docs.
         dnl The API has changed between 6.8 and 7.0, so we need to substitute the
         dnl the appropriate things.
@@ -957,6 +968,7 @@ EOF
         AC_SUBST(USE_CUSTOM_HILITE)
         AC_SUBST(CUSTOM_PYGMENTS)
         AC_SUBST(CUSTOM_PYGMENTS_CSS)
+        AC_SUBST(NAV_PANEL_CSS)
         TEXI2HTML=texi2html.init
         AC_SUBST(TEXI2HTML)
 
@@ -1581,7 +1593,7 @@ interfaces/emacs/misc/Makefile interfaces/xmaxima/Makefile \
 interfaces/xmaxima/autoconf-variables.tcl interfaces/xmaxima/Tkmaxima/Header.tcl \
 interfaces/xmaxima/doc/Makefile interfaces/xmaxima/doc/figures/Makefile \
 interfaces/xmaxima/msgs/Makefile interfaces/xmaxima/win32/Makefile \
-plotting/mgnuplot share/Makefile demo/Makefile plotting/Makefile locale/Makefile \
+share/Makefile demo/Makefile locale/Makefile \
 share/contrib/Makefile
 share/contrib/guess/Makefile \
 share/contrib/guess/doc/Makefile \

configure.ac

@@ -81,6 +81,7 @@ option(WITH_CLISP "Include CLISP in the installer." YES)
 option(WITH_SBCL "Include SBCL in the installer." YES)
 option(WITH_ABCL "Include ABCL in the installer." NO)
 option(WITH_CCL64 "Include CCL64 in the installer." NO)
+option(WITH_ECL "Include ECL in the installer." NO)
 
 # Concerning the used Lisp versions:
 #  - SBCL is fast, but sometimes runs out of memory in places it really shouldn't
@@ -131,7 +132,7 @@ else()
 endif()
 
 set(WITH_DEFAULT_LISP "sbcl" CACHE STRING "Which Lisp should be used by default?")
-set_property(CACHE WITH_DEFAULT_LISP PROPERTY STRINGS "clisp" "sbcl" "abcl" "ccl64")
+set_property(CACHE WITH_DEFAULT_LISP PROPERTY STRINGS "clisp" "sbcl" "abcl" "ccl64" "ecl")
 
 # If you want to use a updated version of a program,
 # update the version number and the checksum.
@@ -188,6 +189,10 @@ endif()
 
 execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -print-file-name=libstdc++-6.dll     OUTPUT_VARIABLE MINGW_LIBSTDCPP OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+# wxMaxima and ECL uses C++ threads, include the required mingw library.
+execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -print-file-name=libwinpthread-1.dll OUTPUT_VARIABLE MINGW_LIBWINPTHREAD OUTPUT_STRIP_TRAILING_WHITESPACE)
+message(STATUS "Found libwinpthread at ${MINGW_LIBWINPTHREAD}")
+
 message(STATUS "Found libstdc++ at ${MINGW_LIBSTDCPP}")
 
 message(STATUS "Found libgcc at ${MINGW_LIBGCC}")
@@ -274,26 +279,41 @@ else()
     set(CCL64_DEPENDS "")
     set(CCL_ENABLED 0)
 endif()
+if(WITH_ECL)
+    add_subdirectory("gmplib/")
+    add_subdirectory("ecl/")
+    add_subdirectory("winlibs/")
+    set(ECL_CONFIGURE --enable-ecl --with-ecl=${CMAKE_BINARY_DIR}/wine-ecl.sh)
+    set(ECL_DEPENDS ecl winlibs)
+    set(ECL_ENABLED 1)
+else()
+    set(ECL_CONFIGURE "")
+    set(ECL_DEPENDS "")
+    set(ECL_ENABLED 1)
+endif()
 
 configure_file("${CMAKE_SOURCE_DIR}/wine-clisp.sh.tmpl" "${CMAKE_BINARY_DIR}/wine-clisp.sh")
 configure_file("${CMAKE_SOURCE_DIR}/wine-lisp.sh.tmpl" "${CMAKE_BINARY_DIR}/wine-lisp.sh")
 configure_file("${CMAKE_SOURCE_DIR}/wine-sbcl.sh.tmpl" "${CMAKE_BINARY_DIR}/wine-sbcl.sh")
 configure_file("${CMAKE_SOURCE_DIR}/wine-ccl.sh.tmpl" "${CMAKE_BINARY_DIR}/wine-ccl.sh")
+configure_file("${CMAKE_SOURCE_DIR}/wine-ecl.sh.tmpl" "${CMAKE_BINARY_DIR}/wine-ecl.sh")
+configure_file("${CMAKE_SOURCE_DIR}/ecl/ecl-lisp-build.sh.tmpl" "${CMAKE_BINARY_DIR}/ecl-lisp-build.sh")
 
 externalproject_add(maxima
   # first copy the maxima source to a build directory, since out-of-source-builds do not work
   DOWNLOAD_COMMAND rsync -a --exclude=crosscompile-windows/build/ "${CMAKE_SOURCE_DIR}/../"  "${CMAKE_BINARY_DIR}/maxima-prefix/src/maxima"
-  DEPENDS  tcl tk texinfo ${CLISP_DEPENDS} ${SBCL_DEPENDS} ${ABCL_DEPENDS} ${CCL64_DEPENDS}
+  DEPENDS  tcl tk texinfo ${CLISP_DEPENDS} ${SBCL_DEPENDS} ${ABCL_DEPENDS} ${CCL64_DEPENDS} ${ECL_DEPENDS}
   BUILD_IN_SOURCE 1
   CONFIGURE_COMMAND sh -c "test -x ./bootstrap && ./bootstrap || return 0"
-            COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C ./configure --host=${HOST} ${CLISP_CONFIGURE} ${SBCL_CONFIGURE} ${ABCL_CONFIGURE} ${CCL64_CONFIGURE} --with-default-lisp=${WITH_DEFAULT_LISP} --prefix=${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION}
+            COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C ./configure --host=${HOST} ${CLISP_CONFIGURE} ${SBCL_CONFIGURE} ${ABCL_CONFIGURE} ${CCL64_CONFIGURE} ${ECL_CONFIGURE} --with-default-lisp=${WITH_DEFAULT_LISP} --prefix=${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION}
   # during the crosscompiling procedure, we call configure with shell scripts (wine-xyz.sh) to use the Windows versions.
   # change that after compiliation to the real binaries (clisp.exe for CLISP, sbcl.exe for SBCL, wx86cl64.exe for CCL64).
   BUILD_COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE)
         COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE) pdf
         COMMAND sed -i s+^.*wine-clisp.sh+clisp.exe+g src/maxima.bat
         COMMAND sed -i s+^.*wine-sbcl.sh+sbcl.exe+g src/maxima.bat
         COMMAND sed -i s+^.*wine-ccl.sh+wx86cl64.exe+g src/maxima.bat
+        COMMAND sed -i s+^.*wine-ecl.sh+ecl/ecl.exe+g src/maxima.bat
   INSTALL_COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE) install DESTDIR=${CMAKE_BINARY_DIR}/maxima-installroot/
           COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE) extradocinstall DESTDIR=${CMAKE_BINARY_DIR}/maxima-installroot/
 )
@@ -321,8 +341,12 @@ install(FILES "${CMAKE_SOURCE_DIR}/../interfaces/xmaxima/win32/win_signals.lisp"
 
 
 install(DIRECTORY ${CMAKE_BINARY_DIR}/maxima-installroot/${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION}/
-        DESTINATION . COMPONENT Maxima 
-        PATTERN "binary-clisp" EXCLUDE PATTERN "binary-sbcl" EXCLUDE PATTERN "binary-abcl" EXCLUDE PATTERN "binary-ccl64" EXCLUDE)
+        DESTINATION . COMPONENT Maxima
+        PATTERN "binary-clisp" EXCLUDE
+        PATTERN "binary-sbcl" EXCLUDE
+        PATTERN "binary-abcl" EXCLUDE
+        PATTERN "binary-ccl64" EXCLUDE
+        PATTERN "binary-ecl" EXCLUDE)
 if(WITH_ABCL)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/maxima-installroot/${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION}/
             DESTINATION . COMPONENT ABCL PATTERN "binary-abcl")
@@ -331,6 +355,10 @@ if(WITH_CLISP)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/maxima-installroot/${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION}/
             DESTINATION . COMPONENT CLISP PATTERN "binary-clisp")
 endif()
+if(WITH_ECL)
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/maxima-installroot/${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION}/
+            DESTINATION . COMPONENT ECL PATTERN "binary-ecl")
+endif()
 if(WITH_SBCL)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/maxima-installroot/${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION}/
             DESTINATION . COMPONENT SBCL PATTERN "binary-sbcl")
@@ -403,7 +431,6 @@ if(WITH_SBCL)
     cpack_add_component(SBCL
                         DESCRIPTION "The SBCL Lisp compiler.\nOne Lisp compiler is required.")
 endif()
-
 if(WITH_ABCL)
     cpack_add_component(ABCL
                         DESCRIPTION "The ABCL Lisp compiler.\nA Java installation is required.\nOne Lisp compiler is required.")
@@ -412,6 +439,10 @@ if(WITH_CCL64)
     cpack_add_component(CCL64
                         DESCRIPTION "The CCL (64Bit) Lisp compiler.\nOne Lisp compiler is required.")
 endif()
+if(WITH_ECL)
+    cpack_add_component(ECL
+                        DESCRIPTION "The ECL Lisp compiler.\nOne Lisp compiler is required.")
+endif()
 
 cpack_add_component(TclTk
                     DISPLAY_NAME "Tcl/Tk"

crosscompile-windows/CMakeLists.txt

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Currently using a recent (as of 2026-03-20) GIT version.
+# (not the current master, I want that reproducible...
+set(ECL_MD5 "92c91aabe58bf15d360493904ed86850")
+set(ECL_URL "https://ecl.common-lisp.dev/static/files/release/ecl-26.3.27.tgz")
+
+ExternalProject_Add(ecl-native
+  DEPENDS gmplib
+  BUILD_IN_SOURCE 1
+  URL "${ECL_URL}"
+  DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
+  URL_MD5 ${ECL_MD5}
+  CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/ecl-native-root --enable-gmp=included
+  BUILD_COMMAND make
+  INSTALL_COMMAND make install
+)
+
+ExternalProject_Add(ecl
+  DEPENDS gmplib ecl-native
+  BUILD_IN_SOURCE 1
+  URL "${ECL_URL}"
+  DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
+  URL_MD5 ${ECL_MD5}
+  PATCH_COMMAND  rm -rf "${CMAKE_CURRENT_BINARY_DIR}/ecl-prefix/src/ecl/src/gmp"
+        COMMAND  cp -a "${CMAKE_BINARY_DIR}/gmplib/gmplib-prefix/src/gmplib" "${CMAKE_CURRENT_BINARY_DIR}/ecl-prefix/src/ecl/src/gmp"
+#        COMMAND  cp ${CMAKE_SOURCE_DIR}/ecl/strm_os.d ${CMAKE_BINARY_DIR}/ecl/ecl-prefix/src/ecl/src/c/streams/strm_os.d
+        COMMAND  cp ${CMAKE_SOURCE_DIR}/ecl/asdf.lisp ${CMAKE_BINARY_DIR}/ecl/ecl-prefix/src/ecl/contrib/asdf/asdf.lisp
+  CONFIGURE_COMMAND ECL_TO_RUN=${CMAKE_BINARY_DIR}/ecl-native-root/bin/ecl CFLAGS=-m64 ./configure --build=x86_64-pc-linux-gnu --host=x86_64-w64-mingw32 --prefix=${CMAKE_BINARY_DIR}/ecl-cross-root --with-cross-config=${CMAKE_BINARY_DIR}/ecl/ecl-prefix/src/ecl/src/util/x86_64-w64-mingw32.cross_config --enable-gmp=included --with-cmp=yes --with-bytecmp=no #--with-asdf=no
+  BUILD_COMMAND make
+  INSTALL_COMMAND make install
+          COMMAND ${CMAKE_COMMAND} -E copy "${MINGW_LIBSTDCPP}" "${CMAKE_BINARY_DIR}/ecl-cross-root"
+          COMMAND ${CMAKE_COMMAND} -E copy "${MINGW_LIBGCC}" "${CMAKE_BINARY_DIR}/ecl-cross-root"
+          COMMAND ${CMAKE_COMMAND} -E copy "${MINGW_LIBWINPTHREAD}" "${CMAKE_BINARY_DIR}/ecl-cross-root"
+)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/ecl-cross-root/ DESTINATION bin/ecl COMPONENT ECL)