From 59bd9886abb48e1710ac3e343285cdaecf4be2c1 Mon Sep 17 00:00:00 2001 From: zyyang Date: Wed, 9 Feb 2022 16:47:39 +0800 Subject: [PATCH] [TS-1184]: windows 32bit release script modify --- packaging/release.bat | 31 +++++++++++++++++++++++-------- packaging/sed_jh.bat | 20 -------------------- packaging/sed_kh.bat | 20 -------------------- 3 files changed, 23 insertions(+), 48 deletions(-) diff --git a/packaging/release.bat b/packaging/release.bat index c1cf7875a5..289ab06b2f 100644 --- a/packaging/release.bat +++ b/packaging/release.bat @@ -6,9 +6,10 @@ cd %community_dir% git checkout -- . cd %community_dir%\packaging -:: %1 name %2 version +:: %1 name %2 version %3 cpuType if !%1==! GOTO USAGE if !%2==! GOTO USAGE +if !%3==! GOTO USAGE if %1 == taos GOTO TAOS if %1 == power GOTO POWER if %1 == tq GOTO TQ @@ -41,22 +42,36 @@ call sed_jh.bat %community_dir% goto RELEASE :RELEASE -echo release windows-client-64 for %1, version: %2 -if not exist %internal_dir%\debug\ver-%2-64bit-%1 ( - md %internal_dir%\debug\ver-%2-64bit-%1 +echo release windows-client for %1, version: %2, cpyType: %3 +if not exist %internal_dir%\debug\ver-%2-%1-%3 ( + md %internal_dir%\debug\ver-%2-%1-%3 ) else ( - rd /S /Q %internal_dir%\debug\ver-%2-64bit-%1 - md %internal_dir%\debug\ver-%2-64bit-%1 + rd /S /Q %internal_dir%\debug\ver-%2-%1-%3 + md %internal_dir%\debug\ver-%2-%1-%3 ) -cd %internal_dir%\debug\ver-%2-64bit-%1 +cd %internal_dir%\debug\ver-%2-%1-%3 + +if %3% == x64 GOTO X64 +if %3% == x86 GOTO X86 +GOTO USAGE + +:X86 +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +cmake ../../ -G "NMake Makefiles" -DVERNUMBER=%2 -DCPUTYPE=x86 +GOTO MAKE_AND_INSTALL + +:X64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 cmake ../../ -G "NMake Makefiles" -DVERNUMBER=%2 -DCPUTYPE=x64 +GOTO MAKE_AND_INSTALL + +:MAKE_AND_INSTALL set CL=/MP4 nmake install goto EXIT0 :USAGE -echo Usage: release.bat $productName $version +echo Usage: release.bat $productName $version $cpuType goto EXIT0 :EXIT0 \ No newline at end of file diff --git a/packaging/sed_jh.bat b/packaging/sed_jh.bat index f7ce46562c..290715c6bf 100644 --- a/packaging/sed_jh.bat +++ b/packaging/sed_jh.bat @@ -17,20 +17,6 @@ set community_dir=%1 ::src\util\src\tconfig.c %sed% -i "s/taos\.cfg/jh_taos\.cfg/g" %community_dir%\src\util\src\tconfig.c %sed% -i "s/etc\/taos/etc\/jh_taos/g" %community_dir%\src\util\src\tconfig.c -::src\kit\taosdemo\CMakeLists.txt -%sed% -i "s/ADD_EXECUTABLE(taosdemo/ADD_EXECUTABLE(jhdemo/g" %community_dir%\src\kit\taosdemo\CMakeLists.txt -%sed% -i "s/TARGET_LINK_LIBRARIES(taosdemo/TARGET_LINK_LIBRARIES(jhdemo/g" %community_dir%\src\kit\taosdemo\CMakeLists.txt -::src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo --help/jhdemo --help/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo --usage/jhdemo --usage/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/Usage: taosdemo/Usage: jhdemo/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo is simulating/jhdemo is simulating/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo version/jhdemo version/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/\"taosdata\"/\"jhdata\"/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/support@taosdata\.com/jhkj@njsteel\.com\.cn/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosc, rest, and stmt/jh_taos, rest, and stmt/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo uses/jhdemo uses/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/use 'taosc'/use 'jh_taos'/g" %community_dir%\src\kit\taosdemo\taosdemo.c ::src\util\src\tlog.c %sed% -i "s/log\/taos/log\/jh_taos/g" %community_dir%\src\util\src\tlog.c ::src\dnode\src\dnodeSystem.c @@ -44,12 +30,6 @@ set community_dir=%1 %sed% -i "s/taosinfo/jh_taosinfo/g" %community_dir%\src\util\src\tnote.c ::src\dnode\CMakeLists.txt %sed% -i "s/taos\.cfg/jh_taos\.cfg/g" %community_dir%\src\dnode\CMakeLists.txt -::src\kit\taosdump\taosdump.c -%sed% -i "s/support@taosdata\.com/jhkj@njsteel\.com\.cn/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/Default is taosdata/Default is jhdata/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/\"taosdata\"/\"jhdata\"/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/TDengine/jh_iot/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/taos\/taos\.cfg/jh_taos\/jh_taos\.cfg/g" %community_dir%\src\kit\taosdump\taosdump.c ::src\os\src\linux\linuxEnv.c %sed% -i "s/etc\/taos/etc\/jh_taos/g" %community_dir%\src\os\src\linux\linuxEnv.c %sed% -i "s/lib\/taos/lib\/jh_taos/g" %community_dir%\src\os\src\linux\linuxEnv.c diff --git a/packaging/sed_kh.bat b/packaging/sed_kh.bat index 975bdbbcc0..1be0229d04 100644 --- a/packaging/sed_kh.bat +++ b/packaging/sed_kh.bat @@ -17,20 +17,6 @@ set community_dir=%1 ::src\util\src\tconfig.c %sed% -i "s/taos\.cfg/kinghistorian\.cfg/g" %community_dir%\src\util\src\tconfig.c %sed% -i "s/etc\/taos/etc\/kinghistorian/g" %community_dir%\src\util\src\tconfig.c -::src\kit\taosdemo\CMakeLists.txt -%sed% -i "s/ADD_EXECUTABLE(taosdemo/ADD_EXECUTABLE(khdemo/g" %community_dir%\src\kit\taosdemo\CMakeLists.txt -%sed% -i "s/TARGET_LINK_LIBRARIES(taosdemo/TARGET_LINK_LIBRARIES(khdemo/g" %community_dir%\src\kit\taosdemo\CMakeLists.txt -::src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo --help/khdemo --help/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo --usage/khdemo --usage/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/Usage: taosdemo/Usage: khdemo/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo is simulating/khdemo is simulating/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo version/khdemo version/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/\"taosdata\"/\"khroot\"/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/support@taosdata\.com/support@wellintech\.com/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosc, rest, and stmt/khclient, rest, and stmt/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/taosdemo uses/khdemo uses/g" %community_dir%\src\kit\taosdemo\taosdemo.c -%sed% -i "s/use 'taosc'/use 'khclient'/g" %community_dir%\src\kit\taosdemo\taosdemo.c ::src\util\src\tlog.c %sed% -i "s/log\/taos/log\/kinghistorian/g" %community_dir%\src\util\src\tlog.c ::src\dnode\src\dnodeSystem.c @@ -44,12 +30,6 @@ set community_dir=%1 %sed% -i "s/taosinfo/khinfo/g" %community_dir%\src\util\src\tnote.c ::src\dnode\CMakeLists.txt %sed% -i "s/taos\.cfg/kinghistorian\.cfg/g" %community_dir%\src\dnode\CMakeLists.txt -::src\kit\taosdump\taosdump.c -%sed% -i "s/support@taosdata\.com/support@wellintech\.com/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/Default is taosdata/Default is khroot/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/\"taosdata\"/\"khroot\"/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/TDengine/KingHistorian/g" %community_dir%\src\kit\taosdump\taosdump.c -%sed% -i "s/taos\/taos\.cfg/kinghistorian\/kinghistorian\.cfg/g" %community_dir%\src\kit\taosdump\taosdump.c ::src\os\src\linux\linuxEnv.c %sed% -i "s/etc\/taos/etc\/kinghistorian/g" %community_dir%\src\os\src\linux\linuxEnv.c %sed% -i "s/lib\/taos/lib\/kinghistorian/g" %community_dir%\src\os\src\linux\linuxEnv.c -- GitLab