-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
prepare for release
1 parent
444f80e
commit 261b184
Showing
20 changed files
with
5,148 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,8 @@ | |
^dev$ | ||
^README\.Rmd$ | ||
^README\.md$ | ||
^.Rprofile$ | ||
^.Rprofile$ | ||
^.github/$ | ||
^src/vendor/$ | ||
^src/rust/vendor$ | ||
.github |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
config.log | ||
config.status | ||
autom4te.cache | ||
.Rproj.user | ||
.Rprofile | ||
.Rprofile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,33 @@ | ||
Package: arcgisplaces | ||
Title: What the Package Does (One Line, Title Case) | ||
Title: Search for POIs using ArcGIS 'Places Service' | ||
Version: 0.0.0.9003 | ||
Authors@R: | ||
person("Josiah", "Parry", , "[email protected]", role = c("aut", "cre"), | ||
comment = c(ORCID = "0000-0001-9910-865X")) | ||
Description: What the package does (one paragraph). | ||
Description: The ArcGIS 'Places service' is a ready-to-use location | ||
service that can search for businesses and geographic locations around | ||
the world. It allows you to find, locate, and discover detailed | ||
information about each place. Query for places near a point, within a | ||
bounding box, filter based on categories, or provide search text. | ||
'arcgisplaces' integrates with 'sf' for out of the box compatibility | ||
with other spatial libraries. | ||
License: Apache License (>= 2) | ||
Encoding: UTF-8 | ||
Language: en | ||
Roxygen: list(markdown = TRUE) | ||
RoxygenNote: 7.3.1 | ||
Imports: | ||
arcgisutils (>= 0.2.0.9001), | ||
arcgisutils (>= 0.3.0), | ||
cli, | ||
httr2 (>= 1.0.0), | ||
rlang, | ||
wk | ||
Config/rextendr/version: 0.3.1.9000 | ||
SystemRequirements: Cargo (Rust's package manager), rustc | ||
SystemRequirements: Cargo (Rust's package manager), rustc, OpenSSL | ||
Suggests: | ||
sf | ||
Depends: | ||
R (>= 2.10) | ||
LazyData: true | ||
Remotes: r-arcgis/arcgisutils | ||
Remotes: | ||
r-arcgis/arcgisutils |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
AC_INIT | ||
|
||
# Export PATH to include Cargo binary directory | ||
export PATH="$PATH:$HOME/.cargo/bin" | ||
|
||
# Check for Rustc | ||
AC_CHECK_PROGS([RUSTC], [rustc], [no]) | ||
if test "$RUSTC" = "no"; then | ||
echo "----------------------- [RUST NOT FOUND]---------------------------" | ||
echo "The 'rustc' compiler was not found on the PATH. Please install Rust" | ||
echo "from: https://www.rust-lang.org/tools/install" | ||
echo "" | ||
echo "Alternatively, you may install Rust from your OS package manager:" | ||
echo " - Debian/Ubuntu: apt-get install rustc" | ||
echo " - Fedora/CentOS: dnf install rustc" | ||
echo " - macOS: brew install rustc" | ||
echo "-------------------------------------------------------------------" | ||
echo "" | ||
exit 1 | ||
fi | ||
|
||
# Check if Cargo is installed | ||
if ! command -v cargo &> /dev/null; then | ||
echo "----------------------- [CARGO NOT FOUND]--------------------------" | ||
echo "The 'cargo' command was not found on the PATH. Please install Cargo" | ||
echo "from: https://www.rust-lang.org/tools/install" | ||
echo "" | ||
echo "Alternatively, you may install Cargo from your OS package manager:" | ||
echo " - Debian/Ubuntu: apt-get install cargo" | ||
echo " - Fedora/CentOS: dnf install cargo" | ||
echo " - macOS: brew install rustc" | ||
echo "-------------------------------------------------------------------" | ||
echo "" | ||
exit 1 | ||
fi | ||
|
||
AC_OUTPUT |
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,34 @@ | ||
TARGET_DIR = ./rust/target | ||
LIBDIR = $(TARGET_DIR)/release | ||
STATLIB = $(LIBDIR)/libarcgisplaces.a | ||
PKG_LIBS = -L$(LIBDIR) -larcgisplaces -lssl | ||
PKG_LIBS = -L$(LIBDIR) -larcgisplaces -lssl -lcrypto | ||
CRAN_FLAGS=-j 2 --offline | ||
|
||
all: C_clean | ||
|
||
$(SHLIB): $(STATLIB) | ||
|
||
CARGOTMP = $(CURDIR)/.cargo | ||
VENDOR_DIR = $(CURDIR)/vendor | ||
|
||
$(STATLIB): | ||
# In some environments, ~/.cargo/bin might not be included in PATH, so we need | ||
# to set it here to ensure cargo can be invoked. It is appended to PATH and | ||
# therefore is only used if cargo is absent from the user's PATH. | ||
if [ "$(NOT_CRAN)" != "true" ]; then \ | ||
if [ -f ./rust/vendor.tar.xz ]; then \ | ||
tar xf ./rust/vendor.tar.xz && \ | ||
mkdir -p $(CARGOTMP) && \ | ||
cp ./rust/vendor-config.toml $(CARGOTMP)/config.toml; \ | ||
fi; \ | ||
export CARGO_HOME=$(CARGOTMP); \ | ||
fi && \ | ||
export PATH="$(PATH):$(HOME)/.cargo/bin" && \ | ||
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; \ | ||
cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); \ | ||
rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ | ||
else \ | ||
export PATH="$(PATH):$(HOME)/.cargo/bin" && \ | ||
cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); \ | ||
fi | ||
|
||
C_clean: | ||
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) | ||
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) | ||
|
||
clean: | ||
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) rust/target | ||
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[source.crates-io] | ||
replace-with = "vendored-sources" | ||
|
||
[source."git+https://github.com/extendr/extendr"] | ||
git = "https://github.com/extendr/extendr" | ||
replace-with = "vendored-sources" | ||
|
||
[source.vendored-sources] | ||
directory = "vendor" |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |