r-lib · shikokuchuo · Apr 4, 2025 · Apr 4, 2025 · Apr 4, 2025
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -20,6 +20,7 @@ jobs:
       matrix:
         config:
           - {os: macos-latest,   r: 'release'}
+          - {os: macos-latest,   r: 'oldrel-3'}
           - {os: windows-latest, r: 'release'}
           - {os: windows-latest, r: 'oldrel-2'}
           - {os: windows-latest, r: 'oldrel-4'}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,5 +28,6 @@ Suggests:
     testthat (>= 3.0.0)
 RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
+Biarch: true
 Config/testthat/edition: 3
 Config/Needs/website: tidyverse/tidytemplate
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # watcher (development version)
 
 * `watcher()` now accepts a vector for the `path` argument to monitor multiple files or directories (#16).
+* Fixes Windows bi-arch source builds for R <= 4.1 using rtools40 and earlier (#19).
 
 # watcher 0.1.2
 

diff --git a/configure.ucrt b/configure.ucrt
@@ -0,0 +1,20 @@
+# Upstream SHA of emcrisostomo/fswatch
+LIB_VER="5c443d2"
+
+# Find compiler and export flags
+CC=`"${R_HOME}/bin/R" CMD config CC`
+export CC
+
+echo "Compiling 'libfswatch' from source..."
+gzip -dc src/fswatch-$LIB_VER.tar.gz | tar -xf -
+cd fswatch-$LIB_VER
+cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../install \
+  -DBUILD_LIBS_ONLY=1 -DUSE_NLS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
+  -DCMAKE_COLOR_MAKEFILE=0 -DCMAKE_INSTALL_MESSAGE=NEVER \
+  -DCMAKE_BUILD_TYPE=Release .
+cmake --build . --target install
+cd ..
+rm -rf fswatch-$LIB_VER
+
+# Success
+exit 0
diff --git a/configure.win b/configure.win
@@ -1,19 +1,33 @@
 # Upstream SHA of emcrisostomo/fswatch
 LIB_VER="5c443d2"
 
-# Find compiler and export flags
-CC=`"${R_HOME}/bin/R" CMD config CC`
-export CC
-
-echo "Compiling 'libfswatch' from source..."
 gzip -dc src/fswatch-$LIB_VER.tar.gz | tar -xf -
-cd fswatch-$LIB_VER
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../install \
-  -DBUILD_LIBS_ONLY=1 -DUSE_NLS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
-  -DCMAKE_COLOR_MAKEFILE=0 -DCMAKE_INSTALL_MESSAGE=NEVER \
-  -DCMAKE_BUILD_TYPE=Release .
-cmake --build . --target install
-cd ..
+
+for ARCH in x64 i386; do
+
+  if [ -e "${R_HOME}/bin/${ARCH}/R" ]; then
+    CC=`"${R_HOME}/bin/${ARCH}/R" CMD config CC`
+    export CC
+
+    echo "Compiling 'libfswatch' from source..."
+
+    cd fswatch-$LIB_VER
+    mkdir ${ARCH}
+    cd ${ARCH}
+    echo "Compiling 'libfswatch' from source for ${ARCH} ..."
+    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../../install/${ARCH} \
+      -DBUILD_LIBS_ONLY=1 -DUSE_NLS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
+      -DCMAKE_COLOR_MAKEFILE=0 -DCMAKE_INSTALL_MESSAGE=NEVER \
+      -DCMAKE_BUILD_TYPE=Release ..
+    cmake --build . --target install
+    cd ../..
+
+  else
+  echo "Note: ${ARCH} not installed, skipping ..."
+  fi
+
+done
+
 rm -rf fswatch-$LIB_VER
 
 # Success

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,2 +1,2 @@
-PKG_CFLAGS=-I../install/include $(C_VISIBILITY)
-PKG_LIBS=../install/lib/libfswatch.b -pthread -lstdc++fs
+PKG_CFLAGS=-I../install${R_ARCH}/include $(C_VISIBILITY)
+PKG_LIBS=../install${R_ARCH}/lib/libfswatch.b -pthread -lstdc++fs