Vendors sources

Author: andyquinterom

.Rbuildignore

@@ -1,4 +1,5 @@
 ^src/\.cargo$
+^src/\.short_build_path$
 ^src/rust/vendor$
 ^src/rust/target$
 ^src/Makevars$

.github/workflows/R-CMD-check.yaml

@@ -28,6 +28,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
+      NOT_CRAN: true
 
     steps:
       - uses: actions/checkout@v4

src/Makevars.in

@@ -11,7 +11,9 @@ all: $(SHLIB) rust_clean
 
 $(SHLIB): $(STATLIB)
 
-CARGOTMP = $(CURDIR)/.cargo
+# CARGO_HOME is set dynamically by tools/config.R
+# On Unix, this uses the current directory (no path length issues)
+CARGOTMP = @CARGO_HOME@
 VENDOR_DIR = $(CURDIR)/vendor
 
 

src/Makevars.win.in

@@ -13,10 +13,15 @@ all: $(SHLIB) rust_clean
 
 $(SHLIB): $(STATLIB)
 
-CARGOTMP = $(CURDIR)/.cargo
+# CARGO_HOME is set dynamically by tools/config.R
+# On Windows, this uses the same short base path as TARGET_DIR
+# so that relative paths in aws-lc-sys CMake builds resolve correctly
+CARGOTMP = @CARGO_HOME@
 VENDOR_DIR = vendor
 
 $(STATLIB):
+	# Clean any previous build artifacts to avoid conflicts
+	rm -Rf $(TARGET_DIR) $(CARGOTMP)
 	mkdir -p $(TARGET_DIR)/libgcc_mock
 	touch $(TARGET_DIR)/libgcc_mock/libgcc_eh.a
 
@@ -27,8 +32,9 @@ $(STATLIB):
 	fi
 
 	# Build the project using Cargo with additional flags
+	# Note: TARGET_DIR is an absolute short path, so don't prepend CURDIR
 	export CARGO_HOME=$(CARGOTMP) && \
-	export LIBRARY_PATH="$(LIBRARY_PATH);$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \
+	export LIBRARY_PATH="$(LIBRARY_PATH);$(TARGET_DIR)/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)
 
 	# Always clean up CARGOTMP

src/rust/vendor-config.toml

@@ -0,0 +1,5 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"

src/rust/vendor.tar.xz

@@ -9,14 +9,39 @@ is_windows <- .Platform[["OS.type"]] == "windows"
 
 # Generate a short target directory for Windows to avoid MAX_PATH issues
 # aws-lc-sys builds fail when paths exceed ~250 characters
+# IMPORTANT: Both CARGO_HOME and TARGET_DIR must be in the same short path
+# so that relative paths in aws-lc-sys CMake builds resolve correctly
 if (is_windows) {
-  # Use R's temp directory but with a short subdirectory name
-  # This is CRAN-compliant as it uses the session temp directory
-  short_tmp <- file.path(tempdir(), "dR")
+  # For CI builds (NOT_CRAN set), we can use a fixed short path
+
+  # For CRAN builds, we use tempdir but write the path to a file so that
+
+  # subsequent R sessions (configure vs build) use the same directory
+
+  env_not_cran_check <- Sys.getenv("NOT_CRAN")
+
+  if (env_not_cran_check != "") {
+    # CI build - use fixed short path (no CRAN policy concerns)
+    short_base <- "C:/tmp/dR"
+  } else {
+    # CRAN build - use tempdir but persist the path choice
+    # Create a marker file in the source directory to ensure consistency
+    marker_file <- "src/.short_build_path"
+    if (file.exists(marker_file)) {
+      short_base <- readLines(marker_file, n = 1)
+    } else {
+      short_base <- gsub("\\\\", "/", file.path(tempdir(), "dR"))
+      writeLines(short_base, marker_file)
+    }
+  }
+
   # Normalize to forward slashes for Make compatibility
-  .target_dir <- gsub("\\\\", "/", short_tmp)
+  .target_dir <- paste0(short_base, "/target")
+  .cargo_home <- paste0(short_base, "/.cargo")
+  message("Using short build path: ", short_base)
 } else {
   .target_dir <- "./rust/target"
+  .cargo_home <- "$(CURDIR)/.cargo"
 }
 
 # check DEBUG and NOT_CRAN environment variables
@@ -117,7 +142,8 @@ new_txt <- gsub("@CRAN_FLAGS@", .cran_flags, mv_txt) |>
   gsub("@LIBDIR@", .libdir, x = _) |>
   gsub("@TARGET@", .target, x = _) |>
   gsub("@PANIC_EXPORTS@", .panic_exports, x = _) |>
-  gsub("@TARGET_DIR@", .target_dir, x = _)
+  gsub("@TARGET_DIR@", .target_dir, x = _) |>
+  gsub("@CARGO_HOME@", .cargo_home, x = _)
 
 message("Writing `", mv_ofp, "`.")
 con <- file(mv_ofp, open = "wb")