cleanup configure

Author: shikokuchuo

.gitignore

@@ -8,4 +8,4 @@ nanonext.Rcheck/00_pkg_src/nanonext/
 nanonext.Rcheck/
 *.gz
 docs
-temp
+install

R/ncurl.R

@@ -62,9 +62,11 @@
 #'
 #'     In non-interactive sessions: redirects are never followed.
 #'
-#'     Override these default behaviours by specifying TRUE or FALSE for the
+#'     The above defaults can be overridden by specifying TRUE or FALSE for the
 #'     argument 'follow'.
 #'
+#'     If not followed, the redirect address is returned as a character string.
+#'
 #'     For async requests, the redirect address will be returned as a character
 #'     string at \code{$raw} and \code{$data} will be NULL.
 #'

cleanup

@@ -1,2 +1,2 @@
 #!/bin/sh
-rm -rf src/Makevars temp
+rm -rf src/Makevars install

cleanup.ucrt

@@ -1 +1 @@
-rm -rf temp
+rm -rf install

configure

@@ -67,7 +67,7 @@ else
   echo "Compiling 'libmbedtls' from source..."
   cmake -DCMAKE_POSITION_INDEPENDENT_CODE=1 -DCMAKE_BUILD_TYPE=Release \
     -DENABLE_TESTING=0 -DENABLE_PROGRAMS=0 \
-    -DCMAKE_INSTALL_PREFIX=../temp -DCMAKE_INSTALL_MESSAGE=NEVER .
+    -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_MESSAGE=NEVER .
   cmake --build .
   cmake --install .
   cd ..
@@ -77,20 +77,20 @@ else
   echo "Compiling 'libnng' from source..."
   cmake -DCMAKE_POSITION_INDEPENDENT_CODE=1 -DNNG_ENABLE_TLS=1 \
     -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 \
-    -DCMAKE_INSTALL_PREFIX=../temp -DCMAKE_INSTALL_MESSAGE=NEVER .
+    -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_MESSAGE=NEVER .
   cmake --build .
   cmake --install .
   cd ..
   rm -rf nanomsg-nng-$LIB_VER
 
-  PKG_CFLAGS="-I`pwd`/temp/include $PKG_CFLAGS"
-  if [ -d "temp/lib64" ]
+  PKG_CFLAGS="-I`pwd`/install/include $PKG_CFLAGS"
+  if [ -d "install/lib64" ]
   then
     PKG_LIBS="-L`pwd`/temp/lib64 $PKG_LIBS"
   fi
-  if [ -d "temp/lib" ]
+  if [ -d "install/lib" ]
   then
-    PKG_LIBS="-L`pwd`/temp/lib $PKG_LIBS"
+    PKG_LIBS="-L`pwd`/install/lib $PKG_LIBS"
   fi
 fi
 

configure.ucrt

@@ -25,7 +25,7 @@ echo "Compiling 'libmbedtls' from source..."
 cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -w" \
   -DCMAKE_POSITION_INDEPENDENT_CODE=1 -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_TESTING=0 -DENABLE_PROGRAMS=0 -DMBEDTLS_FATAL_WARNINGS=0 \
-  -DCMAKE_INSTALL_PREFIX=../temp -DCMAKE_INSTALL_MESSAGE=NEVER .
+  -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_MESSAGE=NEVER .
 cmake --build .
 cmake --install .
 cd ..
@@ -36,7 +36,7 @@ echo "Compiling 'libnng' from source..."
 cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -w" \
   -DCMAKE_POSITION_INDEPENDENT_CODE=1 -DNNG_ELIDE_DEPRECATED=1 \
   -DNNG_ENABLE_TLS=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 \
-  -DCMAKE_INSTALL_PREFIX=../temp -DCMAKE_INSTALL_MESSAGE=NEVER .
+  -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_MESSAGE=NEVER .
 cmake --build .
 cmake --install .
 cd ..

man/ncurl.Rd

@@ -1,2 +1,2 @@
-PKG_CFLAGS=-I../temp/include -DNNG_STATIC_LIB $(C_VISIBILITY)
-PKG_LIBS=-L../temp/lib -lnng -lmbedtls -lmbedx509 -lmbedcrypto -lws2_32
+PKG_CFLAGS=-I../install/include -DNNG_STATIC_LIB $(C_VISIBILITY)
+PKG_LIBS=-L../install/lib -lnng -lmbedtls -lmbedx509 -lmbedcrypto -lws2_32

src/Makevars.ucrt

@@ -120,10 +120,10 @@ SEXP rnng_sha224(SEXP x, SEXP key, SEXP convert) {
 
   if (key == R_NilValue) {
 
-#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR == 2
-    xc = mbedtls_sha256_ret(xhash.buf, xhash.sz, output, 1);
-#else
+#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 3
     xc = mbedtls_sha256(xhash.buf, xhash.sz, output, 1);
+#else
+    xc = mbedtls_sha256_ret(xhash.buf, xhash.sz, output, 1);
 #endif
   } else {
 
@@ -165,10 +165,10 @@ SEXP rnng_sha256(SEXP x, SEXP key, SEXP convert) {
 
   if (key == R_NilValue) {
 
-#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR == 2
-    xc = mbedtls_sha256_ret(xhash.buf, xhash.sz, output, 0);
-#else
+#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 3
     xc = mbedtls_sha256(xhash.buf, xhash.sz, output, 0);
+#else
+    xc = mbedtls_sha256_ret(xhash.buf, xhash.sz, output, 0);
 #endif
 
   } else {
@@ -211,10 +211,10 @@ SEXP rnng_sha384(SEXP x, SEXP key, SEXP convert) {
 
   if (key == R_NilValue) {
 
-#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR == 2
-    xc = mbedtls_sha512_ret(xhash.buf, xhash.sz, output, 1);
-#else
+#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 3
     xc = mbedtls_sha512(xhash.buf, xhash.sz, output, 1);
+#else
+    xc = mbedtls_sha512_ret(xhash.buf, xhash.sz, output, 1);
 #endif
 
   } else {
@@ -257,10 +257,10 @@ SEXP rnng_sha512(SEXP x, SEXP key, SEXP convert) {
 
   if (key == R_NilValue) {
 
-#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR == 2
-    xc = mbedtls_sha512_ret(xhash.buf, xhash.sz, output, 0);
-#else
+#if defined(MBEDTLS_VERSION_MAJOR) && MBEDTLS_VERSION_MAJOR >= 3
     xc = mbedtls_sha512(xhash.buf, xhash.sz, output, 0);
+#else
+    xc = mbedtls_sha512_ret(xhash.buf, xhash.sz, output, 0);
 #endif
 
   } else {