Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
JosiahParry committed May 9, 2024
1 parent 8ec7b1f commit 243b579
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 153 deletions.
56 changes: 28 additions & 28 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -1789,34 +1789,34 @@ if ! command -v cargo &> /dev/null; then
fi

# Check for Rscript
if test -z "$R_HOME"; then
echo "----------------------- R_HOME NOT SET------------------------"
echo "The 'R_HOME' environment variable is not set. Please make sure R"
echo "is installed and set the R_HOME environment variable."
echo "-------------------------------------------------------------------"
echo ""
exit 1
fi

RSCRIPT="${R_HOME}/bin/Rscript"

# Check if Rscript is executable
if ! test -x "$RSCRIPT"; then
echo "----------------------- RSCRIPT NOT EXECUTABLE------------------------"
echo "The 'Rscript' executable is not found or not executable. Please make sure R"
echo "is installed correctly and 'Rscript' is executable."
echo "--------------------------------------------------------------------------"
echo ""
exit 1
fi
# if test -z "$R_HOME"; then
# echo "----------------------- [R_HOME NOT SET]------------------------"
# echo "The 'R_HOME' environment variable is not set. Please make sure R"
# echo "is installed and set the R_HOME environment variable."
# echo "-------------------------------------------------------------------"
# echo ""
# exit 1
# fi

# RSCRIPT="${R_HOME}/bin/Rscript"

# # Check if Rscript is executable
# if ! test -x "$RSCRIPT"; then
# echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
# echo "The 'Rscript' executable is not found or not executable. Please make sure R"
# echo "is installed correctly and 'Rscript' is executable."
# echo "--------------------------------------------------------------------------"
# echo ""
# exit 1
# fi

# Output status
echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
echo "Running tools/get-deps.R script..."

# Execute the get-deps.R script
if ! "$RSCRIPT" ./tools/get-deps.R; then
echo "Error: Failed to execute tools/get-deps.R."
exit 1
fi
# echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
# echo "Running tools/get-deps.R script..."

# # Execute the get-deps.R script
# if ! "$RSCRIPT" ./tools/get-deps.R; then
# echo "Error: Failed to execute tools/get-deps.R."
# exit 1
# fi

50 changes: 25 additions & 25 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,33 @@ if ! command -v cargo &> /dev/null; then
fi

# Check for Rscript
if test -z "$R_HOME"; then
echo "----------------------- [R_HOME NOT SET]------------------------"
echo "The 'R_HOME' environment variable is not set. Please make sure R"
echo "is installed and set the R_HOME environment variable."
echo "-------------------------------------------------------------------"
echo ""
exit 1
fi
# if test -z "$R_HOME"; then
# echo "----------------------- [R_HOME NOT SET]------------------------"
# echo "The 'R_HOME' environment variable is not set. Please make sure R"
# echo "is installed and set the R_HOME environment variable."
# echo "-------------------------------------------------------------------"
# echo ""
# exit 1
# fi

RSCRIPT="${R_HOME}/bin/Rscript"
# RSCRIPT="${R_HOME}/bin/Rscript"

# Check if Rscript is executable
if ! test -x "$RSCRIPT"; then
echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
echo "The 'Rscript' executable is not found or not executable. Please make sure R"
echo "is installed correctly and 'Rscript' is executable."
echo "--------------------------------------------------------------------------"
echo ""
exit 1
fi
# # Check if Rscript is executable
# if ! test -x "$RSCRIPT"; then
# echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
# echo "The 'Rscript' executable is not found or not executable. Please make sure R"
# echo "is installed correctly and 'Rscript' is executable."
# echo "--------------------------------------------------------------------------"
# echo ""
# exit 1
# fi

# Output status
echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
echo "Running tools/get-deps.R script..."
# echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
# echo "Running tools/get-deps.R script..."

# Execute the get-deps.R script
if ! "$RSCRIPT" ./tools/get-deps.R; then
echo "Error: Failed to execute tools/get-deps.R."
exit 1
fi
# # Execute the get-deps.R script
# if ! "$RSCRIPT" ./tools/get-deps.R; then
# echo "Error: Failed to execute tools/get-deps.R."
# exit 1
# fi
56 changes: 28 additions & 28 deletions configure.win
Original file line number Diff line number Diff line change
Expand Up @@ -1789,34 +1789,34 @@ if ! command -v cargo &> /dev/null; then
fi

# Check for Rscript
if test -z "$R_HOME"; then
echo "----------------------- R_HOME NOT SET------------------------"
echo "The 'R_HOME' environment variable is not set. Please make sure R"
echo "is installed and set the R_HOME environment variable."
echo "-------------------------------------------------------------------"
echo ""
exit 1
fi

RSCRIPT="${R_HOME}/bin/${R_ARCH_BIN}/Rscript.exe"

# Check if Rscript is executable
if ! test -x "$RSCRIPT"; then
echo "----------------------- RSCRIPT NOT EXECUTABLE------------------------"
echo "The 'Rscript' executable is not found or not executable. Please make sure R"
echo "is installed correctly and 'Rscript' is executable."
echo "--------------------------------------------------------------------------"
echo ""
exit 1
fi
# if test -z "$R_HOME"; then
# echo "----------------------- [R_HOME NOT SET]------------------------"
# echo "The 'R_HOME' environment variable is not set. Please make sure R"
# echo "is installed and set the R_HOME environment variable."
# echo "-------------------------------------------------------------------"
# echo ""
# exit 1
# fi

# RSCRIPT="${R_HOME}/bin/${R_ARCH_BIN}/Rscript.exe"

# # Check if Rscript is executable
# if ! test -x "$RSCRIPT"; then
# echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
# echo "The 'Rscript' executable is not found or not executable. Please make sure R"
# echo "is installed correctly and 'Rscript' is executable."
# echo "--------------------------------------------------------------------------"
# echo ""
# exit 1
# fi

# Output status
echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
echo "Running tools/get-deps.R script..."

# Execute the get-deps.R script
if ! "$RSCRIPT" ./tools/get-deps.R; then
echo "Error: Failed to execute tools/get-deps.R."
exit 1
fi
# echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
# echo "Running tools/get-deps.R script..."

# # Execute the get-deps.R script
# if ! "$RSCRIPT" ./tools/get-deps.R; then
# echo "Error: Failed to execute tools/get-deps.R."
# exit 1
# fi

10 changes: 7 additions & 3 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

0 errors | 0 warnings | 1 note

* C_clean and clean were not being called for Debian build resulting in NOTE for src/vendor/chrono/CITATION
- This should be removed now via `rm -Rf $(VENDOR_DIR)` in the Makevars
* The install size is < 2mb however the vendored dependencies are ~18mb making the source larger than the installation size.

* In accordance with the CRAN policy (below), Rust dependencies are downloaded as part of the `configure` process. The downloaded `vendor.tar.xz`'s checksum is matched to that in `tools/vendor.md5`

> "If the sources are too large, it is acceptable to download them as part of installation, but do ensure that the download is of a fixed version rather than the latest."
*

* This is a new release.
Binary file modified src/rust/vendor.tar.xz
Binary file not shown.
7 changes: 0 additions & 7 deletions tools/README.md

This file was deleted.

7 changes: 7 additions & 0 deletions tools/generate-configures.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

autoreconf -i

cp configure configure.win

sed -i '' 's|RSCRIPT="\${R_HOME}/bin/Rscript"|RSCRIPT="\${R_HOME}/bin/${R_ARCH_BIN}/Rscript.exe"|g' configure.win
55 changes: 0 additions & 55 deletions tools/get-deps.R

This file was deleted.

6 changes: 0 additions & 6 deletions tools/vendor.R

This file was deleted.

1 change: 0 additions & 1 deletion tools/vendor.md5

This file was deleted.

0 comments on commit 243b579

Please sign in to comment.