Cleanup after build

Author: jeroen

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

@@ -18,6 +18,8 @@ jobs:
         config:
           - {os: macos-13,       r: 'release'}
           - {os: macos-14,       r: 'release'}
+          - {os: macos-15,       r: 'next'}
+          - {os: windows-latest, r: 'devel'}
           - {os: windows-latest, r: 'release'}
           - {os: windows-latest, r: '4.3'}
           - {os: windows-latest, r: '4.2'}
@@ -49,3 +51,5 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+        env:
+          MAKEFLAGS: -j4

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: gert
 Title: Simple Git Client for R
-Version: 2.1.4.9000
+Version: 2.1.5
 Authors@R: c(
     person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroenooms@gmail.com",
       comment = c(ORCID = "0000-0002-4035-0289")),

gert.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 0fe17c47-2765-498f-b96f-5b0595ce54aa
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

src/Makevars.in

@@ -2,7 +2,7 @@ PKG_CFLAGS = $(C_VISIBILITY)
 PKG_CPPFLAGS = @cflags@ -DR_NO_REMAP -DSTRICT_R_HEADERS
 PKG_LIBS = @libs@
 
-all: clean
+all: $(SHLIB) cleanup
 
-clean:
-	rm -f $(SHLIB) $(OBJECTS)
+cleanup: $(SHLIB)
+	@rm -Rf ../.deps

src/Makevars.win

@@ -1,4 +1,4 @@
-RWINLIB = ../windows/libgit2
+RWINLIB = ../.deps/libgit2
 TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)
 
 PKG_CPPFLAGS = -I$(RWINLIB)/include \
@@ -10,12 +10,13 @@ PKG_LIBS = \
 	-lgit2 -lssh2 -lssl -lcrypto -lz -liconv \
 	-lwinhttp -lws2_32 -lcrypt32 -lole32 -lrpcrt4 -lsecur32
 
-all: clean winlibs
+all: $(SHLIB) cleanup
 
-winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
+# Needed for parallel make
+$(OBJECTS): | $(RWINLIB)
 
-clean:
-	rm -f $(SHLIB) $(OBJECTS)
+$(RWINLIB):
+	@"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
 
-.PHONY: all winlibs clean
+cleanup: $(SHLIB)
+	@rm -Rf $(RWINLIB)

tools/winlibs.R

@@ -1,5 +1,5 @@
-if(!file.exists("../windows/libgit2/include/git2.h")){
-  unlink("../windows", recursive = TRUE)
+if(!file.exists('clone.o') && !file.exists("../.deps/libgit2/include/git2.h")){
+  unlink("../.deps", recursive = TRUE)
   url <- if(grepl("aarch", R.version$platform)){
     "https://github.com/r-windows/bundles/releases/download/libgit2-1.7.2/libgit2-1.7.2-clang-aarch64.tar.xz"
   } else if(grepl("clang", Sys.getenv('R_COMPILED_BY'))){
@@ -10,9 +10,9 @@ if(!file.exists("../windows/libgit2/include/git2.h")){
     "https://github.com/rwinlib/libgit2/archive/v1.7.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(), 'libgit2')
 }