Fix parallel make

jeroen · jeroen · commit 19501e35c5dc · 2025-03-31T12:11:16.000+02:00
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -50,3 +50,5 @@ jobs:
           needs: check
 
       - uses: r-lib/actions/check-r-package@v2
+        env:
+          MAKEFLAGS: -j4
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: opencv
 Type: Package
 Title: Bindings to 'OpenCV' Computer Vision Library
-Version: 0.5.0
+Version: 0.5.1
 Authors@R: c(
     person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroenooms@gmail.com", 
       comment = c(ORCID = "0000-0002-4035-0289")),
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,2 +1,7 @@
 PKG_CPPFLAGS=@cflags@
 PKG_LIBS=@libs@
+
+all: cleanup
+
+cleanup: $(SHLIB)
+	@rm -Rf ../.deps
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -8,7 +8,7 @@ $(info using $(PKG_CONFIG_NAME) from Rtools)
 PKG_CPPFLAGS := $(shell $(PKG_CONFIG) --cflags $(PKG_CONFIG_NAME)) $(STATIC_CFLAGS)
 OPENCVDATA := $(shell $(PKG_CONFIG) --variable=prefix $(PKG_CONFIG_NAME))/share/opencv4
 else
-RWINLIB = ../windows/opencv
+RWINLIB = ../.deps/opencv
 PKG_CPPFLAGS = -I$(RWINLIB)/include/opencv4 $(STATIC_CFLAGS)
 OLDLIBDIR = lib${subst gcc,,${COMPILED_BY}}${R_ARCH}
 PKG_LIBS = \
@@ -21,16 +21,16 @@ PKG_LIBS = \
 OPENCVDATA = $(RWINLIB)/share
 endif
 
-all: $(SHLIB) copydata
+all: copydata
 
-$(OBJECTS): $(RWINLIB)
+$(OBJECTS): | $(RWINLIB)
 
 $(RWINLIB):
 	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
 
-copydata:
+copydata: | $(RWINLIB)
 	rm -Rf ../inst/share && mkdir -p ../inst
 	cp -Rf $(OPENCVDATA) ../inst/share
 
-clean:
-	rm -f $(SHLIB) $(OBJECTS)
+cleanup: $(SHLIB)
+	@rm -Rf $(RWINLIB)
diff --git a/tools/winlibs.R b/tools/winlibs.R
@@ -1,5 +1,5 @@
-if(!file.exists("../windows/opencv/include/opencv4/opencv2/opencv.hpp")){
-  unlink("../windows", recursive = TRUE)
+if(!file.exists("../.deps/opencv/include/opencv4/opencv2/opencv.hpp")){
+  unlink("../.deps", recursive = TRUE)
   url <- if(grepl("aarch", R.version$platform)){
     "https://github.com/r-windows/bundles/releases/download/opencv-4.8.1/opencv-4.8.1-clang-aarch64.tar.xz"
   } else if(grepl("clang", Sys.getenv('R_COMPILED_BY'))){
@@ -10,9 +10,9 @@ if(!file.exists("../windows/opencv/include/opencv4/opencv2/opencv.hpp")){
     "https://github.com/rwinlib/opencv/archive/refs/tags/v4.8.1.tar.gz"
   }
   download.file(url, basename(url), quiet = TRUE)
-  dir.create("../windows", showWarnings = FALSE)
-  untar(basename(url), exdir = "../windows", tar = 'internal')
+  dir.create("../.deps", showWarnings = FALSE)
+  untar(basename(url), exdir = "../.deps", tar = 'internal')
   unlink(basename(url))
-  setwd("../windows")
+  setwd("../.deps")
   file.rename(list.files(), 'opencv')
 }
