Skip to content

Commit f4fda0b

Browse files
authored
fix: clean up the statlib before compiled code check by R CMD check on R 4.5 (#347)
1 parent 078f513 commit f4fda0b

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

.github/workflows/check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ jobs:
102102
- uses: r-lib/actions/check-r-package@v2
103103
env:
104104
LIBPRQLR_BUILD: "false"
105+
NOT_CRAN: "false"
105106
with:
106107
upload-snapshots: true
107108

src/Makevars.in

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ LIBDIR = $(TARGET_DIR)/$(TARGET)/$(PRQLR_PROFILE)
88
STATLIB = $(LIBDIR)/$(LIBNAME)
99
PKG_LIBS = -L$(LIBDIR) -lprqlr
1010

11-
all: C_clean
11+
.PHONY: all
12+
all: C_clean $(SHLIB) cleanup
1213

1314
$(SHLIB): $(STATLIB)
1415

@@ -43,12 +44,16 @@ $(STATLIB):
4344
--profile="$(PRQLR_PROFILE)" --features="$(PRQLR_FEATURES)" -Zbuild-std=panic_abort,std; \
4445
fi
4546

46-
if [ "$(NOT_CRAN)" != "true" ]; then \
47-
rm -Rf "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
48-
fi
49-
47+
.PHONY: C_clean
5048
C_clean:
5149
rm -Rf "$(SHLIB)" "$(STATLIB)" "$(OBJECTS)"
5250

53-
clean:
54-
rm -Rf "$(SHLIB)" "$(STATLIB)" "$(OBJECTS)" "$(TARGET_DIR)"
51+
.PHONY: cleanup
52+
cleanup:
53+
if [ "$(NOT_CRAN)" != "true" ]; then \
54+
rm -Rf "$(STATLIB)" "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
55+
fi
56+
57+
.PHONY: clean
58+
clean: C_clean
59+
rm -Rf "$(TARGET_DIR)"

src/Makevars.win

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@ PKG_LIBS = -L$(LIBDIR) -lprqlr -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll
1212
# need to overwrite it via configuration.
1313
CARGO_LINKER = x86_64-w64-mingw32.static.posix-gcc.exe
1414

15-
all: C_clean
15+
.PHONY: all
16+
all: C_clean $(SHLIB) cleanup
1617

1718
$(SHLIB): $(STATLIB)
19+
if [ "$(NOT_CRAN)" != "true" ]; then \
20+
rm -Rf "$(STATLIB)" "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
21+
fi
1822

1923
CARGOTMP = $(CURDIR)/.cargo
2024
VENDOR_DIR = $(CURDIR)/rust/vendor
@@ -49,12 +53,16 @@ $(STATLIB):
4953
cargo build --lib --manifest-path="$(CURDIR)/rust/Cargo.toml" --target-dir "$(TARGET_DIR)" --target="$(TARGET)" \
5054
--profile="$(PRQLR_PROFILE)" --features="$(PRQLR_FEATURES)"
5155

52-
if [ "$(NOT_CRAN)" != "true" ]; then \
53-
rm -Rf "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
54-
fi
55-
56+
.PHONY: C_clean
5657
C_clean:
5758
rm -Rf "$(SHLIB)" "$(STATLIB)" "$(OBJECTS)" "$(LIBGCC_MOCK_DIR)"
5859

59-
clean:
60-
rm -Rf "$(SHLIB)" "$(STATLIB)" "$(OBJECTS)" "$(TARGET_DIR)" "$(LIBGCC_MOCK_DIR)"
60+
.PHONY: cleanup
61+
cleanup:
62+
if [ "$(NOT_CRAN)" != "true" ]; then \
63+
rm -Rf "$(STATLIB)" "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
64+
fi
65+
66+
.PHONY: clean
67+
clean: C_clean
68+
rm -Rf "$(TARGET_DIR)"

0 commit comments

Comments
 (0)