diff --git a/.devel/sphinx/news.md b/.devel/sphinx/news.md
index 4ce82761..d0cd5d48 100644
--- a/.devel/sphinx/news.md
+++ b/.devel/sphinx/news.md
@@ -1,6 +1,16 @@
# Changelog
+## 1.8.2 (under development)
+
+* [BUILD TIME] [BUGFIX] #501: Fixed failing build on 32-bit Windows
+ (Windows API `ResolveLocaleName` function not available).
+
+* [BUILD TIME] [BUGFIX] #502: `PKG_CPPFLAGS` are now considered
+ before other `CPPFLAGS` (the same with other flag types) in
+ the `configure` script to make it compatible with what happens in `Makevars`.
+
+
## 1.8.1 (2023-11-09)
* [GENERAL] ICU bundle updated to version 74.1 (Unicode 15.1, CLDR 44).
diff --git a/.devel/sphinx/rapi/stri_datetime_add.md b/.devel/sphinx/rapi/stri_datetime_add.md
index 533ebd27..6c011e65 100644
--- a/.devel/sphinx/rapi/stri_datetime_add.md
+++ b/.devel/sphinx/rapi/stri_datetime_add.md
@@ -68,7 +68,7 @@ print(x)
```
```
-## [1] "2024-01-16 10:51:29 AEDT"
+## [1] "2024-01-21 14:33:02 AEDT"
```
```r
@@ -76,7 +76,7 @@ stri_datetime_add(x, -2, units='months')
```
```
-## [1] "2023-11-16 10:51:29 AEDT"
+## [1] "2023-11-21 14:33:02 AEDT"
```
```r
diff --git a/.devel/sphinx/rapi/stri_datetime_create.md b/.devel/sphinx/rapi/stri_datetime_create.md
index 7000c803..abd3a1ff 100644
--- a/.devel/sphinx/rapi/stri_datetime_create.md
+++ b/.devel/sphinx/rapi/stri_datetime_create.md
@@ -96,5 +96,5 @@ stri_datetime_create(hour=15, minute=59)
```
```
-## [1] "2023-11-16 15:59:00 AEDT"
+## [1] "2023-11-21 15:59:00 AEDT"
```
diff --git a/.devel/sphinx/rapi/stri_datetime_fields.md b/.devel/sphinx/rapi/stri_datetime_fields.md
index eacaae01..d2aeb894 100644
--- a/.devel/sphinx/rapi/stri_datetime_fields.md
+++ b/.devel/sphinx/rapi/stri_datetime_fields.md
@@ -77,9 +77,9 @@ stri_datetime_fields(stri_datetime_now())
```
## Year Month Day Hour Minute Second Millisecond WeekOfYear WeekOfMonth
-## 1 2023 11 16 10 51 30 7 47 3
+## 1 2023 11 21 14 33 3 213 48 4
## DayOfYear DayOfWeek Hour12 AmPm Era
-## 1 320 5 10 1 2
+## 1 325 3 2 2 2
```
```r
@@ -88,9 +88,9 @@ stri_datetime_fields(stri_datetime_now(), locale='@calendar=hebrew')
```
## Year Month Day Hour Minute Second Millisecond WeekOfYear WeekOfMonth
-## 1 5784 3 3 10 51 30 11 10 1
+## 1 5784 3 8 14 33 3 218 11 2
## DayOfYear DayOfWeek Hour12 AmPm Era
-## 1 62 5 10 1 1
+## 1 67 3 2 2 1
```
```r
diff --git a/.devel/sphinx/rapi/stri_datetime_format.md b/.devel/sphinx/rapi/stri_datetime_format.md
index c99d9e88..e4a0168d 100644
--- a/.devel/sphinx/rapi/stri_datetime_format.md
+++ b/.devel/sphinx/rapi/stri_datetime_format.md
@@ -221,5 +221,5 @@ stri_datetime_format(stri_datetime_now(), 'datetime_relative_medium')
```
```
-## [1] "today, 10:51:30 am"
+## [1] "today, 2:33:03 pm"
```
diff --git a/.devel/sphinx/rapi/stri_locale_set.md b/.devel/sphinx/rapi/stri_locale_set.md
index b63af0f4..fa9d8892 100644
--- a/.devel/sphinx/rapi/stri_locale_set.md
+++ b/.devel/sphinx/rapi/stri_locale_set.md
@@ -53,7 +53,7 @@ oldloc <- stri_locale_set('pt_BR')
```
```
-## You are now working with stringi_1.8.1 (pt_BR.UTF-8; ICU4C 74.1 [bundle]; Unicode 15.1)
+## You are now working with stringi_1.8.1.9001 (pt_BR.UTF-8; ICU4C 74.1 [bundle]; Unicode 15.1)
```
```r
@@ -65,7 +65,7 @@ stri_locale_set(oldloc) # restore the previous default locale
```
```
-## You are now working with stringi_1.8.1 (en_AU.UTF-8; ICU4C 74.1 [bundle]; Unicode 15.1)
+## You are now working with stringi_1.8.1.9001 (en_AU.UTF-8; ICU4C 74.1 [bundle]; Unicode 15.1)
```
```r
diff --git a/.devel/sphinx/rapi/stri_sprintf.md b/.devel/sphinx/rapi/stri_sprintf.md
index add3e69d..fc563465 100644
--- a/.devel/sphinx/rapi/stri_sprintf.md
+++ b/.devel/sphinx/rapi/stri_sprintf.md
@@ -188,7 +188,7 @@ stri_sprintf("UNIX time %1$f is %1$s.", Sys.time())
```
```
-## [1] "UNIX time 1700092299.497165 is 2023-11-16 10:51:39.497165."
+## [1] "UNIX time 1700537593.184348 is 2023-11-21 14:33:13.184348."
```
```r
@@ -213,7 +213,7 @@ stri_sprintf("%1$s is %1$f UNIX time.", Sys.time()) # re-coercion needed
```
```
-## [1] "2023-11-16 10:51:39.49887 is 1700092299.498870 UNIX time."
+## [1] "2023-11-21 14:33:13.18612 is 1700537593.186120 UNIX time."
```
```r
diff --git a/.github/workflows/r-check-other.yml b/.github/workflows/r-check-other.yml
index 6c046d6b..f6a320fb 100644
--- a/.github/workflows/r-check-other.yml
+++ b/.github/workflows/r-check-other.yml
@@ -21,6 +21,7 @@ jobs:
- {os: macOS-latest, r: 'oldrel-4'}
- {os: windows-latest, r: 'release'}
- {os: windows-latest, r: 'oldrel-4'}
+ - {os: windows-latest, r: 'oldrel-3'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'oldrel-4'}
@@ -29,6 +30,7 @@ jobs:
_R_CHECK_FORCE_SUGGESTS_: false
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+ R_KEEP_PKG_SOURCE: yes
steps:
- uses: actions/checkout@v4
@@ -48,12 +50,12 @@ jobs:
- name: Install
run: |
- install.packages("tinytest")
install.packages(".", repos=NULL, type="source")
shell: Rscript {0}
- name: Test
run: |
+ install.packages("tinytest")
source(".devel/tinytest.R")
shell: Rscript {0}
diff --git a/DESCRIPTION b/DESCRIPTION
index a959cd16..8187d947 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
Package: stringi
Version: 1.8.1.9001
-Date: 2023-11-18
+Date: 2023-11-21
Title: Fast and Portable Character String Processing Facilities
Description: A collection of character string/text/natural language
processing tools for pattern searching (e.g., with 'Java'-like regular
diff --git a/NEWS b/NEWS
index 73281bb4..d0cd5d48 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,8 @@
## 1.8.2 (under development)
-* ...TODO... [BUILD TIME] [BUGFIX] #501: Fixed failing build on 32-bit Windows.
+* [BUILD TIME] [BUGFIX] #501: Fixed failing build on 32-bit Windows
+ (Windows API `ResolveLocaleName` function not available).
* [BUILD TIME] [BUGFIX] #502: `PKG_CPPFLAGS` are now considered
before other `CPPFLAGS` (the same with other flag types) in
diff --git a/configure b/configure
index a11ddecb..f4110f87 100755
--- a/configure
+++ b/configure
@@ -655,6 +655,7 @@ ICUDT_DIR
ICU_FOUND
STRINGI_CXXSTD
STRINGI_OBJECTS
+DISABLE_RESOLVE_LOCALE_NAME
STRINGI_ICU_STUBDATA_SOURCES_CPP
STRINGI_ICU_I18N_SOURCES_CPP
STRINGI_ICU_COMMON_SOURCES_CPP
@@ -3700,7 +3701,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
check_flags_icu_bundle() {
# files are relative to src/ now, then we'll make it the current dir
- ICU_CPPFLAGS="-DU_STRINGI_PATCHES \
+ ICU_CPPFLAGS="\
-Isrc/icu${ICU_BUNDLE_VERSION} \
-Isrc/icu${ICU_BUNDLE_VERSION}/unicode \
-Isrc/icu${ICU_BUNDLE_VERSION}/common \
@@ -4068,6 +4069,9 @@ STRINGI_CPPFLAGS="-I. ${with_extra_cppflags} ${ICU_CPPFLAGS}"
STRINGI_LDFLAGS="${with_extra_ldflags} ${ICU_LDFLAGS}"
STRINGI_LIBS="${with_extra_libs} ${ICU_LIBS}"
+DISABLE_RESOLVE_LOCALE_NAME=1 # this does not apply on non-Windows platforms
+
+
#AC_SUBST(STRINGI_CFLAGS)
diff --git a/configure.ac b/configure.ac
index e04547c0..66251faf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+# kate: hl bash
# autoconf/configure script for stringi
# Copyright (c) 2013-2023, Marek Gagolewski
@@ -588,7 +589,7 @@ check_icu_with_pkg_config() {
check_flags_icu_bundle() {
# files are relative to src/ now, then we'll make it the current dir
- ICU_CPPFLAGS="-DU_STRINGI_PATCHES \
+ ICU_CPPFLAGS="\
-Isrc/icu${ICU_BUNDLE_VERSION} \
-Isrc/icu${ICU_BUNDLE_VERSION}/unicode \
-Isrc/icu${ICU_BUNDLE_VERSION}/common \
@@ -871,6 +872,9 @@ STRINGI_CPPFLAGS="-I. ${with_extra_cppflags} ${ICU_CPPFLAGS}"
STRINGI_LDFLAGS="${with_extra_ldflags} ${ICU_LDFLAGS}"
STRINGI_LIBS="${with_extra_libs} ${ICU_LIBS}"
+DISABLE_RESOLVE_LOCALE_NAME=1 # this does not apply on non-Windows platforms
+AC_SUBST(DISABLE_RESOLVE_LOCALE_NAME)
+
AC_SUBST(STRINGI_OBJECTS)
AC_SUBST(STRINGI_CXXSTD)
#AC_SUBST(STRINGI_CFLAGS)
diff --git a/configure.win b/configure.win
index 16753f58..caac23a9 100644
--- a/configure.win
+++ b/configure.win
@@ -1,29 +1,49 @@
# Copyright (c) 2013-2023, Marek Gagolewski
-# this is an architecture-independent configure.win file
+# This is an architecture-independent configure.win file
+
+ICU_FOUND=0 # use our ICU bundle
+
+ICUDT_DIR="icu74/data"
+ICU_BUNDLE_VERSION=74
+
+# some systems do not have ResolveLocaleName - this applies to mingw
+# on 32-bit windows shipped with older Rtools (R < 4.2)
+DISABLE_RESOLVE_LOCALE_NAME=`"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e '
+ cat(as.integer(getRversion() < "4.2"))
+'`
+
+
+echo "ICU_FOUND=${ICU_FOUND}"
+echo "ICU_BUNDLE_VERSION=${ICU_BUNDLE_VERSION}"
+echo "ICUDT_DIR=${ICUDT_DIR}"
+echo "DISABLE_RESOLVE_LOCALE_NAME=${DISABLE_RESOLVE_LOCALE_NAME}"
+
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e '
fin <- "src/uconfig_local.h.in";
fout <- "src/uconfig_local.h";
f <- readLines(fin);
- f <- gsub("@ICU_FOUND@", 0, f, fixed = TRUE);
- f <- gsub("@ICUDT_DIR@", "icu74/data", f, fixed = TRUE);
- f <- gsub("@ICU_BUNDLE_VERSION@", "74", f, fixed = TRUE);
+ f <- gsub("@ICU_FOUND@", '"${ICU_FOUND}"', f, fixed = TRUE);
+ f <- gsub("@DISABLE_RESOLVE_LOCALE_NAME@", '"${DISABLE_RESOLVE_LOCALE_NAME}"', f, fixed = TRUE);
+ f <- gsub("@ICUDT_DIR@", "'"${ICUDT_DIR}"'", f, fixed = TRUE);
+ f <- gsub("@ICU_BUNDLE_VERSION@", "'"${ICU_BUNDLE_VERSION}"'", f, fixed = TRUE);
f <- gsub("@ICUDT_ENDIANNESS@", .Platform$endian, f, fixed = TRUE);
con <- file(fout, "wb") # LF line ending
writeLines(f, con);
close(con)
-' `
+'
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e '
fin <- "src/install.libs.R.in";
fout <- "src/install.libs.R";
f <- readLines(fin);
- f <- gsub("@ICU_FOUND@", 0, f, fixed = TRUE);
- f <- gsub("@ICUDT_DIR@", "icu74/data", f, fixed = TRUE);
- f <- gsub("@ICU_BUNDLE_VERSION@", "74", f, fixed = TRUE);
+ f <- gsub("@ICU_FOUND@", '"${ICU_FOUND}"', f, fixed = TRUE);
+ f <- gsub("@DISABLE_RESOLVE_LOCALE_NAME@", '"${DISABLE_RESOLVE_LOCALE_NAME}"', f, fixed = TRUE);
+ f <- gsub("@ICUDT_DIR@", "'"${ICUDT_DIR}"'", f, fixed = TRUE);
+ f <- gsub("@ICU_BUNDLE_VERSION@", "'"${ICU_BUNDLE_VERSION}"'", f, fixed = TRUE);
f <- gsub("@ICUDT_ENDIANNESS@", .Platform$endian, f, fixed = TRUE);
con <- file(fout, "wb") # LF line ending
writeLines(f, con);
close(con)
-' `
+'
diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js
index a2422f1e..2c91cae2 100644
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,5 +1,5 @@
const DOCUMENTATION_OPTIONS = {
- VERSION: '1.8.1',
+ VERSION: '1.8.1.9001',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
diff --git a/docs/genindex.html b/docs/genindex.html
index 8b671f30..0601279d 100644
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -158,7 +158,7 @@
stringi
-1.8.1
+1.8.1.9001