提交 6dc005b8 编写于 作者: L lihui

[TD-20]

上级 2a961afa
...@@ -157,6 +157,9 @@ function install_lib() { ...@@ -157,6 +157,9 @@ function install_lib() {
${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
if [ "$verMode" == "cluster" ]; then if [ "$verMode" == "cluster" ]; then
${csudo} rm -f ${lib_link_dir}/libtaosodbc.* || :
${csudo} ln -s ${install_main_dir}/driver/libtaosodbc.so ${lib_link_dir}/libtaosodbc.so || :
# Compatible with version 1.5 # Compatible with version 1.5
${csudo} mkdir -p ${v15_java_app_dir} ${csudo} mkdir -p ${v15_java_app_dir}
${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar ${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar
......
...@@ -10,6 +10,7 @@ set -e ...@@ -10,6 +10,7 @@ set -e
osType=Linux osType=Linux
pagMode=full pagMode=full
verMode=edge
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
script_dir=$(dirname $(readlink -f "$0")) script_dir=$(dirname $(readlink -f "$0"))
...@@ -113,6 +114,11 @@ function install_lib() { ...@@ -113,6 +114,11 @@ function install_lib() {
if [ "$osType" != "Darwin" ]; then if [ "$osType" != "Darwin" ]; then
${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1 ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
if [ "$verMode" == "cluster" ]; then
${csudo} rm -f ${lib_link_dir}/libtaosodbc.* || :
${csudo} ln -s ${install_main_dir}/driver/libtaosodbc.so ${lib_link_dir}/libtaosodbc.so || :
fi
else else
${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
......
...@@ -65,7 +65,12 @@ if [ "$osType" != "Darwin" ]; then ...@@ -65,7 +65,12 @@ if [ "$osType" != "Darwin" ]; then
else else
bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${build_dir}/bin/${DB_CLIENT_NAME}dump ${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
if [ "$verMode" == "cluster" ]; then
lib_files="${build_dir}/lib/libtaos.so.${version} ${build_dir}/lib/libtaosodbc.so"
else
lib_files="${build_dir}/lib/libtaos.so.${version}" lib_files="${build_dir}/lib/libtaos.so.${version}"
fi
else else
bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${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"
...@@ -108,6 +113,11 @@ if [ "$pagMode" == "lite" ]; then ...@@ -108,6 +113,11 @@ if [ "$pagMode" == "lite" ]; then
mv install_client_temp.sh ${install_dir}/install_client.sh mv install_client_temp.sh ${install_dir}/install_client.sh
fi fi
if [ "$verMode" == "cluster" ]; then
sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install_client.sh >> install_client_temp.sh
mv install_client_temp.sh ${install_dir}/install_client.sh
fi
sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g" ${install_dir}/install_client.sh 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_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 sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g" ${install_dir}/install_client.sh
......
...@@ -57,7 +57,12 @@ else ...@@ -57,7 +57,12 @@ else
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" 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}" if [ "$verMode" == "cluster" ]; then
lib_files="${build_dir}/lib/libtaos.so.${version} ${build_dir}/lib/libtaosodbc.so"
else
lib_files="${build_dir}/lib/libtaos.so.${version}"
fi
header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h" header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
cfg_dir="${top_dir}/packaging/cfg" cfg_dir="${top_dir}/packaging/cfg"
install_files="${script_dir}/install.sh" install_files="${script_dir}/install.sh"
......
...@@ -71,6 +71,7 @@ function clean_bin() { ...@@ -71,6 +71,7 @@ function clean_bin() {
function clean_lib() { function clean_lib() {
# Remove link # Remove link
${csudo} rm -f ${lib_link_dir}/libtaos.* || : ${csudo} rm -f ${lib_link_dir}/libtaos.* || :
${csudo} rm -f ${lib_link_dir}/libtaosodbc.* || :
${csudo} rm -rf ${v15_java_app_dir} || : ${csudo} rm -rf ${v15_java_app_dir} || :
} }
......
...@@ -43,6 +43,7 @@ function clean_bin() { ...@@ -43,6 +43,7 @@ function clean_bin() {
function clean_lib() { function clean_lib() {
# Remove link # Remove link
${csudo} rm -f ${lib_link_dir}/libtaos.* || : ${csudo} rm -f ${lib_link_dir}/libtaos.* || :
${csudo} rm -f ${lib_link_dir}/libtaosodbc.* || :
${csudo} rm -rf ${v15_java_app_dir} || : ${csudo} rm -rf ${v15_java_app_dir} || :
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册