This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/pom-cleanup
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/feature/pom-cleanup by this
push:
new cc8cd6ac8a1 build: Updated the boost and cmake related parts to the
latest version.
cc8cd6ac8a1 is described below
commit cc8cd6ac8a13477e25cf164315fa5c9b8720cfe1
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu Jul 27 22:42:43 2023 +0200
build: Updated the boost and cmake related parts to the latest version.
---
example/client-cpp-example/pom.xml | 8 +++----
iotdb-client/client-cpp/pom.xml | 18 ++++++++--------
iotdb-client/compile-tools/pom.xml | 43 +++++++++++++++++++++++++++++++-------
3 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/example/client-cpp-example/pom.xml
b/example/client-cpp-example/pom.xml
index 9b06b50ad28..e2691d5c711 100644
--- a/example/client-cpp-example/pom.xml
+++ b/example/client-cpp-example/pom.xml
@@ -29,7 +29,7 @@
<artifactId>client-cpp-example</artifactId>
<name>IoTDB: Example: CPP Client</name>
<properties>
- <cmake-version>3.17.3</cmake-version>
+ <cmake-version>3.27.1</cmake-version>
<cmake.build.type>Release</cmake.build.type>
</properties>
<dependencies>
@@ -50,7 +50,7 @@
</activation>
<properties>
<cmake.generator>Unix Makefiles</cmake.generator>
-
<cmake.root.dir>${project.parent.basedir}/../iotdb-client/compile-tools/thrift/target/cmake-${cmake-version}-Linux-x86_64/</cmake.root.dir>
+
<cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-${cmake-version}-Linux-x86_64/</cmake.root.dir>
</properties>
</profile>
<profile>
@@ -65,7 +65,7 @@
<os.suffix>linux</os.suffix>
<os.classifier>linux-arm_32</os.classifier>
<cmake.generator>Unix Makefiles</cmake.generator>
-
<cmake.root.dir>${project.parent.basedir}/../iotdb-client/compile-tools/thrift/target/cmake-3.21.2-linux-aarch64/</cmake.root.dir>
+
<cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-3.21.2-linux-aarch64/</cmake.root.dir>
</properties>
</profile>
<profile>
@@ -77,7 +77,7 @@
</activation>
<properties>
<cmake.generator>Unix Makefiles</cmake.generator>
-
<cmake.root.dir>${project.parent.basedir}/../iotdb-client/compile-tools/thrift/target/cmake-${cmake-version}-Darwin-x86_64/CMake.app/Contents</cmake.root.dir>
+
<cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-${cmake-version}-macos-universal/CMake.app/Contents</cmake.root.dir>
<boost.include.dir>/usr/local/include</boost.include.dir>
</properties>
</profile>
diff --git a/iotdb-client/client-cpp/pom.xml b/iotdb-client/client-cpp/pom.xml
index 5c9e45caeca..369bd955d30 100644
--- a/iotdb-client/client-cpp/pom.xml
+++ b/iotdb-client/client-cpp/pom.xml
@@ -31,10 +31,10 @@
<name>IoTDB: Client: Client for CPP</name>
<description>C++ client</description>
<properties>
- <boost.version>1.72.0</boost.version>
- <boost.version.underline-short>1_72</boost.version.underline-short>
+ <boost.version>1.82.0</boost.version>
+ <boost.version.underline-short>1_82</boost.version.underline-short>
<boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
- <cmake-version>3.17.3</cmake-version>
+ <cmake-version>3.27.1</cmake-version>
<!-- Default value of cmake root -->
<cmake.root.dir>${project.build.directory}/dependency/cmake/</cmake.root.dir>
<cmake.build.type>Release</cmake.build.type>
@@ -67,8 +67,8 @@
<os.suffix>linux</os.suffix>
<!-- use Makefile as default cmake generator, users may
specify other generators -->
<cmake.generator>Unix Makefiles</cmake.generator>
-
<cmake.root.dir>${project.parent.basedir}/iotdb-client/compile-tools/thrift/target/cmake-${cmake-version}-Linux-x86_64/</cmake.root.dir>
-
<thrift.exec.absolute.path>${project.parent.basedir}/iotdb-client/compile-tools/thrift/target/build/compiler/cpp/bin/thrift</thrift.exec.absolute.path>
+
<cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-${cmake-version}-Linux-x86_64/</cmake.root.dir>
+
<thrift.exec.absolute.path>${project.parent.basedir}/compile-tools/thrift/target/build/compiler/cpp/bin/thrift</thrift.exec.absolute.path>
<iotdb.start.script>start-standalone.sh</iotdb.start.script>
<iotdb.stop.script>stop-standalone.sh</iotdb.stop.script>
</properties>
@@ -103,8 +103,8 @@
<os.suffix>mac</os.suffix>
<!-- use Makefile as default cmake generator, users may
specify other generators -->
<cmake.generator>Unix Makefiles</cmake.generator>
-
<cmake.root.dir>${project.parent.basedir}/iotdb-client/compile-tools/thrift/target/cmake-${cmake-version}-Darwin-x86_64/CMake.app/Contents</cmake.root.dir>
-
<thrift.exec.absolute.path>${project.parent.basedir}/iotdb-client/compile-tools/thrift/target/build/compiler/cpp/bin/thrift</thrift.exec.absolute.path>
+
<cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-${cmake-version}-macos-universal/CMake.app/Contents</cmake.root.dir>
+
<thrift.exec.absolute.path>${project.parent.basedir}/compile-tools/thrift/target/build/compiler/cpp/bin/thrift</thrift.exec.absolute.path>
<iotdb.start.script>start-standalone.sh</iotdb.start.script>
<iotdb.stop.script>stop-standalone.sh</iotdb.stop.script>
</properties>
@@ -120,8 +120,8 @@
<os.suffix>win</os.suffix>
<!-- use MSVC 2019 as default cmake generator, users may
specify other generators -->
<cmake.generator>Visual Studio 16 2019</cmake.generator>
-
<cmake.root.dir>${project.parent.basedir}/iotdb-client/compile-tools/thrift/target/cmake-${cmake-version}-win64-x64/</cmake.root.dir>
-
<thrift.exec.absolute.path>${project.parent.basedir}/iotdb-client/compile-tools/thrift/target/build/compiler/cpp/bin/${cmake.build.type}/thrift.exe</thrift.exec.absolute.path>
+
<cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-${cmake-version}-win64-x64/</cmake.root.dir>
+
<thrift.exec.absolute.path>${project.parent.basedir}/compile-tools/thrift/target/build/compiler/cpp/bin/${cmake.build.type}/thrift.exe</thrift.exec.absolute.path>
<iotdb.start.script>start-standalone.bat</iotdb.start.script>
<iotdb.stop.script>stop-standalone.bat</iotdb.stop.script>
<boost.include.dir/>
diff --git a/iotdb-client/compile-tools/pom.xml
b/iotdb-client/compile-tools/pom.xml
index 3c1d8b01abd..5a0c998c064 100644
--- a/iotdb-client/compile-tools/pom.xml
+++ b/iotdb-client/compile-tools/pom.xml
@@ -28,10 +28,10 @@
<packaging>pom</packaging>
<name>IoTDB: Client: Compile Tools</name>
<properties>
- <boost.version>1.72.0</boost.version>
- <boost.version.underline-short>1_72</boost.version.underline-short>
+ <boost.version>1.82.0</boost.version>
+ <boost.version.underline-short>1_82</boost.version.underline-short>
<boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
- <cmake-version>3.17.3</cmake-version>
+ <cmake-version>3.27.1</cmake-version>
<openssl.include.dir>-Dtrue1=true1</openssl.include.dir>
<bison.executable.dir>-Dtrue1=true1</bison.executable.dir>
<cmake.build.type/>
@@ -50,7 +50,7 @@
<properties>
<os.suffix>linux</os.suffix>
<os.classifier>linux-x86_64</os.classifier>
-
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Linux-x86_64.tar.gz</cmake.url>
+
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-linux-x86_64.tar.gz</cmake.url>
<cmake.root.dir>${project.build.directory}/cmake-${cmake-version}-Linux-x86_64/</cmake.root.dir>
<cmake.generator>Unix Makefiles</cmake.generator>
<boost.url>https://boostorg.jfrog.io/artifactory/main/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
@@ -74,7 +74,7 @@
<properties>
<os.suffix>linux</os.suffix>
<os.classifier>linux-arm_32</os.classifier>
-
<cmake.url>https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-linux-aarch64.tar.gz</cmake.url>
+
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-linux-aarch64.tar.gz</cmake.url>
<cmake.root.dir>${project.build.directory}/cmake-3.21.2-linux-aarch64/</cmake.root.dir>
<cmake.generator>Unix Makefiles</cmake.generator>
<boost.url>https://boostorg.jfrog.io/artifactory/main/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
@@ -97,8 +97,8 @@
<properties>
<os.suffix>mac</os.suffix>
<os.classifier>mac-x86_64</os.classifier>
-
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Darwin-x86_64.tar.gz</cmake.url>
-
<cmake.root.dir>${project.build.directory}/cmake-${cmake-version}-Darwin-x86_64/CMake.app/Contents</cmake.root.dir>
+
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-macos-universal.tar.gz</cmake.url>
+
<cmake.root.dir>${project.build.directory}/cmake-${cmake-version}-macos-universal/CMake.app/Contents</cmake.root.dir>
<cmake.generator>Unix Makefiles</cmake.generator>
<boost.url>https://boostorg.jfrog.io/artifactory/main/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
<boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
@@ -110,7 +110,34 @@
<gradlew.executable>./gradlew</gradlew.executable>
<openssl.include.default.path>/usr/local/opt/openssl/include</openssl.include.default.path>
<openssl.include.dir>-DCMAKE_CXX_FLAGS="-I${openssl.include.default.path}"</openssl.include.dir>
-
<bison.executable.dir>-DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison</bison.executable.dir>
+
<bison.executable.dir>-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison</bison.executable.dir>
+ </properties>
+ </profile>
+ <profile>
+ <id>os-mac-arm</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ <arch>aarch64</arch>
+ </os>
+ </activation>
+ <properties>
+ <os.suffix>mac</os.suffix>
+ <os.classifier>mac-x86_64</os.classifier>
+
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-macos-universal.tar.gz</cmake.url>
+
<cmake.root.dir>${project.build.directory}/cmake-${cmake-version}-macos-universal/CMake.app/Contents</cmake.root.dir>
+ <cmake.generator>Unix Makefiles</cmake.generator>
+
<boost.url>https://boostorg.jfrog.io/artifactory/main/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
+
<boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
+ <boost.build.executable>./b2</boost.build.executable>
+
<thrift.bootstrap.executable>./bootstrap.sh</thrift.bootstrap.executable>
+
<thrift.configure.executable>./configure</thrift.configure.executable>
+ <thrift.make.executable>make</thrift.make.executable>
+ <thrift.compiler.executable>thrift</thrift.compiler.executable>
+ <gradlew.executable>./gradlew</gradlew.executable>
+
<openssl.include.default.path>/usr/local/opt/openssl/include</openssl.include.default.path>
+
<openssl.include.dir>-DCMAKE_CXX_FLAGS="-I${openssl.include.default.path}"</openssl.include.dir>
+
<bison.executable.dir>-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison</bison.executable.dir>
</properties>
</profile>
<profile>
