diff --git a/packaging/install.sh b/packaging/install.sh index 9ce7fc326a9685aa40ad3a08b70f78656770c792..740d356f800bc214d4ff378c2097d98db5d16bdc 100755 --- a/packaging/install.sh +++ b/packaging/install.sh @@ -30,6 +30,15 @@ bin_dir="/usr/local/taos/bin" service_config_dir="/etc/systemd/system" +#taos-tools para +demoName="taosdemo" +benchmarkName="taosBenchmark" +dumpName="taosdump" +emailName="taosdata.com" +taosName="taos" +toolsName="taostools" + + # Color setting RED='\033[0;31m' GREEN='\033[1;32m' @@ -230,8 +239,20 @@ function install_header() { # temp install taosBenchmark function install_taosTools() { - cd ${script_dir}/taos-tools/ - tar xvf taosTools-1.4.1-Linux-x64.tar.gz && cd taosTools-1.4.1/ && ./install-taostools.sh + ${csudo} rm -f ${bin_link_dir}/${benchmarkName} || : + ${csudo} rm -f ${bin_link_dir}/${dumpName} || : + ${csudo} rm -f ${bin_link_dir}/rm${toolsName} || : + + ${csudo} /usr/bin/install -c -m 755 ${script_dir}/bin/${dumpName} ${install_main_dir}/bin/${dumpName} + ${csudo} /usr/bin/install -c -m 755 ${script_dir}/bin/${benchmarkName} ${install_main_dir}/bin/${benchmarkName} + ${csudo} ln -sf ${install_main_dir}/bin/${benchmarkName} ${install_main_dir}/bin/${demoName} + #Make link + [[ -x ${install_main_dir}/bin/${benchmarkName} ]] && \ + ${csudo} ln -s ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${benchmarkName} || : + [[ -x ${install_main_dir}/bin/${demoName} ]] && \ + ${csudo} ln -s ${install_main_dir}/bin/${demoName} ${bin_link_dir}/${demoName} || : + [[ -x ${install_main_dir}/bin/${dumpName} ]] && \ + ${csudo} ln -s ${install_main_dir}/bin/${dumpName} ${bin_link_dir}/${dumpName} || : } function add_newHostname_to_hosts() { diff --git a/packaging/release.sh b/packaging/release.sh index adf1195e5654bc48a021362c7e82426a2a4e8f11..a56d991bf889800ffbc5954e20fb1ebd28127b77 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -39,7 +39,7 @@ cd ${compile_dir} echo "compile_dir: ${compile_dir}" -cmake .. +cmake .. -DBUILD_TOOLS=true make -j32 release_dir="${top_dir}/release" @@ -55,7 +55,6 @@ mkdir -p ${install_dir} mkdir -p ${install_dir}/bin mkdir -p ${install_dir}/lib mkdir -p ${install_dir}/inc -mkdir -p ${install_dir}/taos-tools install_files="${script_dir}/install.sh" chmod a+x ${script_dir}/install.sh || : @@ -64,13 +63,14 @@ cp ${install_files} ${install_dir} header_files="${top_dir}/include/client/taos.h ${top_dir}/include/util/taoserror.h" cp ${header_files} ${install_dir}/inc -bin_files="${compile_dir}/build/bin/taosd ${compile_dir}/build/bin/taos ${compile_dir}/build/bin/create_table ${compile_dir}/build/bin/tmq_sim ${script_dir}/remove.sh" -cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || : +bin_files="${compile_dir}/source/dnode/mgmt/taosd ${compile_dir}/tools/shell/taos ${compile_dir}/tests/test/c/create_table ${compile_dir}/tests/test/c/tmq_sim ${script_dir}/remove.sh ${compile_dir}/build/bin/taosBenchmark ${compile_dir}/build/bin/taosdump" +cp -rf ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || : + +cp -rf ${compile_dir}/source/client/libtaos.so ${install_dir}/lib/ +cp -rf ${compile_dir}/source/libs/tdb/libtdb.so ${install_dir}/lib/ +cp -rf ${compile_dir}/build/lib/libavro* ${install_dir}/lib/ > /dev/null || echo -e "failed to copy avro libraries" +cp -rf ${compile_dir}/build/lib/pkgconfig ${install_dir}/lib/ > /dev/null || echo -e "failed to copy pkgconfig directory" -cp ${compile_dir}/build/lib/libtaos.so ${install_dir}/lib/ -cp ${compile_dir}/build/lib/libtdb.so ${install_dir}/lib/ -taostoolfile="${top_dir}/tools/taosTools-1.4.1-Linux-x64.tar.gz" -cp ${taostoolfile} ${install_dir}/taos-tools #cp ${compile_dir}/source/dnode/mnode/impl/libmnode.so ${install_dir}/lib/ #cp ${compile_dir}/source/dnode/qnode/libqnode.so ${install_dir}/lib/