This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch helishi_client
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/helishi_client by this push:
new 18384641f7b recover
18384641f7b is described below
commit 18384641f7b9f5c73e12607d06ffef86b5fe0f9e
Author: HTHou <[email protected]>
AuthorDate: Thu Apr 25 17:26:46 2024 +0800
recover
---
iotdb-client/client-cpp/pom.xml | 94 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 90 insertions(+), 4 deletions(-)
diff --git a/iotdb-client/client-cpp/pom.xml b/iotdb-client/client-cpp/pom.xml
index deb0733cdaa..331dcddd48c 100644
--- a/iotdb-client/client-cpp/pom.xml
+++ b/iotdb-client/client-cpp/pom.xml
@@ -24,22 +24,53 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-client</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.1.2</version>
</parent>
<artifactId>client-cpp</artifactId>
<packaging>pom</packaging>
<name>IoTDB: Client: Client for CPP</name>
<description>C++ client</description>
+ <!-- TODO: The tests don't run, if distribution has not been built locally
and fails without reasoning -->
+ <properties>
+
<catch2.url>https://github.com/catchorg/Catch2/releases/download/v2.13.7/catch.hpp</catch2.url>
+ <cmake.build.type>Release</cmake.build.type>
+ <!-- Default value of cmake root -->
+
<cmake.root.dir>${project.build.directory}/dependency/cmake/</cmake.root.dir>
+
<thrift.exec.absolute.path>${project.build.directory}/thrift/bin/${thrift.executable}</thrift.exec.absolute.path>
+ </properties>
<dependencies>
<dependency>
- <groupId>org.apache.iotdb</groupId>
+ <groupId>com.timecho.iotdb</groupId>
<artifactId>iotdb-thrift-commons</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
+ <!-- Build and do session integration test -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-test-resources</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+
<outputDirectory>${project.build.directory}/build/test</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/test</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -66,6 +97,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <!-- Download the Catch2 header file. -->
+ <execution>
+ <id>get-catch2</id>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <url>${catch2.url}</url>
+ <unpack>false</unpack>
+
<outputDirectory>${project.build.directory}/build/test/catch2</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
@@ -156,7 +206,22 @@
</options>
</configuration>
</execution>
-
+ <!-- Generate Cmake build directory to compile testing
program -->
+ <execution>
+ <id>cmake-generate-test</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <phase>test-compile</phase>
+ <configuration>
+ <generator>${cmake.generator}</generator>
+
<sourcePath>${project.build.directory}/build/test</sourcePath>
+
<targetPath>${project.build.directory}/build/test</targetPath>
+ <options>
+
<option>-DBOOST_INCLUDEDIR=${boost.include.dir}</option>
+ </options>
+ </configuration>
+ </execution>
<!-- Actually executes the build -->
<execution>
<id>cmake-compile</id>
@@ -171,8 +236,29 @@
</configuration>
</execution>
<!-- Actually executes the testing compilation -->
+ <execution>
+ <id>cmake-compile-test</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>test-compile</phase>
+ <configuration>
+ <config>${cmake.build.type}</config>
+
<projectDirectory>${project.build.directory}/build/test</projectDirectory>
+ </configuration>
+ </execution>
<!-- Run the integration test cases -->
<!-- TODO: This execution doesn't seem to respect the
"skipTests" config -->
+ <execution>
+ <id>cmake-run-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+
<buildDirectory>${project.build.directory}/build/test</buildDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
<!--Package all C++ header files and client library-->
