luadbg fix

CMakeLists.txt

@@ -8,6 +8,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/dist CACHE PATH "..." FORCE)
 endif()
 
+
 # list(INSERT CMAKE_PREFIX_PATH 0  ${CMAKE_SOURCE_DIR}/internals)
 # list(INSERT CMAKE_PREFIX_PATH 0  ${CMAKE_SOURCE_DIR}/luadbg)
 

launch.sh

@@ -0,0 +1,10 @@
+
+if [ $1 = "test" ]; then
+    cd test;
+    start ./Debug/luadbgtest.exe --cwd='E:/Github/luadebugger/test/'
+fi
+
+if [ $1 = "vscode" ]; then
+    cd vscode;
+    start ./Debug/vsdbgadapter.exe --cwd='E:/Github/luadebugger/vscode/'
+fi

luadbg/CMakeLists.txt

@@ -12,47 +12,88 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "Source Files"  FILES $
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "Header Files"  FILES ${SOURCES_HEADER_RPI})
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include PREFIX "Header Files"  FILES ${SOURCES_HEADER_PUB})
 
-add_library(luadbg 
+add_library(luadbg_static
   ${SOURCES_HEADER_PUB}
   ${SOURCES_HEADER_PRI}
   src/luadbg.cpp
 )
-set_source_files_properties(lua_cjson.c PROPERTIES LANGUAGE C )
-set_source_files_properties(strbuf.c PROPERTIES LANGUAGE C )
+target_compile_definitions(luadbg_static 
+  PRIVATE 
+    -D_LUADBG_BUILD_DLL
+    -DVERSION="${PROJECT_VERSION}"
+    -DLUA_COMPAT_5_2 
+    -DLUA_COMPAT_5_1
+)
+
 
-target_compile_definitions(luadbg PRIVATE -D_LUADBG_BUILD_DLL)
-target_compile_definitions(luadbg PRIVATE -DVERSION="${PROJECT_VERSION}")
-target_compile_definitions(luadbg PRIVATE -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1)
-target_include_directories(luadbg
+target_include_directories(luadbg_static
     PUBLIC
         $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
-target_link_libraries(luadbg
+target_link_libraries(luadbg_static
   PUBLIC
     CXLua::CXLua
 )
 
 include(cmake/HelperMacroFunction.cmake)
-export_library_macro(luadbg luadbg "" lib/cmake/luadbg)
+export_library_macro(luadbg_static luadbg_static "" lib/cmake/luadbg)
 
-set_target_properties(luadbg PROPERTIES LIBRARY_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
-set_target_properties(luadbg PROPERTIES RUNTIME_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
-set_target_properties(luadbg PROPERTIES ARCHIVE_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
+set_target_properties(luadbg_static PROPERTIES LIBRARY_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
+set_target_properties(luadbg_static PROPERTIES RUNTIME_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
+set_target_properties(luadbg_static PROPERTIES ARCHIVE_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
 
-# execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_inl.sh ${CMAKE_CURRENT_LIST_DIR})
-add_custom_command(TARGET luadbg
+
+add_custom_command(TARGET luadbg_static
           PRE_BUILD
           COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_inl.sh ${CMAKE_CURRENT_LIST_DIR}
 )
 
-if(CMAKE_RUNTIME_OUTPUT_DIRECTORY )
-add_custom_command(TARGET luadbg
-          POST_BUILD
-          COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/$<CONFIG>/luadbg.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/
-          COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/$<CONFIG>/luadbg.lib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/
+# add_custom_command(TARGET luadbg
+#           POST_BUILD
+#           COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/$<CONFIG>/luadbg.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/
+#           COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/$<CONFIG>/luadbg.lib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/
+# )
+
+add_library(luadbg_shared SHARED
+  ${SOURCES_HEADER_PUB}
+  ${SOURCES_HEADER_PRI}
+  src/luadbg.cpp
+)
+
+target_compile_definitions(luadbg_shared 
+  PRIVATE 
+    -D_LUADBG_BUILD_DLL
+    -DVERSION="${PROJECT_VERSION}"
+    -DLUA_COMPAT_5_2 
+    -DLUA_COMPAT_5_1
 )
-endif()
+
+target_include_directories(luadbg_shared
+    PUBLIC
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+target_link_libraries(luadbg_shared
+  PUBLIC
+    CXLua::CXLua
+)
+
+include(cmake/HelperMacroFunction.cmake)
+export_library_macro(luadbg_shared luadbg_shared "" lib/cmake/luadbg)
+
+set_target_properties(luadbg_shared PROPERTIES LIBRARY_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
+set_target_properties(luadbg_shared PROPERTIES RUNTIME_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
+set_target_properties(luadbg_shared PROPERTIES ARCHIVE_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})
+
+
+add_custom_command(TARGET luadbg_shared
+          PRE_BUILD
+          COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_inl.sh ${CMAKE_CURRENT_LIST_DIR}
+)

luadbg/cmake/luadbg_sharedConfig.cmake

@@ -0,0 +1,4 @@
+if(NOT TARGET luadbg)
+    find_package(CXLua)
+    include("${CMAKE_CURRENT_LIST_DIR}/luadbg_sharedTargets.cmake")
+endif()

luadbg/cmake/luadbg_staticConfig.cmake

@@ -0,0 +1,4 @@
+if(NOT TARGET luadbg)
+    find_package(CXLua)
+    include("${CMAKE_CURRENT_LIST_DIR}/luadbg_staticTargets.cmake")
+endif()

luadbg/debuggee.lua

@@ -37,9 +37,9 @@ function create_on_message_parser()
                 end
             elseif readstate == 3 then
                 if buf:readable_size() >= parsed_len then
-                local js  = buf:ReadAsString(parsed_len) 
-                readstate = 1
-                netq:push_back(0,js)
+                    netq:push_back(0,buf,parsed_len)
+                    buf:Consume(parsed_len)
+                    readstate = 1
                 else 
                     break
                 end
@@ -52,7 +52,10 @@ end
 
 function debuggee_on_connection(conn,netq)
     --print('[debuggee]' ..conn:tohostport().. ' ' ..(conn:connected() and 'connected' or 'disconnected'))
-    netq:push_back(0,cjson.encode({ type='debuggee', event='connection_state', connected = conn:connected(), addr = conn:tohostport()  }))
+    local buf = ezio_buffer_create()
+    buf:WriteString(cjson.encode({ type='debuggee', event='connection_state', connected = conn:connected(), addr = conn:tohostport()  }))
+    netq:push_back(0,buf,buf:readable_size())
+    ezio_buffer_destroy(buf)
 end
 
 local debuggee_on_message_parser = create_on_message_parser()

test/CMakeLists.txt

@@ -25,7 +25,7 @@ target_include_directories(luadbgtest
 )
 
 target_link_libraries(luadbgtest 
-  luadbg
+  luadbg_static
 )
 #target_compile_definitions(luadbgtest PUBLIC -LUADBG_DLL)
 set_target_properties(luadbgtest PROPERTIES RUNTIME_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR})

test/main.lua

@@ -1,4 +1,4 @@
-dofile('F:/Github/luadebugger/test/hello.lua')
+dofile('E:/Github/luadebugger/test/hello.lua')
 
 function main()
     luadbg_listen(9527)

test/src/main.cpp

@@ -2,9 +2,6 @@
 #include <luadbg.h>
 #include <string>
 
-
-
-
 std::string PATH_SEP("");
 std::string CWD = "";
 int port = 4711;