Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 feea8174 编写于 作者: L lihui
浏览文件
操作

[modify for puhua version]

上级 ec7e3665
展开全部 隐藏空白更改
内联 并排
Showing with 370 addition and 248 deletion
CMakeLists.txt
浏览文件 @ feea8174
...@@ -26,6 +26,40 @@ SET(CMAKE_VERBOSE_MAKEFILE ON) ...@@ -26,6 +26,40 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
# open the file named TDengine.sln # open the file named TDengine.sln
# #
# database variables
# cmake .. -G "NMake Makefiles" -DDBNAME=[taos | power]
# set default db name
SET(DB_CLIENT_NAME "taos")
SET(DB_SERVICE_NAME "taosd")
SET(DB_FULL_NAME "TDengine")
SET(DB_COPYRIGHT "TAOS Data")
SET(DB_COMPANY "taosdata")
IF (${DBNAME} MATCHES "taos")
SET(DB_CLIENT_NAME "taos")
SET(DB_SERVICE_NAME "taosd")
SET(DB_FULL_NAME "TDengine")
SET(DB_COPYRIGHT "TAOS Data")
SET(DB_COMPANY "taosdata")
ELSEIF (${DBNAME} MATCHES "power")
SET(DB_CLIENT_NAME "power")
SET(DB_SERVICE_NAME "powerd")
SET(DB_FULL_NAME "PowerDB")
SET(DB_COPYRIGHT "PowerDB")
SET(DB_COMPANY "powerdb")
ELSE ()
MESSAGE(STATUS "No db name input, build the version as default dbname: taos")
ENDIF ()
ADD_DEFINITIONS(-DDB_CLIENT_NAME="${DB_CLIENT_NAME}")
ADD_DEFINITIONS(-DDB_SERVICE_NAME="${DB_SERVICE_NAME}")
ADD_DEFINITIONS(-DDB_FULL_NAME="${DB_FULL_NAME}")
ADD_DEFINITIONS(-DDB_COPYRIGHT="${DB_COPYRIGHT}")
ADD_DEFINITIONS(-DDB_COMPANY="${DB_COMPANY}")
MESSAGE(STATUS "Build ${DB_FULL_NAME} Version")
SET(TD_GODLL FALSE) SET(TD_GODLL FALSE)
IF (${DLLTYPE} MATCHES "go") IF (${DLLTYPE} MATCHES "go")
ADD_DEFINITIONS(-D_TD_GO_DLL_) ADD_DEFINITIONS(-D_TD_GO_DLL_)
...@@ -265,7 +299,7 @@ IF (NOT DEFINED TD_CLUSTER) ...@@ -265,7 +299,7 @@ IF (NOT DEFINED TD_CLUSTER)
INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})") INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})") INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")
ELSEIF (TD_WINDOWS_64) ELSEIF (TD_WINDOWS_64)
SET(CMAKE_INSTALL_PREFIX C:/TDengine) SET(CMAKE_INSTALL_PREFIX C:/${DB_FULL_NAME})
IF (NOT TD_GODLL) IF (NOT TD_GODLL)
INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector) INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)
INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/grafana DESTINATION connector) INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/grafana DESTINATION connector)
...@@ -276,7 +310,7 @@ IF (NOT DEFINED TD_CLUSTER) ...@@ -276,7 +310,7 @@ IF (NOT DEFINED TD_CLUSTER)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver) INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver) INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver) INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .) INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${DB_CLIENT_NAME}.exe DESTINATION .)
#INSTALL(TARGETS taos RUNTIME DESTINATION driver) #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
#INSTALL(TARGETS shell RUNTIME DESTINATION .) #INSTALL(TARGETS shell RUNTIME DESTINATION .)
IF (TD_MVN_INSTALLED) IF (TD_MVN_INSTALLED)
......
packaging/release.sh
浏览文件 @ feea8174
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
# Generate the deb package for ubunt, or rpm package for centos, or tar.gz package for other linux os # Generate the deb package for ubunt, or rpm package for centos, or tar.gz package for other linux os
set -e set -e
#set -x set -x
# releash.sh -v [cluster | edge] # releash.sh -v [cluster | edge]
# -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] # -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] # -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
# -V [stable | beta] # -V [stable | beta]
# -l [full | lite] # -l [full | lite]
# -n [taos | power | ...]
# set parameters by default value # set parameters by default value
verMode=edge # [cluster, edge] verMode=edge # [cluster, edge]
...@@ -17,8 +18,9 @@ verType=stable # [stable, beta] ...@@ -17,8 +18,9 @@ verType=stable # [stable, beta]
cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...] cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
osType=Linux # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] osType=Linux # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
pagMode=full # [full | lite] pagMode=full # [full | lite]
dbName=taos # [taos | power | ...]
while getopts "hv:V:c:o:l:" arg while getopts "hv:V:c:o:l:n:" arg
do do
case $arg in case $arg in
v) v)
...@@ -37,12 +39,16 @@ do ...@@ -37,12 +39,16 @@ do
#echo "pagMode=$OPTARG" #echo "pagMode=$OPTARG"
pagMode=$(echo $OPTARG) pagMode=$(echo $OPTARG)
;; ;;
n)
#echo "dbName=$OPTARG"
dbName=$(echo $OPTARG)
;;
o) o)
#echo "osType=$OPTARG" #echo "osType=$OPTARG"
osType=$(echo $OPTARG) osType=$(echo $OPTARG)
;; ;;
h) h)
echo "Usage: `basename $0` -v [cluster | edge] -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] -V [stable | beta] -l [full | lite]" echo "Usage: `basename $0` -v [cluster | edge] -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] -V [stable | beta] -l [full | lite] -n [taos | power]"
exit 0 exit 0
;; ;;
?) #unknow option ?) #unknow option
...@@ -52,7 +58,7 @@ do ...@@ -52,7 +58,7 @@ do
esac esac
done done
echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode}" echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} dbName=${dbName}"
curr_dir=$(pwd) curr_dir=$(pwd)
...@@ -202,9 +208,9 @@ cd ${compile_dir} ...@@ -202,9 +208,9 @@ cd ${compile_dir}
# check support cpu type # check support cpu type
if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then
if [ "$verMode" != "cluster" ]; then if [ "$verMode" != "cluster" ]; then
cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode} cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode} -DDBNAME=${dbName}
else else
cmake ../../ -DCPUTYPE=${cpuType} cmake ../../ -DCPUTYPE=${cpuType} -DDBNAME=${dbName}
fi fi
else else
echo "input cpuType=${cpuType} error!!!" echo "input cpuType=${cpuType} error!!!"
...@@ -221,7 +227,7 @@ cd ${curr_dir} ...@@ -221,7 +227,7 @@ cd ${curr_dir}
#echo "osinfo: ${osinfo}" #echo "osinfo: ${osinfo}"
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
if [[ "$verMode" != "cluster" ]] && [[ "$cpuType" == "x64" ]]; then if [[ "$verMode" != "cluster" ]] && [[ "$cpuType" == "x64" ]] && [[ "$dbName" == "taos" ]]; then
echo "====do deb package for the ubuntu system====" echo "====do deb package for the ubuntu system===="
output_dir="${top_dir}/debs" output_dir="${top_dir}/debs"
if [ -d ${output_dir} ]; then if [ -d ${output_dir} ]; then
...@@ -244,11 +250,11 @@ if [ "$osType" != "Darwin" ]; then ...@@ -244,11 +250,11 @@ if [ "$osType" != "Darwin" ]; then
echo "====do tar.gz package for all systems====" echo "====do tar.gz package for all systems===="
cd ${script_dir}/tools cd ${script_dir}/tools
${csudo} ./makepkg.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${csudo} ./makepkg.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
else else
cd ${script_dir}/tools cd ${script_dir}/tools
./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${dbName}
fi fi
# 4. Clean up temporary compile directories # 4. Clean up temporary compile directories
......
packaging/tools/install.sh
浏览文件 @ feea8174
此差异已折叠。
packaging/tools/install_client.sh
浏览文件 @ feea8174
#!/bin/bash #!/bin/bash
# #
# This file is used to install TDengine client on linux systems. The operating system # This file is used to install DB_FULL_NAME client on linux systems. The operating system
# is required to use systemd to manage services at boot # is required to use systemd to manage services at boot
set -e set -e
...@@ -14,19 +14,19 @@ pagMode=full ...@@ -14,19 +14,19 @@ pagMode=full
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
script_dir=$(dirname $(readlink -f "$0")) script_dir=$(dirname $(readlink -f "$0"))
# Dynamic directory # Dynamic directory
data_dir="/var/lib/taos" data_dir="/var/lib/DB_CLIENT_NAME"
log_dir="/var/log/taos" log_dir="/var/log/DB_CLIENT_NAME"
else else
script_dir=`dirname $0` script_dir=`dirname $0`
cd ${script_dir} cd ${script_dir}
script_dir="$(pwd)" script_dir="$(pwd)"
data_dir="/var/lib/taos" data_dir="/var/lib/DB_CLIENT_NAME"
log_dir="~/TDengineLog" log_dir="~/TDengineLog"
fi fi
log_link_dir="/usr/local/taos/log" log_link_dir="/usr/local/DB_CLIENT_NAME/log"
cfg_install_dir="/etc/taos" cfg_install_dir="/etc/DB_CLIENT_NAME"
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
bin_link_dir="/usr/bin" bin_link_dir="/usr/bin"
...@@ -39,10 +39,10 @@ else ...@@ -39,10 +39,10 @@ else
fi fi
#install main path #install main path
install_main_dir="/usr/local/taos" install_main_dir="/usr/local/DB_CLIENT_NAME"
# old bin dir # old bin dir
bin_dir="/usr/local/taos/bin" bin_dir="/usr/local/DB_CLIENT_NAME/bin"
# v1.5 jar dir # v1.5 jar dir
v15_java_app_dir="/usr/local/lib/taos" v15_java_app_dir="/usr/local/lib/taos"
...@@ -62,7 +62,7 @@ fi ...@@ -62,7 +62,7 @@ fi
update_flag=0 update_flag=0
function kill_client() { function kill_client() {
pid=$(ps -ef | grep "taos" | grep -v "grep" | awk '{print $2}') pid=$(ps -ef | grep "DB_CLIENT_NAME" | grep -v "grep" | awk '{print $2}')
if [ -n "$pid" ]; then if [ -n "$pid" ]; then
${csudo} kill -9 $pid || : ${csudo} kill -9 $pid || :
fi fi
...@@ -82,20 +82,20 @@ function install_main_path() { ...@@ -82,20 +82,20 @@ function install_main_path() {
function install_bin() { function install_bin() {
# Remove links # Remove links
${csudo} rm -f ${bin_link_dir}/taos || : ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAME || :
if [ "$osType" == "Darwin" ]; then if [ "$osType" == "Darwin" ]; then
${csudo} rm -f ${bin_link_dir}/taosdump || : ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdump || :
fi fi
${csudo} rm -f ${bin_link_dir}/rmtaos || : ${csudo} rm -f ${bin_link_dir}/rmDB_CLIENT_NAME || :
${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/* ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
#Make link #Make link
[ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos || : [ -x ${install_main_dir}/bin/DB_CLIENT_NAME ] && ${csudo} ln -s ${install_main_dir}/bin/DB_CLIENT_NAME ${bin_link_dir}/DB_CLIENT_NAME || :
if [ "$osType" == "Darwin" ]; then if [ "$osType" == "Darwin" ]; then
[ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || : [ -x ${install_main_dir}/bin/DB_CLIENT_NAMEdump ] && ${csudo} ln -s ${install_main_dir}/bin/DB_CLIENT_NAMEdump ${bin_link_dir}/DB_CLIENT_NAMEdump || :
fi fi
[ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos || : [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmDB_CLIENT_NAME || :
} }
function clean_lib() { function clean_lib() {
...@@ -127,16 +127,16 @@ function install_header() { ...@@ -127,16 +127,16 @@ function install_header() {
} }
function install_config() { function install_config() {
#${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || : #${csudo} rm -f ${install_main_dir}/cfg/DB_CLIENT_NAME.cfg || :
if [ ! -f ${cfg_install_dir}/taos.cfg ]; then if [ ! -f ${cfg_install_dir}/DB_CLIENT_NAME.cfg ]; then
${csudo} mkdir -p ${cfg_install_dir} ${csudo} mkdir -p ${cfg_install_dir}
[ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir} [ -f ${script_dir}/cfg/DB_CLIENT_NAME.cfg ] && ${csudo} cp ${script_dir}/cfg/DB_CLIENT_NAME.cfg ${cfg_install_dir}
${csudo} chmod 644 ${cfg_install_dir}/* ${csudo} chmod 644 ${cfg_install_dir}/*
fi fi
${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org ${csudo} cp -f ${script_dir}/cfg/DB_CLIENT_NAME.cfg ${install_main_dir}/cfg/DB_CLIENT_NAME.cfg.org
${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg ${csudo} ln -s ${cfg_install_dir}/DB_CLIENT_NAME.cfg ${install_main_dir}/cfg
} }
...@@ -161,17 +161,17 @@ function install_examples() { ...@@ -161,17 +161,17 @@ function install_examples() {
fi fi
} }
function update_TDengine() { function update_DB_FULL_NAME() {
# Start to update # Start to update
if [ ! -e taos.tar.gz ]; then if [ ! -e DB_CLIENT_NAME.tar.gz ]; then
echo "File taos.tar.gz does not exist" echo "File DB_CLIENT_NAME.tar.gz does not exist"
exit 1 exit 1
fi fi
tar -zxf taos.tar.gz tar -zxf DB_CLIENT_NAME.tar.gz
echo -e "${GREEN}Start to update TDengine client...${NC}" echo -e "${GREEN}Start to update DB_FULL_NAME client...${NC}"
# Stop the client shell if running # Stop the client shell if running
if pidof taos &> /dev/null; then if pidof DB_CLIENT_NAME &> /dev/null; then
kill_client kill_client
sleep 1 sleep 1
fi fi
...@@ -189,20 +189,20 @@ function update_TDengine() { ...@@ -189,20 +189,20 @@ function update_TDengine() {
install_config install_config
echo echo
echo -e "\033[44;32;1mTDengine client is updated successfully!${NC}" echo -e "\033[44;32;1mDB_FULL_NAME client is updated successfully!${NC}"
rm -rf $(tar -tf taos.tar.gz) rm -rf $(tar -tf DB_CLIENT_NAME.tar.gz)
} }
function install_TDengine() { function install_DB_FULL_NAME() {
# Start to install # Start to install
if [ ! -e taos.tar.gz ]; then if [ ! -e DB_CLIENT_NAME.tar.gz ]; then
echo "File taos.tar.gz does not exist" echo "File DB_CLIENT_NAME.tar.gz does not exist"
exit 1 exit 1
fi fi
tar -zxf taos.tar.gz tar -zxf DB_CLIENT_NAME.tar.gz
echo -e "${GREEN}Start to install TDengine client...${NC}" echo -e "${GREEN}Start to install DB_FULL_NAME client...${NC}"
install_main_path install_main_path
install_log install_log
...@@ -216,23 +216,23 @@ function install_TDengine() { ...@@ -216,23 +216,23 @@ function install_TDengine() {
install_config install_config
echo echo
echo -e "\033[44;32;1mTDengine client is installed successfully!${NC}" echo -e "\033[44;32;1mDB_FULL_NAME client client is installed successfully!${NC}"
rm -rf $(tar -tf taos.tar.gz) rm -rf $(tar -tf DB_CLIENT_NAME.tar.gz)
} }
## ==============================Main program starts from here============================ ## ==============================Main program starts from here============================
# Install or updata client and client # Install or updata client and client
# if server is already install, don't install client # if server is already install, don't install client
if [ -e ${bin_dir}/taosd ]; then if [ -e ${bin_dir}/DB_SERVICE_NAME ]; then
echo -e "\033[44;32;1mThere are already installed TDengine server, so don't need install client!${NC}" echo -e "\033[44;32;1mThere are already installed DB_FULL_NAME client server, so don't need install client!${NC}"
exit 0 exit 0
fi fi
if [ -x ${bin_dir}/taos ]; then if [ -x ${bin_dir}/DB_CLIENT_NAME ]; then
update_flag=1 update_flag=1
update_TDengine update_DB_FULL_NAME client
else else
install_TDengine install_DB_FULL_NAME client
fi fi
packaging/tools/makeclient.sh
浏览文件 @ feea8174
...@@ -13,6 +13,24 @@ osType=$5 ...@@ -13,6 +13,24 @@ osType=$5
verMode=$6 verMode=$6
verType=$7 verType=$7
pagMode=$8 pagMode=$8
dbName=$9
if [ "$dbName" == "taos" ]; then
DB_CLIENT_NAME="taos"
DB_SERVICE_NAME="taosd"
DB_FULL_NAME="TDengine"
DB_COPYRIGHT="TAOS Data"
DB_COMPANY="taosdata"
elif [ "$dbName" == "power" ]; then
DB_CLIENT_NAME="power"
DB_SERVICE_NAME="powerd"
DB_FULL_NAME="PowerDB"
DB_COPYRIGHT="PowerDB"
DB_COMPANY="powerdb"
else
echo "Not support dbname, exit"
exit 1
fi
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
script_dir="$(dirname $(readlink -f $0))" script_dir="$(dirname $(readlink -f $0))"
...@@ -32,24 +50,24 @@ release_dir="${top_dir}/release" ...@@ -32,24 +50,24 @@ release_dir="${top_dir}/release"
#package_name='linux' #package_name='linux'
if [ "$verMode" == "cluster" ]; then if [ "$verMode" == "cluster" ]; then
install_dir="${release_dir}/TDengine-enterprise-client" install_dir="${release_dir}/${DB_FULL_NAME}-enterprise-client"
else else
install_dir="${release_dir}/TDengine-client" install_dir="${release_dir}/${DB_FULL_NAME}-client"
fi fi
# Directories and files. # Directories and files.
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
if [ "$pagMode" == "lite" ]; then if [ "$pagMode" == "lite" ]; then
strip ${build_dir}/bin/taosd strip ${build_dir}/bin/${DB_SERVICE_NAME}
strip ${build_dir}/bin/taos strip ${build_dir}/bin/${DB_CLIENT_NAME}
bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh" bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${script_dir}/remove_client.sh"
else else
bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${script_dir}/remove_client.sh" bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${build_dir}/bin/${DB_CLIENT_NAME}dump ${script_dir}/remove_client.sh"
fi fi
lib_files="${build_dir}/lib/libtaos.so.${version}" lib_files="${build_dir}/lib/libtaos.so.${version}"
else else
bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh" bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${script_dir}/remove_client.sh"
lib_files="${build_dir}/lib/libtaos.${version}.dylib" lib_files="${build_dir}/lib/libtaos.${version}.dylib"
fi fi
...@@ -61,18 +79,22 @@ install_files="${script_dir}/install_client.sh" ...@@ -61,18 +79,22 @@ install_files="${script_dir}/install_client.sh"
# make directories. # make directories.
mkdir -p ${install_dir} mkdir -p ${install_dir}
mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/bin/remove_client.sh
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/bin/remove_client.sh
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/bin/remove_client.sh
cd ${install_dir} cd ${install_dir}
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
tar -zcv -f taos.tar.gz * --remove-files || : tar -zcv -f ${DB_CLIENT_NAME}.tar.gz * --remove-files || :
else else
tar -zcv -f taos.tar.gz * || : tar -zcv -f ${DB_CLIENT_NAME}.tar.gz * || :
mv taos.tar.gz .. mv ${DB_CLIENT_NAME}.tar.gz ..
rm -rf ./* rm -rf ./*
mv ../taos.tar.gz . mv ../${DB_CLIENT_NAME}.tar.gz .
fi fi
cd ${curr_dir} cd ${curr_dir}
...@@ -85,6 +107,11 @@ if [ "$pagMode" == "lite" ]; then ...@@ -85,6 +107,11 @@ if [ "$pagMode" == "lite" ]; then
sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client.sh >> install_client_temp.sh sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client.sh >> install_client_temp.sh
mv install_client_temp.sh ${install_dir}/install_client.sh mv install_client_temp.sh ${install_dir}/install_client.sh
fi fi
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/install_client.sh
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/install_client.sh
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/install_client.sh
chmod a+x ${install_dir}/install_client.sh chmod a+x ${install_dir}/install_client.sh
# Copy example code # Copy example code
......
packaging/tools/makepkg.sh
浏览文件 @ feea8174
...@@ -14,6 +14,24 @@ osType=$5 ...@@ -14,6 +14,24 @@ osType=$5
verMode=$6 verMode=$6
verType=$7 verType=$7
pagMode=$8 pagMode=$8
dbName=$9
if [ "$dbName" == "taos" ]; then
DB_CLIENT_NAME="taos"
DB_SERVICE_NAME="taosd"
DB_FULL_NAME="TDengine"
DB_COPYRIGHT="TAOS Data"
DB_COMPANY="taosdata"
elif [ "$dbName" == "power" ]; then
DB_CLIENT_NAME="power"
DB_SERVICE_NAME="powerd"
DB_FULL_NAME="PowerDB"
DB_COPYRIGHT="PowerDB"
DB_COMPANY="powerdb"
else
echo "Not support dbname: ${dbName}, exit"
exit 1
fi
script_dir="$(dirname $(readlink -f $0))" script_dir="$(dirname $(readlink -f $0))"
top_dir="$(readlink -f ${script_dir}/../..)" top_dir="$(readlink -f ${script_dir}/../..)"
...@@ -25,18 +43,18 @@ release_dir="${top_dir}/release" ...@@ -25,18 +43,18 @@ release_dir="${top_dir}/release"
#package_name='linux' #package_name='linux'
if [ "$verMode" == "cluster" ]; then if [ "$verMode" == "cluster" ]; then
install_dir="${release_dir}/TDengine-enterprise-server" install_dir="${release_dir}/${DB_FULL_NAME}-enterprise-server"
else else
install_dir="${release_dir}/TDengine-server" install_dir="${release_dir}/${DB_FULL_NAME}-server"
fi fi
# Directories and files. # Directories and files.
if [ "$pagMode" == "lite" ]; then if [ "$pagMode" == "lite" ]; then
strip ${build_dir}/bin/taosd strip ${build_dir}/bin/taosd
strip ${build_dir}/bin/taos strip ${build_dir}/bin/taos
bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${script_dir}/remove.sh" bin_files="${build_dir}/bin/${DB_SERVICE_NAME} ${build_dir}/bin/${DB_CLIENT_NAME} ${script_dir}/remove.sh"
else else
bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/taosdump ${script_dir}/remove.sh" bin_files="${build_dir}/bin/${DB_SERVICE_NAME} ${build_dir}/bin/${DB_CLIENT_NAME} ${build_dir}/bin/${DB_CLIENT_NAME}demo ${build_dir}/bin/${DB_CLIENT_NAME}dump ${script_dir}/remove.sh"
fi fi
lib_files="${build_dir}/lib/libtaos.so.${version}" lib_files="${build_dir}/lib/libtaos.so.${version}"
...@@ -58,19 +76,51 @@ init_file_rpm=${script_dir}/../rpm/taosd ...@@ -58,19 +76,51 @@ init_file_rpm=${script_dir}/../rpm/taosd
# make directories. # make directories.
mkdir -p ${install_dir} mkdir -p ${install_dir}
mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/taosd.deb mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taosd.rpm mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
if [ "$verMode" == "cluster" ]; then if [ "$verMode" == "cluster" ]; then
sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >> remove_temp.sh sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >> remove_temp.sh
mv remove_temp.sh ${install_dir}/bin/remove.sh mv remove_temp.sh ${install_dir}/bin/remove.sh
mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png cp ${nginx_dir}/png/${DB_CLIENT_NAME}.png ${install_dir}/nginxd/admin/images/${DB_CLIENT_NAME}.png
rm -rf ${install_dir}/nginxd/png rm -rf ${install_dir}/nginxd/png
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/nginxd/admin/*.html
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/nginxd/admin/*.html
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/nginxd/admin/*.html
sed -i "s/DB_COPYRIGHT/${DB_COPYRIGHT}/g" ${install_dir}/nginxd/admin/*.html
sed -i "s/DB_COMPANY/${DB_COMPANY}/g" ${install_dir}/nginxd/admin/*.html
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/nginxd/admin/js/*.js
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/nginxd/admin/js/*.js
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/nginxd/admin/js/*.js
sed -i "s/DB_COPYRIGHT/${DB_COPYRIGHT}/g" ${install_dir}/nginxd/admin/js/*.js
sed -i "s/DB_COMPANY/${DB_COMPANY}/g" ${install_dir}/nginxd/admin/js/*.js
sed -i "s/taosdata/${DB_COMPANY}/g" ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
sed -i "s/taos/${DB_CLIENT_NAME}/g" ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
sed -i "s/TDengine/${DB_FULL_NAME}/g" ${install_dir}/cfg/${DB_CLIENT_NAME}.cfg
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/bin/remove.sh
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/bin/remove.sh
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/bin/remove.sh
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.deb
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/init.d/${DB_SERVICE_NAME}.rpm
#sed -i "s/TAOS Data/${DB_COPYRIGHT}/g" ${install_dir}/inc/${DB_CLIENT_NAME}.h
#sed -i "s/taosdata/${DB_COMPANY}/g" ${install_dir}/inc/${DB_CLIENT_NAME}.h
if [ "$cpuType" == "aarch64" ]; then if [ "$cpuType" == "aarch64" ]; then
cp -f ${install_dir}/nginxd/sbin/arm/64bit/nginx ${install_dir}/nginxd/sbin/ cp -f ${install_dir}/nginxd/sbin/arm/64bit/nginx ${install_dir}/nginxd/sbin/
elif [ "$cpuType" == "aarch32" ]; then elif [ "$cpuType" == "aarch32" ]; then
...@@ -80,10 +130,10 @@ if [ "$verMode" == "cluster" ]; then ...@@ -80,10 +130,10 @@ if [ "$verMode" == "cluster" ]; then
fi fi
cd ${install_dir} cd ${install_dir}
tar -zcv -f taos.tar.gz * --remove-files || : tar -zcv -f ${DB_CLIENT_NAME}.tar.gz * --remove-files || :
exitcode=$? exitcode=$?
if [ "$exitcode" != "0" ]; then if [ "$exitcode" != "0" ]; then
echo "tar taos.tar.gz error !!!" echo "tar ${DB_CLIENT_NAME}.tar.gz error !!!"
exit $exitcode exit $exitcode
fi fi
...@@ -97,6 +147,11 @@ if [ "$pagMode" == "lite" ]; then ...@@ -97,6 +147,11 @@ if [ "$pagMode" == "lite" ]; then
sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_temp.sh sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_temp.sh
mv install_temp.sh ${install_dir}/install.sh mv install_temp.sh ${install_dir}/install.sh
fi fi
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/install.sh
sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/install.sh
sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/install.sh
chmod a+x ${install_dir}/install.sh chmod a+x ${install_dir}/install.sh
# Copy example code # Copy example code
......
packaging/tools/remove.sh
浏览文件 @ feea8174
#!/bin/bash #!/bin/bash
# #
# Script to stop the service and uninstall TDengine, but retain the config, data and log files. # Script to stop the service and uninstall database, but retain the config, data and log files.
set -e set -e
#set -x #set -x
...@@ -12,10 +12,10 @@ GREEN='\033[1;32m' ...@@ -12,10 +12,10 @@ GREEN='\033[1;32m'
NC='\033[0m' NC='\033[0m'
#install main path #install main path
install_main_dir="/usr/local/taos" install_main_dir="/usr/local/DB_CLIENT_NAME"
data_link_dir="/usr/local/taos/data" data_link_dir="/usr/local/DB_CLIENT_NAME/data"
log_link_dir="/usr/local/taos/log" log_link_dir="/usr/local/DB_CLIENT_NAME/log"
cfg_link_dir="/usr/local/taos/cfg" cfg_link_dir="/usr/local/DB_CLIENT_NAME/cfg"
bin_link_dir="/usr/bin" bin_link_dir="/usr/bin"
lib_link_dir="/usr/lib" lib_link_dir="/usr/lib"
inc_link_dir="/usr/include" inc_link_dir="/usr/include"
...@@ -25,7 +25,7 @@ install_nginxd_dir="/usr/local/nginxd" ...@@ -25,7 +25,7 @@ install_nginxd_dir="/usr/local/nginxd"
v15_java_app_dir="/usr/local/lib/taos" v15_java_app_dir="/usr/local/lib/taos"
service_config_dir="/etc/systemd/system" service_config_dir="/etc/systemd/system"
taos_service_name="taosd" DB_CLIENT_NAME_service_name="DB_SERVICE_NAME"
nginx_service_name="nginxd" nginx_service_name="nginxd"
csudo="" csudo=""
if command -v sudo > /dev/null; then if command -v sudo > /dev/null; then
...@@ -52,8 +52,8 @@ else ...@@ -52,8 +52,8 @@ else
service_mod=2 service_mod=2
fi fi
function kill_taosd() { function kill_DB_SERVICE_NAME() {
pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}') pid=$(ps -ef | grep "DB_SERVICE_NAME" | grep -v "grep" | awk '{print $2}')
if [ -n "$pid" ]; then if [ -n "$pid" ]; then
${csudo} kill -9 $pid || : ${csudo} kill -9 $pid || :
fi fi
...@@ -61,11 +61,11 @@ function kill_taosd() { ...@@ -61,11 +61,11 @@ function kill_taosd() {
function clean_bin() { function clean_bin() {
# Remove link # Remove link
${csudo} rm -f ${bin_link_dir}/taos || : ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAME || :
${csudo} rm -f ${bin_link_dir}/taosd || : ${csudo} rm -f ${bin_link_dir}/DB_SERVICE_NAME || :
${csudo} rm -f ${bin_link_dir}/taosdemo || : ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdemo || :
${csudo} rm -f ${bin_link_dir}/taosdump || : ${csudo} rm -f ${bin_link_dir}/DB_CLIENT_NAMEdump || :
${csudo} rm -f ${bin_link_dir}/rmtaos || : ${csudo} rm -f ${bin_link_dir}/rmDB_CLIENT_NAME || :
} }
function clean_lib() { function clean_lib() {
...@@ -91,22 +91,22 @@ function clean_log() { ...@@ -91,22 +91,22 @@ function clean_log() {
} }
function clean_service_on_systemd() { function clean_service_on_systemd() {
taosd_service_config="${service_config_dir}/${taos_service_name}.service" DB_SERVICE_NAME_service_config="${service_config_dir}/${DB_CLIENT_NAME_service_name}.service"
if systemctl is-active --quiet ${taos_service_name}; then if systemctl is-active --quiet ${DB_CLIENT_NAME_service_name}; then
echo "TDengine taosd is running, stopping it..." echo "DB_FULL_NAME DB_SERVICE_NAME is running, stopping it..."
${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null ${csudo} systemctl stop ${DB_CLIENT_NAME_service_name} &> /dev/null || echo &> /dev/null
fi fi
${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null ${csudo} systemctl disable ${DB_CLIENT_NAME_service_name} &> /dev/null || echo &> /dev/null
${csudo} rm -f ${taosd_service_config} ${csudo} rm -f ${DB_SERVICE_NAME_service_config}
if [ "$verMode" == "cluster" ]; then if [ "$verMode" == "cluster" ]; then
nginx_service_config="${service_config_dir}/${nginx_service_name}.service" nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
if [ -d ${bin_dir}/web ]; then if [ -d ${bin_dir}/web ]; then
if systemctl is-active --quiet ${nginx_service_name}; then if systemctl is-active --quiet ${nginx_service_name}; then
echo "Nginx for TDengine is running, stopping it..." echo "Nginx for DB_FULL_NAME is running, stopping it..."
${csudo} systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null ${csudo} systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
fi fi
${csudo} systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null ${csudo} systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
...@@ -117,23 +117,23 @@ function clean_service_on_systemd() { ...@@ -117,23 +117,23 @@ function clean_service_on_systemd() {
} }
function clean_service_on_sysvinit() { function clean_service_on_sysvinit() {
#restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start" #restart_config_str="DB_CLIENT_NAME:2345:respawn:${service_config_dir}/DB_SERVICE_NAME start"
#${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || : #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
if pidof taosd &> /dev/null; then if pidof DB_SERVICE_NAME &> /dev/null; then
echo "TDengine taosd is running, stopping it..." echo "DB_FULL_NAME DB_SERVICE_NAME is running, stopping it..."
${csudo} service taosd stop || : ${csudo} service DB_SERVICE_NAME stop || :
fi fi
if ((${initd_mod}==1)); then if ((${initd_mod}==1)); then
${csudo} chkconfig --del taosd || : ${csudo} chkconfig --del DB_SERVICE_NAME || :
elif ((${initd_mod}==2)); then elif ((${initd_mod}==2)); then
${csudo} insserv -r taosd || : ${csudo} insserv -r DB_SERVICE_NAME || :
elif ((${initd_mod}==3)); then elif ((${initd_mod}==3)); then
${csudo} update-rc.d -f taosd remove || : ${csudo} update-rc.d -f DB_SERVICE_NAME remove || :
fi fi
${csudo} rm -f ${service_config_dir}/taosd || : ${csudo} rm -f ${service_config_dir}/DB_SERVICE_NAME || :
if $(which init &> /dev/null); then if $(which init &> /dev/null); then
${csudo} init q || : ${csudo} init q || :
...@@ -146,8 +146,8 @@ function clean_service() { ...@@ -146,8 +146,8 @@ function clean_service() {
elif ((${service_mod}==1)); then elif ((${service_mod}==1)); then
clean_service_on_sysvinit clean_service_on_sysvinit
else else
# must manual stop taosd # must manual stop DB_SERVICE_NAME
kill_taosd kill_DB_SERVICE_NAME
fi fi
} }
...@@ -178,4 +178,4 @@ elif echo $osinfo | grep -qwi "centos" ; then ...@@ -178,4 +178,4 @@ elif echo $osinfo | grep -qwi "centos" ; then
${csudo} rpm -e --noscripts tdengine || : ${csudo} rpm -e --noscripts tdengine || :
fi fi
echo -e "${GREEN}TDengine is removed successfully!${NC}" echo -e "${GREEN}DB_FULL_NAME is removed successfully!${NC}"
src/kit/shell/CMakeLists.txt
浏览文件 @ feea8174
...@@ -18,7 +18,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -18,7 +18,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
TARGET_LINK_LIBRARIES(shell taos_static) TARGET_LINK_LIBRARIES(shell taos_static)
ENDIF () ENDIF ()
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos) SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME ${DB_CLIENT_NAME})
ELSEIF (TD_WINDOWS_64) ELSEIF (TD_WINDOWS_64)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
...@@ -27,7 +27,7 @@ ELSEIF (TD_WINDOWS_64) ...@@ -27,7 +27,7 @@ ELSEIF (TD_WINDOWS_64)
LIST(APPEND SRC ./src/shellWindows.c) LIST(APPEND SRC ./src/shellWindows.c)
ADD_EXECUTABLE(shell ${SRC}) ADD_EXECUTABLE(shell ${SRC})
TARGET_LINK_LIBRARIES(shell taos_static) TARGET_LINK_LIBRARIES(shell taos_static)
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos) SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME ${DB_CLIENT_NAME})
ELSEIF (TD_DARWIN_64) ELSEIF (TD_DARWIN_64)
LIST(APPEND SRC ./src/shellEngine.c) LIST(APPEND SRC ./src/shellEngine.c)
LIST(APPEND SRC ./src/shellMain.c) LIST(APPEND SRC ./src/shellMain.c)
...@@ -36,6 +36,6 @@ ELSEIF (TD_DARWIN_64) ...@@ -36,6 +36,6 @@ ELSEIF (TD_DARWIN_64)
LIST(APPEND SRC ./src/shellImport.c) LIST(APPEND SRC ./src/shellImport.c)
ADD_EXECUTABLE(shell ${SRC}) ADD_EXECUTABLE(shell ${SRC})
TARGET_LINK_LIBRARIES(shell taos_static) TARGET_LINK_LIBRARIES(shell taos_static)
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos) SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME ${DB_CLIENT_NAME})
ENDIF () ENDIF ()
src/kit/taosdemo/CMakeLists.txt
浏览文件 @ feea8174
...@@ -8,12 +8,12 @@ INCLUDE_DIRECTORIES(inc) ...@@ -8,12 +8,12 @@ INCLUDE_DIRECTORIES(inc)
IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
AUX_SOURCE_DIRECTORY(. SRC) AUX_SOURCE_DIRECTORY(. SRC)
ADD_EXECUTABLE(taosdemo ${SRC}) ADD_EXECUTABLE(${DB_CLIENT_NAME}demo ${SRC})
IF (TD_PAGMODE_LITE) IF (TD_PAGMODE_LITE)
TARGET_LINK_LIBRARIES(taosdemo taos) TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}demo taos)
ELSE () ELSE ()
TARGET_LINK_LIBRARIES(taosdemo taos_static) TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}demo taos_static)
ENDIF () ENDIF ()
ENDIF () ENDIF ()
src/kit/taosdump/CMakeLists.txt
浏览文件 @ feea8174
...@@ -8,12 +8,12 @@ INCLUDE_DIRECTORIES(inc) ...@@ -8,12 +8,12 @@ INCLUDE_DIRECTORIES(inc)
IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
AUX_SOURCE_DIRECTORY(. SRC) AUX_SOURCE_DIRECTORY(. SRC)
ADD_EXECUTABLE(taosdump ${SRC}) ADD_EXECUTABLE(${DB_CLIENT_NAME}dump ${SRC})
# IF (TD_PAGMODE_LITE) # IF (TD_PAGMODE_LITE)
TARGET_LINK_LIBRARIES(taosdump taos) TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}dump taos)
# ELSE () # ELSE ()
# TARGET_LINK_LIBRARIES(taosdump taos_static) # TARGET_LINK_LIBRARIES(${DB_CLIENT_NAME}dump taos_static)
# ENDIF () # ENDIF ()
......
src/system/detail/CMakeLists.txt
浏览文件 @ feea8174
...@@ -14,18 +14,18 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -14,18 +14,18 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
LIST(REMOVE_ITEM SRC ./src/vnodeFileUtil.c) LIST(REMOVE_ITEM SRC ./src/vnodeFileUtil.c)
LIST(REMOVE_ITEM SRC ./src/taosGrant.c) LIST(REMOVE_ITEM SRC ./src/taosGrant.c)
ADD_EXECUTABLE(taosd ${SRC}) ADD_EXECUTABLE(${DB_SERVICE_NAME} ${SRC})
IF (TD_PAGMODE_LITE) IF (TD_PAGMODE_LITE)
TARGET_LINK_LIBRARIES(taosd taos trpc tutil sdb monitor pthread http) TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taos trpc tutil sdb monitor pthread http)
ELSE () ELSE ()
TARGET_LINK_LIBRARIES(taosd taos_static trpc tutil sdb monitor pthread http) TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taos_static trpc tutil sdb monitor pthread http)
ENDIF () ENDIF ()
IF (TD_EDGE) IF (TD_EDGE)
TARGET_LINK_LIBRARIES(taosd taosd_edge) TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taosd_edge)
ELSE () ELSE ()
TARGET_LINK_LIBRARIES(taosd taosd_cluster) TARGET_LINK_LIBRARIES(${DB_SERVICE_NAME} taosd_cluster)
ENDIF () ENDIF ()
SET(PREPARE_ENV_CMD "prepare_env_cmd") SET(PREPARE_ENV_CMD "prepare_env_cmd")
...@@ -33,14 +33,14 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -33,14 +33,14 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD} ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
POST_BUILD POST_BUILD
COMMAND echo "make test directory" COMMAND echo "make test directory"
DEPENDS taosd DEPENDS ${DB_SERVICE_NAME}
COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/ COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/ COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/ COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
COMMENT "prepare taosd environment") COMMENT "prepare ${DB_SERVICE_NAME} environment")
ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD}) ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
ENDIF () ENDIF ()
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或