From 1efed1e01b13291e64cb5f1727d468fcf9a5b8b0 Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Sat, 16 Nov 2019 13:37:05 +0800
Subject: [PATCH] [add taoserror.h]

---
 packaging/deb/makedeb.sh        | 1 +
 packaging/rpm/tdengine.spec     | 2 ++
 packaging/tools/install.sh      | 3 ++-
 packaging/tools/make_install.sh | 5 +++--
 packaging/tools/post.sh         | 3 ++-
 packaging/tools/preun.sh        | 1 +
 packaging/tools/remove.sh       | 1 +
 7 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index d54953113a..e4c795f1b8 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -49,6 +49,7 @@ cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_pat
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_path}/driver 
 cp ${compile_dir}/../src/inc/taos.h                 ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../src/inc/taoserror.h            ${pkg_dir}${install_home_path}/include
 cp -r ${top_dir}/tests/examples/*                   ${pkg_dir}${install_home_path}/examples
 cp -r ${top_dir}/src/connector/grafana              ${pkg_dir}${install_home_path}/connector
 cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector
diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
index 6e9e5e6f87..9ede4102e7 100644
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -62,6 +62,7 @@ cp %{_compiledir}/build/bin/taosdemo                %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosdump                %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driver
 cp %{_compiledir}/../src/inc/taos.h                 %{buildroot}%{homepath}/include
+cp %{_compiledir}/../src/inc/taoserror.h            %{buildroot}%{homepath}/include
 cp -r %{_compiledir}/../src/connector/grafana       %{buildroot}%{homepath}/connector
 cp -r %{_compiledir}/../src/connector/python        %{buildroot}%{homepath}/connector
 cp -r %{_compiledir}/../src/connector/go            %{buildroot}%{homepath}/connector
@@ -138,6 +139,7 @@ if [ $1 -eq 0 ];then
     ${csudo} rm -f ${bin_link_dir}/taosdump   || :
     ${csudo} rm -f ${cfg_link_dir}/*          || :
     ${csudo} rm -f ${inc_link_dir}/taos.h     || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h     || :
     ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
     
     ${csudo} rm -f ${log_link_dir}            || :
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index acd6c6ccce..4b653dec9c 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -98,9 +98,10 @@ function install_lib() {
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h     || :    
+    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :    
     ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
     ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_config() {
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 4660ba5b2a..c43f918e8d 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -109,9 +109,10 @@ function install_lib() {
 
 function install_header() {
 
-    ${csudo} rm -f ${inc_link_dir}/taos.h     || :    
-    ${csudo} cp -f ${source_dir}/src/inc/taos.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
+    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :    
+    ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
     ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_config() {
diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh
index 9e18783657..11f3ab9a9b 100755
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -61,8 +61,9 @@ function kill_taosd() {
 }
 
 function install_include() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h || :
+    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h|| :
     ${csudo} ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h  
+    ${csudo} ln -s ${inc_dir}/taoserror.h ${inc_link_dir}/taoserror.h  
 }
 
 function install_lib() {
diff --git a/packaging/tools/preun.sh b/packaging/tools/preun.sh
index 4566db1b5a..a08f4e304e 100755
--- a/packaging/tools/preun.sh
+++ b/packaging/tools/preun.sh
@@ -94,6 +94,7 @@ ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
 ${csudo} rm -f ${bin_link_dir}/taosdump   || :
 ${csudo} rm -f ${cfg_link_dir}/*          || :
 ${csudo} rm -f ${inc_link_dir}/taos.h     || :
+${csudo} rm -f ${inc_link_dir}/taoserror.h     || :
 ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
 
 ${csudo} rm -f ${log_link_dir}            || :
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 4ada19762c..6c2c6d5ea8 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -61,6 +61,7 @@ function clean_lib() {
 function clean_header() {
     # Remove link
     ${csudo} rm -f ${inc_link_dir}/taos.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h       || :
 }
 
 function clean_config() {
-- 
GitLab