From 5ab467451d1f8d89ee41da4e9daab88d0151cbc7 Mon Sep 17 00:00:00 2001 From: Hui Li Date: Tue, 1 Sep 2020 15:19:20 +0800 Subject: [PATCH 1/3] [modify taosc name for oem power] --- cmake/install.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/install.inc b/cmake/install.inc index 8016f23808..40b29973e1 100755 --- a/cmake/install.inc +++ b/cmake/install.inc @@ -19,8 +19,14 @@ ELSEIF (TD_WINDOWS) INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taos.h DESTINATION include) INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver) INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver) - INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver) - INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .) + INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver) + + IF (TD_POWER) + INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/power.exe DESTINATION .) + ELSE () + INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .) + ENDIF () + #INSTALL(TARGETS taos RUNTIME DESTINATION driver) #INSTALL(TARGETS shell RUNTIME DESTINATION .) IF (TD_MVN_INSTALLED) From 030d1fa459b5c43a158de85b5c5c8f2708ab03a0 Mon Sep 17 00:00:00 2001 From: Hui Li Date: Tue, 1 Sep 2020 15:40:20 +0800 Subject: [PATCH 2/3] [modify taosc name for oem power] --- src/kit/shell/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/kit/shell/CMakeLists.txt b/src/kit/shell/CMakeLists.txt index 0305d9f1cc..c86cac281c 100644 --- a/src/kit/shell/CMakeLists.txt +++ b/src/kit/shell/CMakeLists.txt @@ -24,7 +24,12 @@ ELSEIF (TD_WINDOWS) LIST(APPEND SRC ./src/shellWindows.c) ADD_EXECUTABLE(shell ${SRC}) TARGET_LINK_LIBRARIES(shell taos_static) - SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos) + + IF (TD_POWER) + SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME power) + ELSE () + SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos) + ENDIF () ELSEIF (TD_DARWIN) LIST(APPEND SRC ./src/shellEngine.c) LIST(APPEND SRC ./src/shellMain.c) From 3e69309401cc5166f148f113c0ef6e1dec7e4e1b Mon Sep 17 00:00:00 2001 From: Hui Li Date: Tue, 1 Sep 2020 16:11:41 +0800 Subject: [PATCH 3/3] [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