From 3e69309401cc5166f148f113c0ef6e1dec7e4e1b Mon Sep 17 00:00:00 2001 From: Hui Li Date: Tue, 1 Sep 2020 16:11:41 +0800 Subject: [PATCH] [do not get version info using get_version.sh] --- packaging/tools/install_arbi_power.sh | 0 packaging/tools/install_client_power.sh | 0 packaging/tools/install_power.sh | 0 packaging/tools/make_install.sh | 11 +++++------ packaging/tools/makearbi_power.sh | 0 packaging/tools/makeclient_power.sh | 0 packaging/tools/makepkg_power.sh | 0 packaging/tools/remove_arbi_power.sh | 0 packaging/tools/remove_client_power.sh | 0 packaging/tools/remove_power.sh | 0 10 files changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 packaging/tools/install_arbi_power.sh mode change 100644 => 100755 packaging/tools/install_client_power.sh mode change 100644 => 100755 packaging/tools/install_power.sh mode change 100644 => 100755 packaging/tools/makearbi_power.sh mode change 100644 => 100755 packaging/tools/makeclient_power.sh mode change 100644 => 100755 packaging/tools/makepkg_power.sh mode change 100644 => 100755 packaging/tools/remove_arbi_power.sh mode change 100644 => 100755 packaging/tools/remove_client_power.sh mode change 100644 => 100755 packaging/tools/remove_power.sh diff --git a/packaging/tools/install_arbi_power.sh b/packaging/tools/install_arbi_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/install_client_power.sh b/packaging/tools/install_client_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/install_power.sh b/packaging/tools/install_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh index 74aa1495fe..6ee3b75c55 100755 --- a/packaging/tools/make_install.sh +++ b/packaging/tools/make_install.sh @@ -179,19 +179,18 @@ function install_lib() { ${csudo} rm -f ${lib_link_dir}/libtaos.* || : ${csudo} rm -f ${lib64_link_dir}/libtaos.* || : - versioninfo=$(${script_dir}/get_version.sh ${source_dir}/src/util/src/version.c) if [ "$osType" != "Darwin" ]; then - ${csudo} cp ${binary_dir}/build/lib/libtaos.so.${versioninfo} ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* - ${csudo} ln -sf ${install_main_dir}/driver/libtaos.so.${versioninfo} ${lib_link_dir}/libtaos.so.1 + ${csudo} cp ${binary_dir}/build/lib/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* + ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1 ${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so if [ -d "${lib64_link_dir}" ]; then - ${csudo} ln -sf ${install_main_dir}/driver/libtaos.so.${versioninfo} ${lib64_link_dir}/libtaos.so.1 + ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 ${csudo} ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so fi else - ${csudo} cp ${binary_dir}/build/lib/libtaos.${versioninfo}.dylib ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* - ${csudo} ln -sf ${install_main_dir}/driver/libtaos.${versioninfo}.dylib ${lib_link_dir}/libtaos.1.dylib + ${csudo} cp ${binary_dir}/build/lib/libtaos.* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* + ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib ${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib fi diff --git a/packaging/tools/makearbi_power.sh b/packaging/tools/makearbi_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/makeclient_power.sh b/packaging/tools/makeclient_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/makepkg_power.sh b/packaging/tools/makepkg_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/remove_arbi_power.sh b/packaging/tools/remove_arbi_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/remove_client_power.sh b/packaging/tools/remove_client_power.sh old mode 100644 new mode 100755 diff --git a/packaging/tools/remove_power.sh b/packaging/tools/remove_power.sh old mode 100644 new mode 100755 -- GitLab