Skip to content

chore: Cleanup build process and remove unnecessary files #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ilia-Kosenkov merged 2 commits into from
May 1, 2025
Merged

chore: Cleanup build process and remove unnecessary files #440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c88fb5
chore: further cleanup after build process
albersonmiranda May 1, 2025
99a662e
fix typo
albersonmiranda May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion inst/templates/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ STATLIB = $(LIBDIR)/lib{{{lib_name}}}.a
PKG_LIBS = -L$(LIBDIR) -l{{{lib_name}}}

all: $(SHLIB) rust_clean
rm -f $(CURDIR)/Makevars

.PHONY: $(STATLIB)

Expand Down Expand Up @@ -39,4 +40,4 @@ rust_clean: $(SHLIB)
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@

clean:
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)
3 changes: 2 additions & 1 deletion inst/templates/Makevars.win.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ STATLIB = $(LIBDIR)/lib{{{lib_name}}}.a
PKG_LIBS = -L$(LIBDIR) -l{{{lib_name}}} -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll

all: $(SHLIB) rust_clean
rm -f $(CURDIR)/Makevars

.PHONY: $(STATLIB)

Expand Down Expand Up @@ -36,4 +37,4 @@ rust_clean: $(SHLIB)
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@

clean:
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)
9 changes: 6 additions & 3 deletions tests/testthat/_snaps/use_extendr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
PKG_LIBS = -L$(LIBDIR) -ltestpkg

all: $(SHLIB) rust_clean
rm -f $(CURDIR)/Makevars

.PHONY: $(STATLIB)

Expand Down Expand Up @@ -232,7 +233,7 @@
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@

clean:
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)

---

Expand Down Expand Up @@ -261,6 +262,7 @@
PKG_LIBS = -L$(LIBDIR) -ltestpkg -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll

all: $(SHLIB) rust_clean
rm -f $(CURDIR)/Makevars

.PHONY: $(STATLIB)

Expand Down Expand Up @@ -291,7 +293,7 @@
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@

clean:
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)

---

Expand Down Expand Up @@ -417,6 +419,7 @@
PKG_LIBS = -L$(LIBDIR) -lbar

all: $(SHLIB) rust_clean
rm -f $(CURDIR)/Makevars

.PHONY: $(STATLIB)

Expand Down Expand Up @@ -452,5 +455,5 @@
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@

clean:
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)

Loading