From 61232808e5c0af3d7fa2d2baa8ffaff8bc602bf7 Mon Sep 17 00:00:00 2001
From: freemine <freemine@yeah.net>
Date: Sat, 13 Aug 2022 21:38:33 +0800
Subject: [PATCH] modify CMakeLists.txt (#16074)

* modify CMakeLists.txt to prevent `upx` from being untared at $HOME directory

* download and build `upx` in ~/.taos/externals/upx
---
 src/plugins/CMakeLists.txt | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 634f980492..5a32b00396 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -95,26 +95,37 @@ ELSE ()
 
   IF (TD_LINUX)
       include(ExternalProject)
+      set(_upx_prefix "$ENV{HOME}/.taos/externals/upx")
+      ExternalProject_Add(upx
+          PREFIX              "${_upx_prefix}"
+          URL                 https://github.com/upx/upx/releases/download/v3.96/upx-3.96-${PLATFORM_ARCH_STR}_linux.tar.xz
+          CONFIGURE_COMMAND   cmake -E true
+          BUILD_COMMAND       cmake -E true
+          INSTALL_COMMAND     cmake -E true
+          )
+
       ExternalProject_Add(taosadapter
           PREFIX        "taosadapter"
           SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
           BUILD_ALWAYS         off
-          DEPENDS             taos
+          DEPENDS             taos upx
           BUILD_IN_SOURCE     1
           CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
           PATCH_COMMAND
           COMMAND     git clean -f -d
           BUILD_COMMAND
+          COMMAND cmake -E echo "building taosadapter ..."
           COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
           COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
           INSTALL_COMMAND
-          COMMAND wget -c https://github.com/upx/upx/releases/download/v3.96/upx-3.96-${PLATFORM_ARCH_STR}_linux.tar.xz -O $ENV{HOME}/upx.tar.xz && tar -xvJf $ENV{HOME}/upx.tar.xz -C $ENV{HOME} --strip-components 1 > /dev/null && $ENV{HOME}/upx taosadapter || :
+          COMMAND ${_upx_prefix}/src/upx/upx taosadapter
           COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
           COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
           COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
           COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
           COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
           )
+      unset(_upx_prefix)
   ELSEIF (TD_DARWIN)
       include(ExternalProject)
       ExternalProject_Add(taosadapter
-- 
GitLab