xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #22430 from taosdata/fix/TD-25622-3.0x 

fix: use taos_static for tmq_sim on windows
This commit is contained in:
dapan1121 2023-08-15 09:54:57 +08:00 committed by GitHub
parent f9f74eaaf4 8d0461e98c
commit 937dcf00bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/cmake.define
View File

@ -78,6 +78,12 @@ ELSE ()
SET(TD_TAOS_TOOLS TRUE) SET(TD_TAOS_TOOLS TRUE)
ENDIF () ENDIF ()
IF (${TD_WINDOWS})
SET(TAOS_LIB taos_static)
ELSE ()
SET(TAOS_LIB taos)
ENDIF ()
IF (TD_WINDOWS) IF (TD_WINDOWS)
MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}") MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd") SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd")

14
tests/script/wtest.bat
View File

@ -17,6 +17,9 @@ rem echo SIM_DIR: %SIM_DIR%
set "TSIM_DIR=%SIM_DIR%tsim\" set "TSIM_DIR=%SIM_DIR%tsim\"
rem echo TSIM_DIR: %TSIM_DIR% rem echo TSIM_DIR: %TSIM_DIR%
set "DATA_DIR=%TSIM_DIR%data\"
rem echo DATA_DIR: %DATA_DIR%
set "CFG_DIR=%TSIM_DIR%cfg\" set "CFG_DIR=%TSIM_DIR%cfg\"
rem echo CFG_DIR: %CFG_DIR% rem echo CFG_DIR: %CFG_DIR%
@ -30,25 +33,30 @@ if not exist %SIM_DIR% mkdir %SIM_DIR%
if not exist %TSIM_DIR% mkdir %TSIM_DIR% if not exist %TSIM_DIR% mkdir %TSIM_DIR%
if exist %CFG_DIR% rmdir /s/q %CFG_DIR% if exist %CFG_DIR% rmdir /s/q %CFG_DIR%
if exist %LOG_DIR% rmdir /s/q %LOG_DIR% if exist %LOG_DIR% rmdir /s/q %LOG_DIR%
if exist %DATA_DIR% rmdir /s/q %DATA_DIR%
if not exist %CFG_DIR% mkdir %CFG_DIR% if not exist %CFG_DIR% mkdir %CFG_DIR%
if not exist %LOG_DIR% mkdir %LOG_DIR% if not exist %LOG_DIR% mkdir %LOG_DIR%
if not exist %DATA_DIR% mkdir %DATA_DIR%
set "fqdn=localhost" set "fqdn=localhost"
for /f "skip=1" %%A in ( for /f "skip=1" %%A in (
'wmic computersystem get caption' 'wmic computersystem get caption'
) do if not defined fqdn set "fqdn=%%A" ) do if not defined fqdn set "fqdn=%%A"
echo firstEp %fqdn% > %TAOS_CFG% echo firstEp %fqdn%:7100 > %TAOS_CFG%
echo secondEp %fqdn%:7200 >> %TAOS_CFG%
echo fqdn %fqdn% >> %TAOS_CFG% echo fqdn %fqdn% >> %TAOS_CFG%
echo serverPort 7100 >> %TAOS_CFG% echo serverPort 7100 >> %TAOS_CFG%
echo dataDir %DATA_DIR% >> %TAOS_CFG%
echo logDir %LOG_DIR% >> %TAOS_CFG% echo logDir %LOG_DIR% >> %TAOS_CFG%
echo scriptDir %SCRIPT_DIR% >> %TAOS_CFG% echo scriptDir %SCRIPT_DIR% >> %TAOS_CFG%
echo numOfLogLines 100000000 >> %TAOS_CFG% echo numOfLogLines 100000000 >> %TAOS_CFG%
echo rpcDebugFlag 143 >> %TAOS_CFG% echo rpcDebugFlag 143 >> %TAOS_CFG%
echo tmrDebugFlag 131 >> %TAOS_CFG% echo tmrDebugFlag 131 >> %TAOS_CFG%
echo cDebugFlag 135 >> %TAOS_CFG% echo cDebugFlag 143 >> %TAOS_CFG%
echo qDebugFlag 143 >> %TAOS_CFG% echo qDebugFlag 143 >> %TAOS_CFG%
echo udebugFlag 135 >> %TAOS_CFG% echo uDebugFlag 143 >> %TAOS_CFG%
echo debugFlag 143 >> %TAOS_CFG%
echo wal 0 >> %TAOS_CFG% echo wal 0 >> %TAOS_CFG%
echo asyncLog 0 >> %TAOS_CFG% echo asyncLog 0 >> %TAOS_CFG%
echo locale en_US.UTF-8 >> %TAOS_CFG% echo locale en_US.UTF-8 >> %TAOS_CFG%

2
utils/test/c/CMakeLists.txt
View File

@ -31,7 +31,7 @@ target_link_libraries(
) )
target_link_libraries( target_link_libraries(
tmq_sim tmq_sim
PUBLIC taos PUBLIC ${TAOS_LIB}
PUBLIC util PUBLIC util
PUBLIC common PUBLIC common
PUBLIC os PUBLIC os

2
utils/tsim/CMakeLists.txt
View File

@ -2,7 +2,7 @@ aux_source_directory(src TSIM_SRC)
add_executable(tsim ${TSIM_SRC}) add_executable(tsim ${TSIM_SRC})
target_link_libraries( target_link_libraries(
tsim tsim
PUBLIC taos_static PUBLIC ${TAOS_LIB}
PUBLIC util PUBLIC util
PUBLIC common PUBLIC common
PUBLIC os PUBLIC os