[json-rpc] Fetch RpcInterface.h from csolution-rpc repository

tools/projmgr/.gitignore

@@ -0,0 +1 @@
+templates/debug-adapters.yml

tools/projmgr/CMakeLists.txt

@@ -12,6 +12,15 @@ file(DOWNLOAD
   ${CMAKE_CURRENT_SOURCE_DIR}/templates/debug-adapters.yml
 )
 
+# rpc interface
+include(FetchContent)
+FetchContent_Declare(
+  rpc-interface
+  URL https://github.com/Open-CMSIS-Pack/csolution-rpc/releases/download/v0.0.1/csolution-rpc.zip
+  URL_HASH SHA256=e5e6528ace7cf9b31a24ef268f9d86a9810d3a84c0e4e166dfe2c745e734524a
+)
+FetchContent_MakeAvailable(rpc-interface)
+
 set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT projmgr)
 
 # projmgr library
@@ -30,13 +39,16 @@ SET(PROJMGR_HEADER_FILES ProjMgr.h ProjMgrKernel.h ProjMgrCallback.h
   ProjMgrYamlEmitter.h ProjMgrUtils.h ProjMgrExtGenerator.h
   ProjMgrCbuildBase.h ProjMgrRunDebug.h
   ProjMgrRpcServer.h ProjMgrRpcServerData.h
-  RpcInterface.h
 )
 
 list(TRANSFORM PROJMGR_SOURCE_FILES PREPEND src/)
 list(TRANSFORM PROJMGR_HEADER_FILES PREPEND include/)
 
-add_library(projmgrlib OBJECT ${PROJMGR_SOURCE_FILES} ${PROJMGR_HEADER_FILES})
+add_library(projmgrlib OBJECT
+  ${PROJMGR_SOURCE_FILES}
+  ${PROJMGR_HEADER_FILES}
+  ${rpc-interface_SOURCE_DIR}/RpcInterface.h
+)
 target_link_libraries(projmgrlib
   PUBLIC
   CrossPlatform RteFsUtils RteUtils XmlTree XmlTreeSlim XmlReader
@@ -45,6 +57,7 @@ target_link_libraries(projmgrlib
 target_include_directories(projmgrlib PUBLIC include ${PROJECT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/external/json
   ${CMAKE_SOURCE_DIR}/external/json-rpc-cxx/include
+  ${rpc-interface_SOURCE_DIR}
 )
 
 if(SWIG_LIBS)

tools/projmgr/include/ProjMgrRpcServerData.h

@@ -6,7 +6,7 @@
 #ifndef PROJMGRRPCSERVERDATA_H
 #define PROJMGRRPCSERVERDATA_H
 
-#include <RpcInterface.h>
+#include "RpcInterface.h"
 
 using namespace std;
 
@@ -23,19 +23,19 @@ class RpcDataCollector {
 
   RteTarget* GetTarget() const { return m_target; }
 
-  void CollectCtClasses(Args::CtRoot& ctRoot) const;
-  void CollectUsedItems(Args::UsedItems& usedItems) const;
+  void CollectCtClasses(RpcArgs::CtRoot& ctRoot) const;
+  void CollectUsedItems(RpcArgs::UsedItems& usedItems) const;
 
-  Args::Component FromRteComponent(const RteComponent* rteComponent) const;
-  Args::ComponentInstance FromComponentInstance(const RteComponentInstance* rteCi) const;
+  RpcArgs::Component FromRteComponent(const RteComponent* rteComponent) const;
+  RpcArgs::ComponentInstance FromComponentInstance(const RteComponentInstance* rteCi) const;
   RteItem* GetTaxonomyItem(const RteComponentGroup* rteGroup) const;
 
 protected:
 
-  void CollectCtBundles(Args::CtClass& ctClass, RteComponentGroup* rteClass) const;
-  void CollectCtChildren(Args::CtTreeItem& parent, RteComponentGroup* rteGroup, const string& bundleName) const;
-  void CollectCtAggregates(Args::CtTreeItem& parent, RteComponentGroup* rteGroup, const string& bundleName) const;
-  void CollectCtVariants(Args::CtAggregate& ctAggregate, RteComponentAggregate* rteAggregate) const;
+  void CollectCtBundles(RpcArgs::CtClass& ctClass, RteComponentGroup* rteClass) const;
+  void CollectCtChildren(RpcArgs::CtTreeItem& parent, RteComponentGroup* rteGroup, const string& bundleName) const;
+  void CollectCtAggregates(RpcArgs::CtTreeItem& parent, RteComponentGroup* rteGroup, const string& bundleName) const;
+  void CollectCtVariants(RpcArgs::CtAggregate& ctAggregate, RteComponentAggregate* rteAggregate) const;
 
 private:
   RteTarget* m_target;