Merge branch 'master' of https://github.com/PolMine/RcppCWB

Author: Andreas Blätte

.github/workflows/R-CMD-check.yaml

@@ -26,7 +26,7 @@ jobs:
       matrix:
         config:
           - {os: windows-latest, r: 'release'}
-#          - {os: windows-2022, r: 'devel'}
+ #         - {os: windows-2022, r: 'devel'}
           - {os: macOS-latest, r: 'release'}
           - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
           - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
@@ -46,18 +46,18 @@ jobs:
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
-#      - name: Setup R (Windows UCRT)
-#        if: matrix.config.os == 'windows-2022'
-#        uses: kalibera/ucrt3/actions/r-install@main
+      - name: Setup R (Windows UCRT)
+        if: matrix.config.os == 'windows-latest'
+        uses: kalibera/ucrt3/actions/r-install@main
 
-#      - name: Install UCRT toolchain
-#        if: matrix.config.os == 'windows-2022'
-#        uses: kalibera/ucrt3/actions/toolchain-install@main
-#        with:
-#          # base ... toolchain has the compilers and libraries to build R and recommended packages
-#          # full ... additional libraries to build CRAN packages
-#          # none ... no toolchain is needed (no native code) 
-#         toolchain-type: full      
+      - name: Install UCRT toolchain
+        if: matrix.config.os == 'windows-latest'
+        uses: kalibera/ucrt3/actions/toolchain-install@main
+        with:
+          # base ... toolchain has the compilers and libraries to build R and recommended packages
+          # full ... additional libraries to build CRAN packages
+          # none ... no toolchain is needed (no native code) 
+         toolchain-type: full      
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -108,18 +108,18 @@ jobs:
         shell: Rscript {0}
 
 #      - name: Whereabouts of gcc and g++
-#        if: matrix.config.os == 'windows-2022'
+#        if: matrix.config.os == 'windows-latest'
 #        run: |
 #          echo %PATH%
 #          where gcc
 #          where g++
 
-#      - name: Check package (UCRT)
-#        if: matrix.config.os == 'windows-2022'
-#        env:
-#          _R_INSTALL_TIME_PATCHES_: no
-#          TZ: UTC
-#        uses: kalibera/R-actions/pkg-check@master
+      - name: Check package (UCRT)
+        if: matrix.config.os == 'windows-latest'
+        env:
+          _R_INSTALL_TIME_PATCHES_: no
+          TZ: UTC
+        uses: kalibera/R-actions/pkg-check@master
 
       - name: Build Windows binary package
         if: matrix.os == 'windows-latest'

src/Makevars.ucrt

@@ -1,7 +1,7 @@
 R_PACKAGE_SOURCE=$(CURDIR)/cwb
 
-GLIB_DEFINES=-I$(R_TOOLS_SOFT)/include/glib-2.0 \
-             -I$(R_TOOLS_SOFT)/lib/glib-2.0/include
+GLIB_DEFINES=-I"$(R_TOOLS_SOFT)/include/glib-2.0" \
+             -I"$(R_TOOLS_SOFT)/lib/glib-2.0/include"
 
 PKG_CPPFLAGS=-I$(R_PACKAGE_SOURCE)/cqp -I$(R_PACKAGE_SOURCE)/cl -I$(R_PACKAGE_SOURCE)/CQi $(GLIB_DEFINES) -DPCRE_STATIC