From e84771287068c5d20b0e617cc2273145bf036133 Mon Sep 17 00:00:00 2001 From: Beniamino Green Date: Mon, 23 Sep 2024 22:54:17 -0400 Subject: [PATCH 1/3] re-ordered steps in CRAN template --- inst/templates/cran/Makevars | 6 +++--- inst/templates/cran/Makevars.win | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inst/templates/cran/Makevars b/inst/templates/cran/Makevars index e2dc513e..1eac0338 100644 --- a/inst/templates/cran/Makevars +++ b/inst/templates/cran/Makevars @@ -24,9 +24,9 @@ $(STATLIB): if [ "$(NOT_CRAN)" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ - export PATH="$(PATH):$(HOME)/.cargo/bin" && \ - cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) && \ - echo `cargo --version` && echo `rustc --version`; + echo `cargo --version` && echo `rustc --version` && \ + export PATH="$(PATH):$(HOME)/.cargo/bin" && \ + cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ C_clean: diff --git a/inst/templates/cran/Makevars.win b/inst/templates/cran/Makevars.win index f19bb836..8eb69e4c 100644 --- a/inst/templates/cran/Makevars.win +++ b/inst/templates/cran/Makevars.win @@ -33,10 +33,10 @@ $(STATLIB): if [ "$(NOT_CRAN)" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ + echo `cargo --version` && echo `rustc --version` && \ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock"; \ - cargo build $(CRAN_FLAGS) --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) && \ - echo `cargo --version` && echo `rustc --version`; + cargo build $(CRAN_FLAGS) --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ fi From 3db73da15e0059a32c58552ccbe8514acc76bbc7 Mon Sep 17 00:00:00 2001 From: Beniamino Green Date: Tue, 24 Sep 2024 11:35:14 -0400 Subject: [PATCH 2/3] moved echo statements to directly before cargo build is called --- inst/templates/Makevars | 3 ++- inst/templates/Makevars.win | 3 ++- inst/templates/cran/Makevars | 4 ++-- inst/templates/cran/Makevars.win | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/inst/templates/Makevars b/inst/templates/Makevars index 07ed90f4..325df57a 100644 --- a/inst/templates/Makevars +++ b/inst/templates/Makevars @@ -17,7 +17,8 @@ $(STATLIB): export CARGO_HOME=$(CARGOTMP); \ fi && \ export PATH="$(PATH):$(HOME)/.cargo/bin" && \ - cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) + echo `cargo --version` && echo `rustc --version` && \ + cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ rm -Rf $(LIBDIR)/build; \ diff --git a/inst/templates/Makevars.win b/inst/templates/Makevars.win index e47a9ab2..e5599a78 100644 --- a/inst/templates/Makevars.win +++ b/inst/templates/Makevars.win @@ -27,7 +27,8 @@ $(STATLIB): fi && \ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \ - cargo build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) + echo `cargo --version` && echo `rustc --version` && \ + cargo build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ rm -Rf $(LIBDIR)/build; \ diff --git a/inst/templates/cran/Makevars b/inst/templates/cran/Makevars index 1eac0338..f01cdba4 100644 --- a/inst/templates/cran/Makevars +++ b/inst/templates/cran/Makevars @@ -24,8 +24,8 @@ $(STATLIB): if [ "$(NOT_CRAN)" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ - echo `cargo --version` && echo `rustc --version` && \ - export PATH="$(PATH):$(HOME)/.cargo/bin" && \ + export PATH="$(PATH):$(HOME)/.cargo/bin" && \ + echo `cargo --version` && echo `rustc --version` && \ cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ diff --git a/inst/templates/cran/Makevars.win b/inst/templates/cran/Makevars.win index 8eb69e4c..63759be7 100644 --- a/inst/templates/cran/Makevars.win +++ b/inst/templates/cran/Makevars.win @@ -33,9 +33,9 @@ $(STATLIB): if [ "$(NOT_CRAN)" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ - echo `cargo --version` && echo `rustc --version` && \ - export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ + export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock"; \ + echo `cargo --version` && echo `rustc --version` && \ cargo build $(CRAN_FLAGS) --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ From 225a7d9d1b42806d318734a03e6c4ee9c6dbc9e4 Mon Sep 17 00:00:00 2001 From: Beniamino Green Date: Tue, 24 Sep 2024 12:01:13 -0400 Subject: [PATCH 3/3] removing rustc and cargo version lines from makevars --- inst/templates/Makevars | 1 - inst/templates/Makevars.win | 1 - inst/templates/cran/Makevars | 1 - inst/templates/cran/Makevars.win | 1 - 4 files changed, 4 deletions(-) diff --git a/inst/templates/Makevars b/inst/templates/Makevars index 325df57a..fbd14570 100644 --- a/inst/templates/Makevars +++ b/inst/templates/Makevars @@ -17,7 +17,6 @@ $(STATLIB): export CARGO_HOME=$(CARGOTMP); \ fi && \ export PATH="$(PATH):$(HOME)/.cargo/bin" && \ - echo `cargo --version` && echo `rustc --version` && \ cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ diff --git a/inst/templates/Makevars.win b/inst/templates/Makevars.win index e5599a78..9a9b2586 100644 --- a/inst/templates/Makevars.win +++ b/inst/templates/Makevars.win @@ -27,7 +27,6 @@ $(STATLIB): fi && \ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \ - echo `cargo --version` && echo `rustc --version` && \ cargo build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ diff --git a/inst/templates/cran/Makevars b/inst/templates/cran/Makevars index f01cdba4..c8178495 100644 --- a/inst/templates/cran/Makevars +++ b/inst/templates/cran/Makevars @@ -25,7 +25,6 @@ $(STATLIB): export CARGO_HOME=$(CARGOTMP); \ fi && \ export PATH="$(PATH):$(HOME)/.cargo/bin" && \ - echo `cargo --version` && echo `rustc --version` && \ cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ diff --git a/inst/templates/cran/Makevars.win b/inst/templates/cran/Makevars.win index 63759be7..0caee799 100644 --- a/inst/templates/cran/Makevars.win +++ b/inst/templates/cran/Makevars.win @@ -35,7 +35,6 @@ $(STATLIB): fi && \ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock"; \ - echo `cargo --version` && echo `rustc --version` && \ cargo build $(CRAN_FLAGS) --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \