You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/08/14 01:33:35 UTC
[iotdb] branch build_wind created (now 5a967c10846)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch build_wind
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 5a967c10846 linux
This branch includes the following new commits:
new 76fb447b57c init
new fb2ee0db49d windows
new 8fa9fc3e0c6 mac
new 5a967c10846 linux
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 02/04: windows
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch build_wind
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fb2ee0db49dcc507647ab1b61bb7734e2c07f808
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Aug 7 17:17:58 2023 +0800
windows
---
tools/thrift/pom.xml | 2 +-
tools/thrift/src/main/assembly/thrift.xml | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index d47a134f7ed..036e61112c5 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -44,7 +44,7 @@
<configuration>
<url>https://archive.apache.org/dist/thrift/${thrift.version}/thrift-${thrift.version}.exe</url>
<outputDirectory>${project.build.directory}/tools</outputDirectory>
- <outputFileName>${thrift.executable}</outputFileName>
+ <outputFileName>thrift.exe</outputFileName>
</configuration>
</execution>
</executions>
diff --git a/tools/thrift/src/main/assembly/thrift.xml b/tools/thrift/src/main/assembly/thrift.xml
index 5ab8ae5d252..b40c985f3aa 100644
--- a/tools/thrift/src/main/assembly/thrift.xml
+++ b/tools/thrift/src/main/assembly/thrift.xml
@@ -28,12 +28,7 @@
<!-- Include the executable -->
<fileSet>
<directory>${project.build.directory}/tools</directory>
- <!-- Make the file executable -->
- <fileMode>0755</fileMode>
- <includes>
- <include>**</include>
- </includes>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>bin/Release</outputDirectory>
</fileSet>
</fileSets>
</assembly>
[iotdb] 03/04: mac
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch build_wind
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8fa9fc3e0c6448643221067eaca71720dde8f310
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Aug 7 17:42:54 2023 +0800
mac
---
tools/thrift/pom.xml | 4 ++--
tools/thrift/src/main/assembly/thrift.xml | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 036e61112c5..384162af905 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -42,9 +42,9 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://archive.apache.org/dist/thrift/${thrift.version}/thrift-${thrift.version}.exe</url>
+ <url>https://gitbox.apache.org/repos/asf?p=iotdb-bin-resources.git;a=blob_plain;f=compile-tools/thrift-0.14-MacOS;hb=HEAD</url>
<outputDirectory>${project.build.directory}/tools</outputDirectory>
- <outputFileName>thrift.exe</outputFileName>
+ <outputFileName>thrift</outputFileName>
</configuration>
</execution>
</executions>
diff --git a/tools/thrift/src/main/assembly/thrift.xml b/tools/thrift/src/main/assembly/thrift.xml
index b40c985f3aa..927d4d865ab 100644
--- a/tools/thrift/src/main/assembly/thrift.xml
+++ b/tools/thrift/src/main/assembly/thrift.xml
@@ -18,7 +18,7 @@
under the License.
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>windows-x86_64</id>
+ <id>mac-x86_64</id>
<formats>
<format>zip</format>
<format>dir</format>
@@ -28,7 +28,12 @@
<!-- Include the executable -->
<fileSet>
<directory>${project.build.directory}/tools</directory>
- <outputDirectory>bin/Release</outputDirectory>
+ <!-- Make the file executable -->
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>**</include>
+ </includes>
+ <outputDirectory>bin</outputDirectory>
</fileSet>
</fileSets>
</assembly>
[iotdb] 04/04: linux
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch build_wind
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5a967c108464ca32199f76b6da9b66fad27bac44
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Aug 14 09:31:38 2023 +0800
linux
---
tools/thrift/pom.xml | 2 +-
tools/thrift/src/main/assembly/thrift.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 384162af905..359467e63dc 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -42,7 +42,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://gitbox.apache.org/repos/asf?p=iotdb-bin-resources.git;a=blob_plain;f=compile-tools/thrift-0.14-MacOS;hb=HEAD</url>
+ <url>https://gitbox.apache.org/repos/asf?p=iotdb-bin-resources.git;a=blob_plain;f=compile-tools/thrift-0.14-ubuntu;hb=HEAD</url>
<outputDirectory>${project.build.directory}/tools</outputDirectory>
<outputFileName>thrift</outputFileName>
</configuration>
diff --git a/tools/thrift/src/main/assembly/thrift.xml b/tools/thrift/src/main/assembly/thrift.xml
index 927d4d865ab..8c16c5a1986 100644
--- a/tools/thrift/src/main/assembly/thrift.xml
+++ b/tools/thrift/src/main/assembly/thrift.xml
@@ -18,7 +18,7 @@
under the License.
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>mac-x86_64</id>
+ <id>linux-x86_64</id>
<formats>
<format>zip</format>
<format>dir</format>
[iotdb] 01/04: init
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch build_wind
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 76fb447b57c139bef1e308fa62e9b2b50a4b7409
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Aug 7 16:34:53 2023 +0800
init
---
tools/thrift/pom.xml | 241 +-----------------------------
tools/thrift/src/main/assembly/thrift.xml | 29 +---
2 files changed, 5 insertions(+), 265 deletions(-)
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 8da28e521c0..d47a134f7ed 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -28,11 +28,6 @@
<packaging>pom</packaging>
<name>IoTDB: Tools: Thrift</name>
<description>Local build of the Apache Thrift compiler.</description>
- <properties>
- <thrift.with.cpp>ON</thrift.with.cpp>
- <thrift.with.go>ON</thrift.with.go>
- <thrift.with.python>ON</thrift.with.python>
- </properties>
<build>
<plugins>
<plugin>
@@ -47,87 +42,9 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://archive.apache.org/dist/thrift/${thrift.version}/thrift-${thrift.version}.tar.gz</url>
- <unpack>true</unpack>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
- <artifactId>cmake-maven-plugin</artifactId>
- <executions>
- <!-- Uses a CMake generator to generate the build using the build tool of choice -->
- <execution>
- <id>cmake-generate</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <generator>${cmake.generator}</generator>
- <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
- <targetPath>${project.build.directory}/build</targetPath>
- <options>
- <!-- Disable testing for now -->
- <option>-DBUILD_TESTING=OFF</option>
- <!-- Enable and disable the building of code generators for different languages -->
- <option>-DTHRIFT_COMPILER_AS3=OFF</option>
- <option>-DTHRIFT_COMPILER_C_GLIB=OFF</option>
- <option>-DTHRIFT_COMPILER_CL=OFF</option>
- <option>-DTHRIFT_COMPILER_CPP=${thrift.with.cpp}</option>
- <option>-DTHRIFT_COMPILER_D=OFF</option>
- <option>-DTHRIFT_COMPILER_DART=OFF</option>
- <option>-DTHRIFT_COMPILER_DELPHI=OFF</option>
- <option>-DTHRIFT_COMPILER_ERL=OFF</option>
- <option>-DTHRIFT_COMPILER_GO=${thrift.with.go}</option>
- <option>-DTHRIFT_COMPILER_GV=OFF</option>
- <option>-DTHRIFT_COMPILER_HAXE=OFF</option>
- <option>-DTHRIFT_COMPILER_HS=OFF</option>
- <option>-DTHRIFT_COMPILER_HTML=OFF</option>
- <option>-DTHRIFT_COMPILER_JAVA=ON</option>
- <option>-DTHRIFT_COMPILER_JAVAME=ON</option>
- <option>-DTHRIFT_COMPILER_JSON=OFF</option>
- <option>-DTHRIFT_COMPILER_LUA=OFF</option>
- <option>-DTHRIFT_COMPILER_NETSTD=ON</option>
- <option>-DTHRIFT_COMPILER_OCAML=OFF</option>
- <option>-DTHRIFT_COMPILER_PERL=OFF</option>
- <option>-DTHRIFT_COMPILER_PHP=OFF</option>
- <option>-DTHRIFT_COMPILER_PY=${thrift.with.python}</option>
- <option>-DTHRIFT_COMPILER_RB=OFF</option>
- <option>-DTHRIFT_COMPILER_RS=OFF</option>
- <option>-DTHRIFT_COMPILER_ST=OFF</option>
- <option>-DTHRIFT_COMPILER_SWIFT=OFF</option>
- <option>-DTHRIFT_COMPILER_XML=OFF</option>
- <option>-DTHRIFT_COMPILER_XSD=OFF</option>
- <!-- Enable and disable the building of libs for different languages -->
- <option>-DBUILD_C_GLIB=OFF</option>
- <option>-DBUILD_CPP=${thrift.with.cpp}</option>
- <!-- Don't build Java, as the libs are available via Maven -->
- <option>-DBUILD_JAVA=OFF</option>
- <option>-DBUILD_NODEJS=OFF</option>
- <option>-DBUILD_PYTHON=${thrift.with.python}</option>
- <option>-DBUILD_JAVASCRIPT=OFF</option>
- <option>-DBUILD_HASKELL=OFF</option>
- <option>-DWITH_SHARED_LIB=OFF</option>
- <!-- Generate libthrift.a to compile IoTDB Session -->
- <option>-DWITH_STATIC_LIB=ON</option>
- <option>-DCMAKE_POSITION_INDEPENDENT_CODE=ON</option>
- </options>
- </configuration>
- </execution>
- <!-- Actually executes the build -->
- <execution>
- <id>cmake-compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <config>${cmake.build.type}</config>
- <!-- The directory where the "generate" step generated the build configuration -->
- <projectDirectory>${project.build.directory}/build</projectDirectory>
+ <url>https://archive.apache.org/dist/thrift/${thrift.version}/thrift-${thrift.version}.exe</url>
+ <outputDirectory>${project.build.directory}/tools</outputDirectory>
+ <outputFileName>${thrift.executable}</outputFileName>
</configuration>
</execution>
</executions>
@@ -157,156 +74,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>.os-unix</id>
- <activation>
- <os>
- <family>unix</family>
- <name>Linux</name>
- <arch>!aarch64</arch>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
- <artifactId>cmake-maven-plugin</artifactId>
- <executions>
- <!-- Uses a CMake generator to generate the build using the build tool of choice -->
- <execution>
- <id>cmake-generate</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <generator>${cmake.generator}</generator>
- <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
- <targetPath>${project.build.directory}/build</targetPath>
- <options combine.children="append">
- <!-- Tell the linker to build statically linked binaries -->
- <option>-DCMAKE_EXE_LINKER_FLAGS=-static</option>
- <option>-DZLIB_USE_STATIC_LIBS=ON</option>
- <option>-DOPENSSL_USE_STATIC_LIBS=ON</option>
- </options>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>.os-unix-arm</id>
- <activation>
- <os>
- <family>unix</family>
- <name>Linux</name>
- <arch>aarch64</arch>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
- <artifactId>cmake-maven-plugin</artifactId>
- <executions>
- <!-- Uses a CMake generator to generate the build using the build tool of choice -->
- <execution>
- <id>cmake-generate</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <generator>${cmake.generator}</generator>
- <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
- <targetPath>${project.build.directory}/build</targetPath>
- <options combine.children="append">
- <!-- Tell the linker to build statically linked binaries -->
- <option>-DCMAKE_EXE_LINKER_FLAGS=-static</option>
- <option>-DZLIB_USE_STATIC_LIBS=ON</option>
- <option>-DOPENSSL_USE_STATIC_LIBS=ON</option>
- </options>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>.os-mac</id>
- <activation>
- <os>
- <family>mac</family>
- <arch>!aarch64</arch>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
- <artifactId>cmake-maven-plugin</artifactId>
- <executions>
- <!-- Uses a CMake generator to generate the build using the build tool of choice -->
- <execution>
- <id>cmake-generate</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <generator>${cmake.generator}</generator>
- <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
- <targetPath>${project.build.directory}/build</targetPath>
- <options combine.children="append">
- <!-- Specify new version Bison path for Mac-OS, as the default version is too old -->
- <option>-DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison</option>
- </options>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>.os-mac-arm</id>
- <activation>
- <os>
- <family>mac</family>
- <arch>aarch64</arch>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
- <artifactId>cmake-maven-plugin</artifactId>
- <executions>
- <!-- Uses a CMake generator to generate the build using the build tool of choice -->
- <execution>
- <id>cmake-generate</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <generator>${cmake.generator}</generator>
- <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
- <targetPath>${project.build.directory}/build</targetPath>
- <options combine.children="append">
- <!-- Specify new version Bison path for Mac-OS, as the default version is too old -->
- <option>-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison</option>
- </options>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/tools/thrift/src/main/assembly/thrift.xml b/tools/thrift/src/main/assembly/thrift.xml
index 9a3d9c64ae0..5ab8ae5d252 100644
--- a/tools/thrift/src/main/assembly/thrift.xml
+++ b/tools/thrift/src/main/assembly/thrift.xml
@@ -18,7 +18,7 @@
under the License.
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>${os.classifier}</id>
+ <id>windows-x86_64</id>
<formats>
<format>zip</format>
<format>dir</format>
@@ -27,7 +27,7 @@
<fileSets>
<!-- Include the executable -->
<fileSet>
- <directory>${project.build.directory}/build/compiler/cpp/bin</directory>
+ <directory>${project.build.directory}/tools</directory>
<!-- Make the file executable -->
<fileMode>0755</fileMode>
<includes>
@@ -35,30 +35,5 @@
</includes>
<outputDirectory>bin</outputDirectory>
</fileSet>
- <!-- Include the shared-libraries -->
- <fileSet>
- <directory>${project.build.directory}/build</directory>
- <includes>
- <include>lib/*.a</include>
- <include>lib/Release/*.lib</include>
- </includes>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <!-- Include the header-files -->
- <fileSet>
- <directory>${project.build.directory}/thrift-${thrift.version}/lib/cpp/src</directory>
- <includes>
- <include>**</include>
- </includes>
- <outputDirectory>include</outputDirectory>
- </fileSet>
- <!-- Include the config.h -->
- <fileSet>
- <directory>${project.build.directory}/build/thrift</directory>
- <includes>
- <include>config.h</include>
- </includes>
- <outputDirectory>include/thrift</outputDirectory>
- </fileSet>
</fileSets>
</assembly>