Cleanup build

Author: jeroen

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

@@ -47,3 +47,5 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+        env:
+          MAKEFLAGS: -j4

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: ssh
 Type: Package
 Title: Secure Shell (SSH) Client for R
-Version: 0.9.3
+Version: 0.9.4
 Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"), 
     email = "[email protected]", comment = c(ORCID = "0000-0002-4035-0289"))
 Description: Connect to a remote server over SSH to transfer files via SCP, 

src/Makevars.in

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

src/Makevars.win

@@ -1,4 +1,4 @@
-RWINLIB = ../windows/libssh
+RWINLIB = ../.deps/libssh
 OLDLIBDIR = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)
 
 PKG_CPPFLAGS = -I$(RWINLIB)/include -DLIBSSH_STATIC
@@ -8,12 +8,13 @@ PKG_LIBS = \
 	-L$(RWINLIB)/lib \
 	-lssh -lcrypto -lz -lpthread -lws2_32 -lgdi32 -lcrypt32 -liphlpapi
 
-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)

ssh.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 8d846f31-55b7-44ce-abd7-6c2897741001
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

tools/winlibs.R

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