From e36566f96dd4a959ff42815cfbacdca4ba3084f4 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 23 Nov 2022 09:09:51 +0800 Subject: [PATCH] fix: add windows taosdump for 3.0 (#18358) * fix: taostools 05c2030 * fix: taostools 05c2030 * fix: update taos-tools b232ec3 * fix: update taostools commit * fix: update taos-tools 656e8f9 * fix: update taos-tools 7c244b4 * fix: update a61cc65 taos-tools * fix: update taos-tools 32a10ee * fix: update taos-tools 540175c * fix: update taos-tools 579a77b * fix: update taos-tools bb30d7f * fix: update taos-tools 55c217c * fix: update taos-tools d0a9f4e * fix: updata taostools 8ae6f8b * fix: update taos-tools f32ec94 * fix: update taos-tools 2cb1d69 * fix: update taos-tools d981cee * fix: cmake file format * fix: taos-tools e718155 * fix: update taos-tools 904c558 * test: build tools on windows * fix: update taos-tools fd458f0 * fix: update taos-tools 4b268d2 * fix: update taos-tools c390746 * fix: update taos-tools c6d53d4 * fix: update taos-tools d422e0a * fix: taos-tools efa2a5f --- Jenkinsfile2 | 2 +- cmake/taostools_CMakeLists.txt.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 33c3ef55c9..de39f4fcec 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -303,7 +303,7 @@ def pre_test_build_win() { set CL=/MP8 echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> cmake" time /t - cmake .. -G "NMake Makefiles JOM" -DBUILD_TEST=true || exit 7 + cmake .. -G "NMake Makefiles JOM" -DBUILD_TEST=true -DBUILD_TOOLS=true || exit 7 echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> jom -j 6" time /t jom -j 6 || exit 8 diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in index b996ffcd17..d1c448b094 100644 --- a/cmake/taostools_CMakeLists.txt.in +++ b/cmake/taostools_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taos-tools ExternalProject_Add(taos-tools GIT_REPOSITORY https://github.com/taosdata/taos-tools.git - GIT_TAG e00ebd9 + GIT_TAG efa2a5f SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools" BINARY_DIR "" #BUILD_IN_SOURCE TRUE -- GitLab