update restinio to 0.7.2
Change-Id: Ifadbbc86f3cd4bd7ec8eb17295fc74bcfda27eda
diff --git a/.gitmodules b/.gitmodules
index 1586f9b..a0a5a5a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
url = https://github.com/savoirfairelinux/opendht
[submodule "dependencies/restinio"]
path = dependencies/restinio
- url = https://github.com/aberaud/restinio
+ url = https://github.com/Stiffstream/restinio
[submodule "dependencies/msgpack"]
path = dependencies/msgpack
url = https://github.com/msgpack/msgpack-c
diff --git a/Dockerfile b/Dockerfile
index 939da81..a36ded1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@
cython3 python3-dev python3-setuptools python3-build python3-virtualenv \
libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev libunistring-dev \
- libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev libyaml-cpp-dev \
+ libssl-dev libfmt-dev libasio-dev libmsgpack-dev libyaml-cpp-dev \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
COPY . dhtnet
diff --git a/dependencies/build.py b/dependencies/build.py
index 6321e2f..b8ddb6f 100755
--- a/dependencies/build.py
+++ b/dependencies/build.py
@@ -38,14 +38,14 @@
cmake_command = [
"cmake",
f"-DCMAKE_INSTALL_PREFIX={install_dir}",
- "-DRESTINIO_TEST=OFF",
- "-DRESTINIO_SAMPLE=OFF",
- "-DRESTINIO_INSTALL_SAMPLES=OFF",
- "-DRESTINIO_BENCH=OFF",
- "-DRESTINIO_INSTALL_BENCHES=OFF",
- "-DRESTINIO_FIND_DEPS=ON",
- "-DRESTINIO_ALLOW_SOBJECTIZER=Off",
- "-DRESTINIO_USE_BOOST_ASIO=none",
+ "-DRESTINIO_TEST=Off",
+ "-DRESTINIO_SAMPLE=Off",
+ "-DRESTINIO_BENCHMARK=Off",
+ "-DRESTINIO_WITH_SOBJECTIZER=Off",
+ "-DRESTINIO_DEP_STANDALONE_ASIO=system",
+ "-DRESTINIO_DEP_LLHTTP=system",
+ "-DRESTINIO_DEP_FMT=system",
+ "-DRESTINIO_DEP_EXPECTED_LITE=system",
".."
]
os.makedirs(restino_build_dir, exist_ok=True)
@@ -143,6 +143,11 @@
print("Error building or installing msgpack:", e)
return False
+def download_and_install_expected_lite():
+ print("\nDownloading and installing expected-lite...", flush=True)
+ os.makedirs(f"{install_dir}/include/nonstd", exist_ok=True)
+ subprocess.run([f"wget https://raw.githubusercontent.com/martinmoene/expected-lite/master/include/nonstd/expected.hpp -O {install_dir}/include/nonstd/expected.hpp"], shell=True, check=True)
+
def main():
# Parse arguments
parser = argparse.ArgumentParser(description="DHTNet dependencies build script")
@@ -152,6 +157,10 @@
# Create install directory if it doesn't exist
if not os.path.exists(install_dir):
os.makedirs(install_dir)
+
+ # Download and install expected-lite
+ download_and_install_expected_lite()
+
# Build and install restinio
if not build_and_install_restinio():
print("Error building or installing restinio.")
diff --git a/dependencies/restinio b/dependencies/restinio
index 6fd08b6..e0ef055 160000
--- a/dependencies/restinio
+++ b/dependencies/restinio
@@ -1 +1 @@
-Subproject commit 6fd08b65f6f15899dd0de3c801f6a5462b811c64
+Subproject commit e0ef055a26d3011e60b3dc075149b24b7defed7d