File tree Expand file tree Collapse file tree 3 files changed +28
-14
lines changed Expand file tree Collapse file tree 3 files changed +28
-14
lines changed Original file line number Diff line number Diff line change @@ -102,6 +102,7 @@ jobs:
102
102
- uses : r-lib/actions/check-r-package@v2
103
103
env :
104
104
LIBPRQLR_BUILD : " false"
105
+ NOT_CRAN : " false"
105
106
with :
106
107
upload-snapshots : true
107
108
Original file line number Diff line number Diff line change @@ -8,7 +8,8 @@ LIBDIR = $(TARGET_DIR)/$(TARGET)/$(PRQLR_PROFILE)
8
8
STATLIB = $(LIBDIR)/$(LIBNAME)
9
9
PKG_LIBS = -L$(LIBDIR) -lprqlr
10
10
11
- all: C_clean
11
+ .PHONY: all
12
+ all: C_clean $(SHLIB) cleanup
12
13
13
14
$(SHLIB): $(STATLIB)
14
15
@@ -43,12 +44,16 @@ $(STATLIB):
43
44
--profile="$(PRQLR_PROFILE)" --features="$(PRQLR_FEATURES)" -Zbuild-std=panic_abort,std; \
44
45
fi
45
46
46
- if [ "$(NOT_CRAN)" != "true" ]; then \
47
- rm -Rf "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
48
- fi
49
-
47
+ .PHONY: C_clean
50
48
C_clean:
51
49
rm -Rf "$(SHLIB)" "$(STATLIB)" "$(OBJECTS)"
52
50
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)"
Original file line number Diff line number Diff line change @@ -12,9 +12,13 @@ PKG_LIBS = -L$(LIBDIR) -lprqlr -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll
12
12
# need to overwrite it via configuration.
13
13
CARGO_LINKER = x86_64-w64-mingw32.static.posix-gcc.exe
14
14
15
- all: C_clean
15
+ .PHONY: all
16
+ all: C_clean $(SHLIB) cleanup
16
17
17
18
$(SHLIB): $(STATLIB)
19
+ if [ "$(NOT_CRAN)" != "true" ]; then \
20
+ rm -Rf "$(STATLIB)" "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
21
+ fi
18
22
19
23
CARGOTMP = $(CURDIR)/.cargo
20
24
VENDOR_DIR = $(CURDIR)/rust/vendor
@@ -49,12 +53,16 @@ $(STATLIB):
49
53
cargo build --lib --manifest-path="$(CURDIR)/rust/Cargo.toml" --target-dir "$(TARGET_DIR)" --target="$(TARGET)" \
50
54
--profile="$(PRQLR_PROFILE)" --features="$(PRQLR_FEATURES)"
51
55
52
- if [ "$(NOT_CRAN)" != "true" ]; then \
53
- rm -Rf "$(CARGOTMP)" "$(VENDOR_DIR)" "$(LIBDIR)/build"; \
54
- fi
55
-
56
+ .PHONY: C_clean
56
57
C_clean:
57
58
rm -Rf "$(SHLIB)" "$(STATLIB)" "$(OBJECTS)" "$(LIBGCC_MOCK_DIR)"
58
59
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)"
You can’t perform that action at this time.
0 commit comments