Merge branch 'r-devel:main' into master

Author: EllaKaye

.github/scripts/svn-sync.sh

@@ -5,18 +5,18 @@
 # git svn clone -T trunk https://svn.r-project.org/R
 # git checkout origin/trunk -b trunk
 # git remote add github https://github.com/r-devel/r-svn
-# git checkout master
-# git fetch github master
-# git reset --hard github/master
+# git checkout main
+# git fetch github main
+# git reset --hard github/main
 set -e
 set -x
 git checkout trunk
 git svn rebase
 git push github trunk
-git checkout master
-git fetch github master
-git reset --hard github/master
-LASTMSG=$(git log master --grep="git-svn-id: https://svn.r-project.org/R/trunk" -n1 | grep -o 'git-svn-id: [^ ]*')
+git checkout main
+git fetch github main
+git reset --hard github/main
+LASTMSG=$(git log main --grep="git-svn-id: https://svn.r-project.org/R/trunk" -n1 | grep -o 'git-svn-id: [^ ]*')
 LASTSVN=$(git log trunk --grep="$LASTMSG" -n1 --pretty="%H")
 if [ -z "$LASTSVN" ]; then
 	echo "FAILED TO FIND LASTSVN"
@@ -33,9 +33,9 @@ do
 	GIT_COMMITTER_NAME="$(git log -1 $hash --pretty=format:%cn)" \
 	GIT_COMMITTER_EMAIL="$(git log -1 $hash --pretty=format:%ce)" \
 	git cherry-pick "$hash"
-	git push github master
+	git push github main
 done
 
-# Check that master and trunk are identical except for .github directory
+# Check that main and trunk are identical except for .github directory
 # This verifies that we haven't omitted any commits
-git diff --stat master trunk  -- . ':(exclude).github'
+git diff --stat main trunk  -- . ':(exclude).github'

.github/scripts/win-check.sh

@@ -4,7 +4,7 @@ set -e
 set -x
 
 # Put pdflatex on the path (needed only for CMD check)
-export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
 echo "PATH: $PATH"
 pdflatex --version
 texindex --version
@@ -17,13 +17,13 @@ gcc --version
 cd "$(cygpath ${GITHUB_WORKSPACE})"
 sed -i.bak 's|$(GIT) svn info|./.github/scripts/svn-info.sh|' src/include/Makefile.win
 curl -sSL https://curl.se/ca/cacert.pem > etc/curl-ca-bundle.crt
-./tools/rsync-recommended
+#./tools/rsync-recommended
+./.github/scripts/wget-recommended.sh
 ./.github/scripts/svn-info.sh
 
 # Download the TCL bundle required by tcltk package
-#curl -OL https://cran.r-project.org/bin/windows/Rtools/rtools43/files/tcltk-5493-5412.zip
-curl -OL https://github.com/r-windows/files/releases/download/5550/tcltk-5550-5412.zip
-unzip tcltk-5550-5412.zip
+curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/6104/tcltk-6104-6025.zip
+unzip tcltk-6104-6025.zip
 
 # Add custom flags to MkRules.local
 cp .github/scripts/MkRules.local src/gnuwin32/
@@ -33,4 +33,6 @@ cd src/gnuwin32
 make all cairodevices recommended vignettes manuals
 
 # Run checks
+export TAR="/usr/bin/tar"
+export TAR_OPTIONS="--force-local"
 make check-all

.github/scripts/win-installer.sh

@@ -4,7 +4,7 @@ set -e
 set -x
 
 # Put pdflatex on the path (needed only for CMD check)
-export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
 echo "PATH: $PATH"
 pdflatex --version
 texindex --version
@@ -17,13 +17,14 @@ gcc --version
 cd "$(cygpath ${GITHUB_WORKSPACE})"
 sed -i.bak 's|$(GIT) svn info|./.github/scripts/svn-info.sh|' src/include/Makefile.win
 curl -sSL https://curl.se/ca/cacert.pem > etc/curl-ca-bundle.crt
-./tools/rsync-recommended
+#./tools/rsync-recommended
+./.github/scripts/wget-recommended.sh
 ./.github/scripts/svn-info.sh
 
 # Download the TCL bundle required by tcltk package
 #curl -OL https://cran.r-project.org/bin/windows/Rtools/rtools43/files/tcltk-5493-5412.zip
-curl -OL https://github.com/r-windows/files/releases/download/5550/tcltk-5550-5412.zip
-unzip tcltk-5550-5412.zip
+curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/5948/Tcl-5948-5877.zip
+unzip Tcl-5948-5877.zip
 
 # Add custom flags to MkRules.local
 cp .github/scripts/MkRules.local src/gnuwin32/

.github/workflows/build-svn.yaml

@@ -9,7 +9,7 @@ concurrency:
 jobs:
   linux:
     name: Linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04${{matrix.ARCH == 'arm' && '-arm' || ''}}
     container:
       image: ${{matrix.OS}}
     env:
@@ -21,6 +21,7 @@ jobs:
       matrix:
         CC: [ gcc, clang ]
         OS: [ 'debian:stable', 'debian:testing' ]
+        ARCH: [ 'intel', 'arm']
     steps:
     - name: System dependencies
       run: |
@@ -31,7 +32,7 @@ jobs:
         localedef -i en_US -f UTF-8 en_US.UTF-8
         echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 100
 
@@ -56,7 +57,11 @@ jobs:
 
   macos:
     name: MacOS
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        OS: [ 'macOS-13', 'macOS-14' ]
+    runs-on: ${{matrix.OS}}
     timeout-minutes: 90
     env:
       PKG_CONFIG_PATH: /opt/X11/lib/pkgconfig
@@ -65,14 +70,34 @@ jobs:
       R_TEXI2DVICMD: emulation
 
     steps:
-    - name: System dependencies
+    - name: Download CRAN system libraries
       run: |
-        brew install gcc gettext gmp isl jpeg libmpc libpng mpfr pcre2 pkg-config readline xz texinfo wget
-        echo "FC=/usr/local/opt/gcc/bin/gfortran" >> $GITHUB_ENV
+        echo "ARCH=$(uname -m)" >> $GITHUB_ENV
+        curl --retry 3 -fsSL https://github.com/r-universe-org/cranlibs/releases/download/2025-01-05/cranlibs-everything.tar.xz -o libs.tar.xz
+        sudo tar -xf libs.tar.xz -C / opt
+        rm -f libs.tar.xz
+
+    - name: Remove homebrew
+      run: |
+        echo "/opt/R/${ARCH}/bin" >> $GITHUB_PATH
+        echo "LDFLAGS=-L/opt/R/${ARCH}/lib" >> $GITHUB_ENV
+        echo "CPPFLAGS=-I/opt/R/${ARCH}/include" >> $GITHUB_ENV
+        echo "PKG_CONFIG_PATH=/opt/R/${ARCH}/lib/pkgconfig:/opt/R/${ARCH}/share/pkgconfig" >> $GITHUB_ENV
         echo "/Library/TeX/texbin" >> $GITHUB_PATH
         echo "/usr/local/opt/texinfo/bin" >> $GITHUB_PATH
+        cp -fv $(which wget) "/opt/R/${ARCH}/bin"
+        brew unlink $(brew list --formula) || true
+
+    - name: Install CRAN fortran build
+      run: |
+        curl --retry 3 -fsSLO https://github.com/R-macos/gcc-12-branch/releases/download/12.2-darwin-r0.1/gfortran-12.2-universal.pkg
+        sudo installer -pkg "gfortran-12.2-universal.pkg" -target /
+        rm -f gfortran-12.2-universal.pkg
+        echo "/opt/gfortran/bin" >> $GITHUB_PATH
+        echo "FC=/opt/gfortran/bin/gfortran" >> $GITHUB_ENV
+
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 100
 
@@ -81,16 +106,29 @@ jobs:
         sed -i.bak 's|$(GIT) svn info|./.github/scripts/svn-info.sh|' Makefile.in
         ./.github/scripts/wget-recommended.sh
         ./.github/scripts/svn-info.sh
+
     - name: Configure
-      run: CC=clang ./configure --disable-java --without-cairo --without-tcltk --without-x --with-aqua --with-lapack --with-blas --enable-R-shlib SED=/usr/bin/sed
+      run: CC=clang ./configure --prefix=/opt/R/${ARCH}/r-devel --disable-java --with-cairo --without-tcltk --without-x --with-aqua $ACCELERATE --enable-R-shlib SED=/usr/bin/sed
       env:
         PDFLATEX: ${{github.workspace}}/.github/scripts/dummy
+        ACCELERATE: ${{ matrix.OS != 'macOS-13' && '--with-lapack --with-blas' || '' }}
 
     - name: Build
       run: make
       env:
         PDFLATEX: ${{github.workspace}}/.github/scripts/dummy
 
+    - name: Install
+      run: |
+        mkdir -p /opt/R/${ARCH}/r-devel
+        make install DESTDIR="/opt/R/${ARCH}/r-devel"
+        (cd /opt/R/${ARCH}/r-devel; tar cfJ "/opt/R/r-devel-${ARCH}.tar.xz" .)
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: R-devel-${{ matrix.OS == 'macOS-13' && 'x86_64' || 'arm64' }}
+        path: /opt/R/r-devel-${{ matrix.OS == 'macOS-13' && 'x86_64' || 'arm64' }}.tar.xz
+
     - name: Check
       run: make check-all
       env:
@@ -121,28 +159,36 @@ jobs:
       shell: bash
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 100
 
     - uses: msys2/setup-msys2@v2
       with:
         msystem: MSYS
-        install: git make perl curl texinfo texinfo-tex rsync unzip diffutils
+        install: git make perl curl texinfo texinfo-tex rsync zip unzip diffutils
 
-    - name: "Download rtools43 toolchain"
+    - name: "Download rtools44 toolchain"
       run: |
-        url="https://github.com/r-windows/files/releases/download/5550/rtools43-toolchain-libs-base-5550.tar.zst"
+        url="https://github.com/r-windows/rtools-chocolatey/releases/download/6104/rtools44-toolchain-libs-base-6104.tar.zst"
         curl -sSL $url | tar x --zstd -C /c/ || true
-        #echo "RTOOLS43_HOME=c:" >> $GITHUB_ENV
+        #echo "RTOOLS44_HOME=c:" >> $GITHUB_ENV
         #echo "R_CUSTOM_TOOLS_SOFT=c:/x86_64-w64-mingw32.static.posix" >> $GITHUB_ENV
 
-    - name: Install Miktex
+    - name: Set timezone
       shell: powershell
+      run: tzutil /s "GMT Standard Time"
+
+    - uses: r-lib/actions/setup-tinytex@v2
+      env:
+        TINYTEX_INSTALLER: TinyTeX
+
+    - name: Install additional LaTeX packages
       run: |
-        Import-Module .\.github\scripts\installers.ps1
-        SetTimezone
-        InstallMiktex -ErrorAction SilentlyContinue;
+        tlmgr update --self
+        tlmgr install texinfo
+        tlmgr list --only-installed
+      shell: powershell
 
     - name: Build and Check
       run: |
@@ -158,7 +204,7 @@ jobs:
       if: matrix.script == 'installer'
       shell: powershell
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: installer
         path: src/gnuwin32/installer/R-devel-win.exe

Makefile.in

@@ -17,7 +17,7 @@ NON_SVN_INSTFILES = SVN-REVISION
 DISTFILES = $(INSTFILES) \
 	ChangeLog INSTALL README VERSION VERSION-NICK \
 	Makeconf.in Makefile.in Makefile.fw \
-	config.site configure configure.ac configure.patch
+	config.site configure configure.ac
 SUBDIRS = m4 tools doc etc share src tests
 SUBDIRS_WITH_NO_BUILD = po
 
@@ -45,9 +45,8 @@ ACINCLUDE_DEPENDENCIES = \
 CONFIGURE_DEPENDENCIES = $(srcdir)/VERSION
 config.status: $(srcdir)/configure
 	@$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(srcdir)/configure.patch
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	@BD=`pwd`; cd $(srcdir) && $(AUTOCONF) -f -B $${BD}
-	-@($(AUTOCONF) --version | sed -n 1p | grep -F 2.71) && (cd $(srcdir); patch -p0 < configure.patch)
 $(ACLOCAL_M4): $(srcdir)/configure.ac acinclude.m4
 	@BD=`pwd`; cd $(srcdir) && $(ACLOCAL) --output=$${BD}/$@ -I $${BD}
 acinclude.m4: $(srcdir)/configure.ac $(ACINCLUDE_DEPENDENCIES)
@@ -70,7 +69,7 @@ R: Makefile svnonly
 	  $(ECHO) "you should 'make docs' now ..."
 
 docs: R FORCE
-	-@(cd doc && $(MAKE) $@)
+	@(cd doc && $(MAKE) $@)
 	-@(cd src/library && $(MAKE) $@)
 FORCE:
 
@@ -288,7 +287,7 @@ checkdistcomplete:
 	rm -Rf $${dirname}; \
 	echo "Checking $${distname}.tar.gz"; \
 	$(R_GZIPCMD) -d -c $${distname}.tar.gz | $(TAR) -x -f -; \
-	diff -r $${dirname} $(srcdir) | grep "^Only in $(srcdir)" | grep -v "^Only in.*[.]svn"; \
+	LANGUAGE=C diff -r $${dirname} $(srcdir) | grep "^Only in $(srcdir)" | grep -v "^Only in.*[.]svn"; \
 	rm -Rf $${dirname}
 
 info pdf:

VERSION

@@ -1 +1 @@
-4.4.0 Under development (unstable)
+4.5.0 Under development (unstable)