Skip to content

Commit 243b579

Browse files
JosiahParryJosiahParry
committed
updates
1 parent 8ec7b1f commit 243b579

File tree

10 files changed

+95
-153
lines changed

10 files changed

+95
-153
lines changed

‎configure

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,34 +1789,34 @@ if ! command -v cargo &> /dev/null; then
17891789
fi
17901790

17911791
# Check for Rscript
1792-
if test -z "$R_HOME"; then
1793-
echo "----------------------- R_HOME NOT SET------------------------"
1794-
echo "The 'R_HOME' environment variable is not set. Please make sure R"
1795-
echo "is installed and set the R_HOME environment variable."
1796-
echo "-------------------------------------------------------------------"
1797-
echo ""
1798-
exit 1
1799-
fi
1800-
1801-
RSCRIPT="${R_HOME}/bin/Rscript"
1802-
1803-
# Check if Rscript is executable
1804-
if ! test -x "$RSCRIPT"; then
1805-
echo "----------------------- RSCRIPT NOT EXECUTABLE------------------------"
1806-
echo "The 'Rscript' executable is not found or not executable. Please make sure R"
1807-
echo "is installed correctly and 'Rscript' is executable."
1808-
echo "--------------------------------------------------------------------------"
1809-
echo ""
1810-
exit 1
1811-
fi
1792+
# if test -z "$R_HOME"; then
1793+
# echo "----------------------- [R_HOME NOT SET]------------------------"
1794+
# echo "The 'R_HOME' environment variable is not set. Please make sure R"
1795+
# echo "is installed and set the R_HOME environment variable."
1796+
# echo "-------------------------------------------------------------------"
1797+
# echo ""
1798+
# exit 1
1799+
# fi
1800+
1801+
# RSCRIPT="${R_HOME}/bin/Rscript"
1802+
1803+
# # Check if Rscript is executable
1804+
# if ! test -x "$RSCRIPT"; then
1805+
# echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
1806+
# echo "The 'Rscript' executable is not found or not executable. Please make sure R"
1807+
# echo "is installed correctly and 'Rscript' is executable."
1808+
# echo "--------------------------------------------------------------------------"
1809+
# echo ""
1810+
# exit 1
1811+
# fi
18121812

18131813
# Output status
1814-
echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
1815-
echo "Running tools/get-deps.R script..."
1816-
1817-
# Execute the get-deps.R script
1818-
if ! "$RSCRIPT" ./tools/get-deps.R; then
1819-
echo "Error: Failed to execute tools/get-deps.R."
1820-
exit 1
1821-
fi
1814+
# echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
1815+
# echo "Running tools/get-deps.R script..."
1816+
1817+
# # Execute the get-deps.R script
1818+
# if ! "$RSCRIPT" ./tools/get-deps.R; then
1819+
# echo "Error: Failed to execute tools/get-deps.R."
1820+
# exit 1
1821+
# fi
18221822

‎configure.ac

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,33 @@ if ! command -v cargo &> /dev/null; then
3535
fi
3636

3737
# Check for Rscript
38-
if test -z "$R_HOME"; then
39-
echo "----------------------- [R_HOME NOT SET]------------------------"
40-
echo "The 'R_HOME' environment variable is not set. Please make sure R"
41-
echo "is installed and set the R_HOME environment variable."
42-
echo "-------------------------------------------------------------------"
43-
echo ""
44-
exit 1
45-
fi
38+
# if test -z "$R_HOME"; then
39+
# echo "----------------------- [R_HOME NOT SET]------------------------"
40+
# echo "The 'R_HOME' environment variable is not set. Please make sure R"
41+
# echo "is installed and set the R_HOME environment variable."
42+
# echo "-------------------------------------------------------------------"
43+
# echo ""
44+
# exit 1
45+
# fi
4646

47-
RSCRIPT="${R_HOME}/bin/Rscript"
47+
# RSCRIPT="${R_HOME}/bin/Rscript"
4848

49-
# Check if Rscript is executable
50-
if ! test -x "$RSCRIPT"; then
51-
echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
52-
echo "The 'Rscript' executable is not found or not executable. Please make sure R"
53-
echo "is installed correctly and 'Rscript' is executable."
54-
echo "--------------------------------------------------------------------------"
55-
echo ""
56-
exit 1
57-
fi
49+
# # Check if Rscript is executable
50+
# if ! test -x "$RSCRIPT"; then
51+
# echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
52+
# echo "The 'Rscript' executable is not found or not executable. Please make sure R"
53+
# echo "is installed correctly and 'Rscript' is executable."
54+
# echo "--------------------------------------------------------------------------"
55+
# echo ""
56+
# exit 1
57+
# fi
5858

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

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

‎configure.win

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,34 +1789,34 @@ if ! command -v cargo &> /dev/null; then
17891789
fi
17901790

17911791
# Check for Rscript
1792-
if test -z "$R_HOME"; then
1793-
echo "----------------------- R_HOME NOT SET------------------------"
1794-
echo "The 'R_HOME' environment variable is not set. Please make sure R"
1795-
echo "is installed and set the R_HOME environment variable."
1796-
echo "-------------------------------------------------------------------"
1797-
echo ""
1798-
exit 1
1799-
fi
1800-
1801-
RSCRIPT="${R_HOME}/bin/${R_ARCH_BIN}/Rscript.exe"
1802-
1803-
# Check if Rscript is executable
1804-
if ! test -x "$RSCRIPT"; then
1805-
echo "----------------------- RSCRIPT NOT EXECUTABLE------------------------"
1806-
echo "The 'Rscript' executable is not found or not executable. Please make sure R"
1807-
echo "is installed correctly and 'Rscript' is executable."
1808-
echo "--------------------------------------------------------------------------"
1809-
echo ""
1810-
exit 1
1811-
fi
1792+
# if test -z "$R_HOME"; then
1793+
# echo "----------------------- [R_HOME NOT SET]------------------------"
1794+
# echo "The 'R_HOME' environment variable is not set. Please make sure R"
1795+
# echo "is installed and set the R_HOME environment variable."
1796+
# echo "-------------------------------------------------------------------"
1797+
# echo ""
1798+
# exit 1
1799+
# fi
1800+
1801+
# RSCRIPT="${R_HOME}/bin/${R_ARCH_BIN}/Rscript.exe"
1802+
1803+
# # Check if Rscript is executable
1804+
# if ! test -x "$RSCRIPT"; then
1805+
# echo "----------------------- [RSCRIPT NOT EXECUTABLE]------------------------"
1806+
# echo "The 'Rscript' executable is not found or not executable. Please make sure R"
1807+
# echo "is installed correctly and 'Rscript' is executable."
1808+
# echo "--------------------------------------------------------------------------"
1809+
# echo ""
1810+
# exit 1
1811+
# fi
18121812

18131813
# Output status
1814-
echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
1815-
echo "Running tools/get-deps.R script..."
1816-
1817-
# Execute the get-deps.R script
1818-
if ! "$RSCRIPT" ./tools/get-deps.R; then
1819-
echo "Error: Failed to execute tools/get-deps.R."
1820-
exit 1
1821-
fi
1814+
# echo "Rust is installed, Cargo is found, R_HOME is set, and Rscript is found."
1815+
# echo "Running tools/get-deps.R script..."
1816+
1817+
# # Execute the get-deps.R script
1818+
# if ! "$RSCRIPT" ./tools/get-deps.R; then
1819+
# echo "Error: Failed to execute tools/get-deps.R."
1820+
# exit 1
1821+
# fi
18221822

‎cran-comments.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
0 errors | 0 warnings | 1 note
44

5-
* C_clean and clean were not being called for Debian build resulting in NOTE for src/vendor/chrono/CITATION
6-
- This should be removed now via `rm -Rf $(VENDOR_DIR)` in the Makevars
7-
* The install size is < 2mb however the vendored dependencies are ~18mb making the source larger than the installation size.
5+
6+
* 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`
7+
8+
> "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."
9+
10+
*
11+
812
* This is a new release.

‎src/rust/vendor.tar.xz

3.86 KB
Binary file not shown.

‎tools/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎tools/generate-configures.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
autoreconf -i
4+
5+
cp configure configure.win
6+
7+
sed -i '' 's|RSCRIPT="\${R_HOME}/bin/Rscript"|RSCRIPT="\${R_HOME}/bin/${R_ARCH_BIN}/Rscript.exe"|g' configure.win

‎tools/get-deps.R

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎tools/vendor.R

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎tools/vendor.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)