Changeset: d579984a7143 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d579984a7143
Modified Files:
README.rst
documentation/source/build-debian.rst
documentation/source/build-fedora.rst
documentation/source/build.rst
testing/test_docker.sh
tools/mserver/monet_version.c.in
Branch: Mar2025
Log Message:
We're using PCRE2 now.
diffs (105 lines):
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -100,7 +100,7 @@ On Fedora, the following packages are re
``bison``, ``cmake``, ``gcc``, ``pkgconf``, ``python3``.
The following packages are optional but recommended:
-``bzip2-devel``, ``lz4-devel``, ``openssl-devel``, ``pcre-devel``,
+``bzip2-devel``, ``lz4-devel``, ``openssl-devel``, ``pcre2-devel``,
``readline-devel``, ``xz-devel``, ``zlib-devel``.
The following packages are optional:
@@ -113,7 +113,7 @@ On Ubuntu and Debian the following packa
``bison``, ``cmake``, ``gcc``, ``pkg-config``, ``python3``.
The following packages are optional but recommended:
-``libbz2-dev``, ``liblz4-dev``, ``libpcre3-dev``, ``libreadline-dev``,
+``libbz2-dev``, ``liblz4-dev``, ``libpcre2-dev``, ``libreadline-dev``,
``liblzma-dev``, ``libssl-dev``, ``zlib1g-dev``.
The following packages are optional:
diff --git a/documentation/source/build-debian.rst
b/documentation/source/build-debian.rst
--- a/documentation/source/build-debian.rst
+++ b/documentation/source/build-debian.rst
@@ -30,7 +30,7 @@ libbz2-dev # optional: read and write .
libcurl4-gnutls-dev # optional: read remote files with sys.getcontent(url)
libgeos-dev # optional: required for geom module
liblzma-dev # optional: read and write .xz compressed files
-libpcre3-dev # optional: use PCRE library, enable some functions
+libpcre2-dev # optional: use PCRE2 library, enable some functions
libreadline-dev # optional, enable editing in mclient
python3-dev # optional, needed for Python 3 integration
python3-numpy # optional, needed for Python 3 integration
diff --git a/documentation/source/build-fedora.rst
b/documentation/source/build-fedora.rst
--- a/documentation/source/build-fedora.rst
+++ b/documentation/source/build-fedora.rst
@@ -30,7 +30,7 @@ the command make rpm.
| checkpolicy # optional, required to create RPMs (make rpm)
| geos-devel # optional: required for geom module
| libcurl-devel # optional: read remote files with
sys.getcontent(url)
-| pcre-devel # optional: use PCRE library, enable some functions
+| pcre2-devel # optional: use PCRE2 library, enable some functions
| python3-devel # optional, needed for Python 3 integration
| python3-numpy # optional, needed for Python 3 integration
| R-core-devel # optional, needed for R integration
diff --git a/documentation/source/build.rst b/documentation/source/build.rst
--- a/documentation/source/build.rst
+++ b/documentation/source/build.rst
@@ -114,7 +114,7 @@ Start cmd.exe in "Run as administrator"
vcpkg integrate install
# needed for 64 bits (with the available python being 64 bit this is needed)
set VCPKG_DEFAULT_TRIPLET=x64-windows
- vcpkg install libiconv bzip2 geos libxml2 pcre pcre2 zlib getopt openssl
+ vcpkg install libiconv bzip2 geos libxml2 pcre2 zlib getopt openssl
To compile MonetDB (as normal user)::
@@ -143,7 +143,7 @@ Using homebrew install at least current
mercurial
cmake
pkg-config
- pcre
+ pcre2
bison
optional::
diff --git a/testing/test_docker.sh b/testing/test_docker.sh
--- a/testing/test_docker.sh
+++ b/testing/test_docker.sh
@@ -1,16 +1,16 @@
TEST="python3 -m venv /monetdb/build/venv && .
/monetdb/build/venv/bin/activate && pip install --upgrade pip && pip install
pymonetdb && cmake -Bbuild -S . -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=/monetdb/build/install -DASSERT=OFF -DSTRICT=ON && cmake
--build build && cmake --install build && cmake --build build --target test &&
PATH=/monetdb/build/install/bin:$PATH /monetdb/build/install/bin/Mtest.py"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb alpine:latest
<<<"apk add --no-cache bison cmake pkgconf python3 openssl-dev bzip2-dev
libbz2 lz4-dev lz4-libs pcre-dev readline-dev xz-dev xz-libs zlib-dev
build-base gcc py3-pip py3-cryptography && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb alpine:latest
<<<"apk add --no-cache bison cmake pkgconf python3 openssl-dev bzip2-dev
libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev xz-libs zlib-dev
build-base gcc py3-pip py3-cryptography && $TEST"
rm -rf build/*
-podman run -i --platform linux/arm64 --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography && $TEST"
+podman run -i --platform linux/arm64 --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography && $TEST"
rm -rf build/*
-podman run -i --platform linux/s390x --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography && $TEST"
+podman run -i --platform linux/s390x --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography && $TEST"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb amazonlinux:2
<<<"yum -y install bison cmake3 python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography make && ${TEST//cmake/cmake3}"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb amazonlinux:2
<<<"yum -y install bison cmake3 python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre2-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography make && ${TEST//cmake/cmake3}"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb
amazonlinux:latest <<<"dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre-devel readline-devel xz-devel
xz-libs zlib-devel gcc pip python3-cryptography && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb
amazonlinux:latest <<<"dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre2-devel readline-devel xz-devel
xz-libs zlib-devel gcc pip python3-cryptography && $TEST"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb centos
<<<"sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i
's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g'
/etc/yum.repos.d/CentOS-* && dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre-devel readline-devel xz-devel
xz-libs zlib-devel gcc python3-pip python3-cryptography libarchive && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb centos
<<<"sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i
's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g'
/etc/yum.repos.d/CentOS-* && dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre2-devel readline-devel xz-devel
xz-libs zlib-devel gcc python3-pip python3-cryptography libarchive && $TEST"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb fedora
<<<"dnf -y install bison cmake python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb fedora
<<<"dnf -y install bison cmake python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre2-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography && $TEST"
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -85,7 +85,7 @@ monet_version(void)
* preprocessor */
char pcre_version[32];
pcre2_config(PCRE2_CONFIG_VERSION, pcre_version);
- print_libversion("libpcre",
+ print_libversion("libpcre2",
pcre_version,
XSTRING(Z PCRE2_PRERELEASE)[1] == 0
? XSTRING(PCRE2_MAJOR.PCRE2_MINOR PCRE2_DATE)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
