Skip to content

fix: do not generate wrappers on cran #12

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
kbvernon merged 4 commits into from
Sep 11, 2026
Merged

fix: do not generate wrappers on cran #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06a69ad
add roxygen guard
kbvernon Sep 11, 2026
0deee17
remove unnecessary ucrt
kbvernon Sep 11, 2026
9255251
echo success instead of intent
kbvernon Sep 11, 2026
a732575
add blank lines in output
kbvernon Sep 11, 2026
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
24 changes: 15 additions & 9 deletions src/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,37 @@ VENDOR_DIR = $(CURDIR)/vendor
# If a vendor directory exists, it is used for offline compilation. Otherwise if
# vendor.tar.xz exists, it is unzipped and used for offline compilation.
$(STATLIB):

@echo;
if [ -d ./vendor ]; then \
echo "=== Using offline vendor directory ==="; \
mkdir -p "$(CARGOTMP)" && \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml"; \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml" && \
echo "* used offline vendor directory"; \
elif [ -f ./rust/vendor.tar.xz ]; then \
echo "=== Using offline vendor tarball ==="; \
tar xf rust/vendor.tar.xz && \
mkdir -p "$(CARGOTMP)" && \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml"; \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml" && \
echo "* unpacked offline vendor tarball"; \
fi

@echo;
export CARGO_HOME="$(CARGOTMP)" && \
export PATH="$(PATH):$(HOME)/.cargo/bin" && \
@PANIC_EXPORTS@RUSTFLAGS="$(RUSTFLAGS) --print=native-static-libs" cargo build @CRAN_FLAGS@ --lib @PROFILE@ --manifest-path=./rust/Cargo.toml --target-dir="$(TARGET_DIR)" @TARGET@

$(CC) -o $(DOCUMENT) rust/document.c $(PKG_LIBS) -L"$(R_HOME)/lib$(R_ARCH)" -lR
./$(DOCUMENT) $(R_PACKAGE_NAME) ../R/extendr-wrappers.R
rm -f $(DOCUMENT)
@echo;
if [ -n "$$ROXYGEN_PKG" ]; then \
$(CC) -o $(DOCUMENT) rust/document.c $(PKG_LIBS) -L"$(R_HOME)/lib$(R_ARCH)" -lR && \
./$(DOCUMENT) $(R_PACKAGE_NAME) ../R/extendr-wrappers.R && \
rm -f $(DOCUMENT) && \
echo "* generated extendr wrappers"; \
fi

@echo;
# Always clean up CARGOTMP
rm -Rf "$(CARGOTMP)";

rust_clean: $(SHLIB)
rm -Rf "$(CARGOTMP)" "$(VENDOR_DIR)" @CLEAN_TARGET@

clean:
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) "$(TARGET_DIR)" "$(VENDOR_DIR)" $(DOCUMENT)
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) "$(TARGET_DIR)" "$(VENDOR_DIR)" $(DOCUMENT)
5 changes: 0 additions & 5 deletions src/Makevars.ucrt
View file
Open in desktop

This file was deleted.

28 changes: 18 additions & 10 deletions src/Makevars.win.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,45 @@ CARGOTMP = $(CURDIR)/.cargo
VENDOR_DIR = vendor

$(STATLIB):
@echo;
mkdir -p "$(CARGOTMP)/libgcc_mock"
touch "$(CARGOTMP)/libgcc_mock/libgcc_eh.a"

# If a vendor directory exists, it is used for offline compilation. Otherwise if
# vendor.tar.xz exists, it is unzipped and used for offline compilation.
@echo;
if [ -d ./vendor ]; then \
echo "=== Using offline vendor directory ==="; \
mkdir -p "$(CARGOTMP)" && \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml"; \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml" && \
echo "* used offline vendor directory"; \
elif [ -f ./rust/vendor.tar.xz ]; then \
echo "=== Using offline vendor tarball ==="; \
tar xf rust/vendor.tar.xz && \
mkdir -p "$(CARGOTMP)" && \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml"; \
cp rust/vendor-config.toml "$(CARGOTMP)/config.toml" && \
echo "* unpacked offline vendor tarball"; \
fi

# Build the project using Cargo with additional flags
# Build the project using Cargo with additional flags
@echo;
export CARGO_HOME="$(CARGOTMP)" && \
export LIBRARY_PATH="$(LIBRARY_PATH);$(CARGOTMP)/libgcc_mock" && \
RUSTFLAGS="$(RUSTFLAGS) --print=native-static-libs" cargo build @CRAN_FLAGS@ --target=$(TARGET) --lib @PROFILE@ --manifest-path=rust/Cargo.toml --target-dir="$(TARGET_DIR)"

# Generate wrappers using linked C executable
$(CC) -o $(DOCUMENT) rust/document.c $(PKG_LIBS) -L"$(R_HOME)/bin$(R_ARCH)" -lR
./$(DOCUMENT) $(R_PACKAGE_NAME) ../R/extendr-wrappers.R
rm -f $(DOCUMENT)
# Generate wrappers using linked C executable (dev only)
@echo;
if [ -n "$$ROXYGEN_PKG" ]; then \
$(CC) -o $(DOCUMENT) rust/document.c $(PKG_LIBS) -L"$(R_HOME)/bin$(R_ARCH)" -lR && \
./$(DOCUMENT) $(R_PACKAGE_NAME) ../R/extendr-wrappers.R && \
rm -f $(DOCUMENT) && \
echo "* generated extendr wrappers"; \
fi

@echo;
# Always clean up CARGOTMP
rm -Rf "$(CARGOTMP)";

rust_clean: $(SHLIB)
rm -Rf "$(CARGOTMP)" "$(VENDOR_DIR)" @CLEAN_TARGET@

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