[projmgr] Extend SWIG interface

Author: brondani

.github/workflows/projmgr.yml

@@ -95,30 +95,48 @@ jobs:
           retention-days: 1
           if-no-files-found: error
 
-      - name: Build projmgr swig libs
+      - name: Build projmgr swig libs windows
+        if: ${{ startsWith(matrix.os, 'windows') }}
         run: |
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DSWIG_LIBS=ON ..
-          cmake --build . --target projmgr --config Release
+          cmake --build . --target projmgr-python --config Release
         working-directory: ./buildswig
 
-      - name: Archive projmgr swig libs windows
+      - name: Build projmgr swig libs macos ubuntu
+        if: ${{ startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu') }}
+        run: |
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DSWIG_LIBS=ON ..
+          cmake --build . --target projmgr-python projmgr-go --config Release
+        working-directory: ./buildswig
+
+      - name: Archive projmgr swig python libs windows
         if: ${{ startsWith(matrix.os, 'windows') }}
         uses: actions/upload-artifact@v2
         with:
-          name: projmgr-swig-${{ matrix.target }}
+          name: projmgr-swig-python-${{ matrix.target }}
+          path: |
+             ./buildswig/tools/projmgr/swig/python/projmgr.py
+             ./buildswig/tools/projmgr/swig/python/_projmgr.pyd
+          retention-days: 1
+
+      - name: Archive projmgr swig python libs macos ubuntu
+        if: ${{ startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu') }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: projmgr-swig-python-${{ matrix.target }}
           path: |
-             ./buildswig/tools/projmgr/swig/projmgr.py
-             ./buildswig/tools/projmgr/swig/_projmgr.pyd
+             ./buildswig/tools/projmgr/swig/python/projmgr.py
+             ./buildswig/tools/projmgr/swig/python/_projmgr.so
           retention-days: 1
 
-      - name: Archive projmgr swig libs macos ubuntu
+      - name: Archive projmgr swig go libs macos ubuntu
         if: ${{ startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu') }}
         uses: actions/upload-artifact@v2
         with:
-          name: projmgr-swig-${{ matrix.target }}
+          name: projmgr-swig-go-${{ matrix.target }}
           path: |
-             ./buildswig/tools/projmgr/swig/projmgr.py
-             ./buildswig/tools/projmgr/swig/_projmgr.so
+             ./buildswig/tools/projmgr/swig/go/projmgr.go
+             ./buildswig/tools/projmgr/swig/go/projmgr.so
           retention-days: 1
 
   release:
@@ -157,23 +175,35 @@ jobs:
           name: projmgr-windows64
           path: tools/projmgr/distribution/bin/windows64/
 
-      - name: Download projmgr-swig linux
+      - name: Download projmgr-swig-python linux
+        uses: actions/download-artifact@v2
+        with:
+          name: projmgr-swig-python-linux64
+          path: tools/projmgr/distribution/lib/linux64/python/
+
+      - name: Download projmgr-swig-python macos
+        uses: actions/download-artifact@v2
+        with:
+          name: projmgr-swig-python-darwin64
+          path: tools/projmgr/distribution/lib/darwin64/python/
+
+      - name: Download projmgr-swig-python windows
         uses: actions/download-artifact@v2
         with:
-          name: projmgr-swig-linux64
-          path: tools/projmgr/distribution/lib/linux64/
+          name: projmgr-swig-python-windows64
+          path: tools/projmgr/distribution/lib/windows64/python/
 
-      - name: Download projmgr-swig macos
+      - name: Download projmgr-swig-go linux
         uses: actions/download-artifact@v2
         with:
-          name: projmgr-swig-darwin64
-          path: tools/projmgr/distribution/lib/darwin64/
+          name: projmgr-swig-go-linux64
+          path: tools/projmgr/distribution/lib/linux64/go/
 
-      - name: Download projmgr-swig windows
+      - name: Download projmgr-swig-go macos
         uses: actions/download-artifact@v2
         with:
-          name: projmgr-swig-windows64
-          path: tools/projmgr/distribution/lib/windows64/
+          name: projmgr-swig-go-darwin64
+          path: tools/projmgr/distribution/lib/darwin64/go/
 
       - name: Zip distribution folder
         run: zip -r projmgr.zip *

tools/projmgr/include/ProjMgrWorker.h

@@ -176,39 +176,39 @@ class ProjMgrWorker {
    * @param packs reference to list of packs
    * @return true if executed successfully
   */
-  bool ListPacks(const std::string& filter, std::set<std::string>& packs);
+  bool ListPacks(const std::string& filter, std::vector<std::string>& packs);
 
   /**
    * @brief list available devices
    * @param filter words to filter results
    * @param packs reference to list of packs
    * @return true if executed successfully
   */
-  bool ListDevices(const std::string& filter, std::set<std::string>& devices);
+  bool ListDevices(const std::string& filter, std::vector<std::string>& devices);
 
   /**
    * @brief list available components
    * @param filter words to filter results
    * @param packs reference to list of packs
    * @return true if executed successfully
   */
-  bool ListComponents(const std::string& filter, std::set<std::string>& components);
+  bool ListComponents(const std::string& filter, std::vector<std::string>& components);
 
   /**
    * @brief list available dependencies
    * @param filter words to filter results
    * @param packs reference to list of packs
    * @return true if executed successfully
   */
-  bool ListDependencies(const std::string& filter, std::set<std::string>& dependencies);
+  bool ListDependencies(const std::string& filter, std::vector<std::string>& dependencies);
 
   /**
    * @brief list contexts
    * @param filter words to filter results
    * @param reference list of contexts
    * @return true if executed successfully
   */
-  bool ListContexts(const std::string& filter, std::set<std::string>& contexts);
+  bool ListContexts(const std::string& filter, std::vector<std::string>& contexts);
 
   /**
    * @brief add contexts for a given descriptor
@@ -221,9 +221,9 @@ class ProjMgrWorker {
 
   /**
    * @brief get context map
-   * @return context map
+   * @param reference to context map
   */
-  std::map<std::string, ContextItem>& GetContexts(void);
+  void GetContexts(std::map<std::string, ContextItem>& contexts);
 
   /**
    * @brief copy context files into output directory

tools/projmgr/src/ProjMgr.cpp

@@ -224,15 +224,17 @@ bool ProjMgr::RunConvert(void) {
   }
 
   // Process contexts
-  for (auto& context : m_worker.GetContexts()) {
+  map<string, ContextItem> contexts;
+  m_worker.GetContexts(contexts);
+  for (auto& context : contexts) {
     if (!m_worker.ProcessContext(context.second, true)) {
       ProjMgrLogger::Error("processing context '" + context.first + "' failed");
       return false;
     }
   }
 
   // Generate Cprjs
-  for (auto& context : m_worker.GetContexts()) {
+  for (auto& context : contexts) {
     error_code ec;
     const string& directory = m_outputDir.empty() ? context.second.directories.cproject : m_outputDir + "/" + context.first;
     const string& filename = fs::weakly_canonical(directory + "/" + context.first + ".cprj", ec).generic_string();
@@ -252,7 +254,7 @@ bool ProjMgr::RunConvert(void) {
 }
 
 bool ProjMgr::RunListPacks(void) {
-  set<string> packs;
+  vector<string> packs;
   if (!m_worker.ListPacks(m_filter, packs)) {
     ProjMgrLogger::Error("processing pack list failed");
     return false;
@@ -275,7 +277,7 @@ bool ProjMgr::RunListDevices(void) {
       return false;
     }
   }
-  set<string> devices;
+  vector<string> devices;
   if (!m_worker.ListDevices(m_filter, devices)) {
     ProjMgrLogger::Error("processing devices list failed");
     return false;
@@ -296,7 +298,7 @@ bool ProjMgr::RunListComponents(void) {
       return false;
     }
   }
-  set<string> components;
+  vector<string> components;
   if (!m_worker.ListComponents(m_filter, components)) {
     ProjMgrLogger::Error("processing components list failed");
     return false;
@@ -319,7 +321,7 @@ bool ProjMgr::RunListDependencies(void) {
   if (!m_worker.AddContexts(m_parser, descriptor, m_cprojectFile)) {
     return false;
   }
-  set<string> dependencies;
+  vector<string> dependencies;
   if (!m_worker.ListDependencies(m_filter, dependencies)) {
     ProjMgrLogger::Error("processing dependencies list failed");
     return false;
@@ -353,7 +355,7 @@ bool ProjMgr::RunListContexts(void) {
       return false;
     }
   }
-  set<string> contexts;
+  vector<string> contexts;
   if (!m_worker.ListContexts(m_filter, contexts)) {
     ProjMgrLogger::Error("processing contexts list failed");
     return false;

tools/projmgr/src/ProjMgrWorker.cpp

@@ -111,8 +111,8 @@ bool ProjMgrWorker::AddContext(ProjMgrParser& parser, ContextDesc& descriptor, c
   return true;
 }
 
-map<string, ContextItem>& ProjMgrWorker::GetContexts(void) {
-  return m_contexts;
+void ProjMgrWorker::GetContexts(map<string, ContextItem>& contexts) {
+  contexts = m_contexts;
 }
 
 void ProjMgrWorker::SetOutputDir(const std::string& outputDir) {
@@ -1028,30 +1028,32 @@ set<string> ProjMgrWorker::SplitArgs(const string& args, const string& delimiter
   return s;
 }
 
-bool ProjMgrWorker::ListPacks(const string& filter, set<string>&packs) {
+bool ProjMgrWorker::ListPacks(const string& filter, vector<string>&packs) {
   if (!LoadPacks()) {
     return false;
   }
   if (m_installedPacks.empty()) {
     ProjMgrLogger::Error("no installed pack was found");
     return false;
   }
+  set<string> packsSet;
   for (const auto& pack : m_installedPacks) {
-    packs.insert(GetPackageID(pack));
+    packsSet.insert(GetPackageID(pack));
   }
   if (!filter.empty()) {
     set<string> filteredPacks;
-    ApplyFilter(packs, SplitArgs(filter), filteredPacks);
+    ApplyFilter(packsSet, SplitArgs(filter), filteredPacks);
     if (filteredPacks.empty()) {
       ProjMgrLogger::Error("no pack was found with filter '" + filter + "'");
       return false;
     }
-    packs = filteredPacks;
+    packsSet = filteredPacks;
   }
+  packs.assign(packsSet.begin(), packsSet.end());
   return true;
 }
 
-bool ProjMgrWorker::ListDevices(const string & filter, set<string>& devices) {
+bool ProjMgrWorker::ListDevices(const string & filter, vector<string>& devices) {
   if (!m_contexts.empty()) {
     ContextItem context = m_contexts.begin()->second;
     if (!context.cproject->packages.empty()) {
@@ -1063,6 +1065,7 @@ bool ProjMgrWorker::ListDevices(const string & filter, set<string>& devices) {
   if (!LoadPacks()) {
     return false;
   }
+  set<string> devicesSet;
   for (const auto& pack : m_installedPacks) {
     list<RteDeviceItem*> deviceItems;
     pack->GetEffectiveDeviceItems(deviceItems);
@@ -1071,30 +1074,31 @@ bool ProjMgrWorker::ListDevices(const string & filter, set<string>& devices) {
       if (deviceItem->GetProcessorCount() > 1) {
         const auto& processors = deviceItem->GetProcessors();
         for (const auto& processor : processors) {
-          devices.insert(deviceName + ":" + processor.first);
+          devicesSet.insert(deviceName + ":" + processor.first);
         }
       } else {
-        devices.insert(deviceName);
+        devicesSet.insert(deviceName);
       }
     }
   }
-  if (devices.empty()) {
+  if (devicesSet.empty()) {
     ProjMgrLogger::Error("no installed device was found");
     return false;
   }
   if (!filter.empty()) {
     set<string> matchedDevices;
-    ApplyFilter(devices, SplitArgs(filter), matchedDevices);
+    ApplyFilter(devicesSet, SplitArgs(filter), matchedDevices);
     if (matchedDevices.empty()) {
       ProjMgrLogger::Error("no device was found with filter '" + filter + "'");
       return false;
     }
-    devices = matchedDevices;
+    devicesSet = matchedDevices;
   }
+  devices.assign(devicesSet.begin(), devicesSet.end());
   return true;
 }
 
-bool ProjMgrWorker::ListComponents(const string & filter, set<string>& components) {
+bool ProjMgrWorker::ListComponents(const string& filter, vector<string>& components) {
   ContextItem context;
   if (!LoadPacks()) {
     return false;
@@ -1144,52 +1148,56 @@ bool ProjMgrWorker::ListComponents(const string & filter, set<string>& component
     componentIds = filteredIds;
   }
   for (const auto& componentId : componentIds) {
-    components.insert(componentId + " (" + GetPackageID(componentMap[componentId]->GetPackage()) + ")");
+    components.push_back(componentId + " (" + GetPackageID(componentMap[componentId]->GetPackage()) + ")");
   }
   return true;
 }
 
-bool ProjMgrWorker::ListDependencies(const string& filter, set<string>& dependencies) {
+bool ProjMgrWorker::ListDependencies(const string& filter, vector<string>& dependencies) {
   if (m_contexts.empty()) {
     return false;
   }
   ContextItem context = m_contexts.begin()->second;
   if (!ProcessContext(context)) {
     return false;
   }
+  set<string>dependenciesSet;
   for (const auto& [component, deps] : context.dependencies) {
     for (const auto& dep : deps) {
-      dependencies.insert(component + " " + dep);
+      dependenciesSet.insert(component + " " + dep);
     }
   }
   if (!filter.empty()) {
     set<string> filteredDependencies;
-    ApplyFilter(dependencies, SplitArgs(filter), filteredDependencies);
+    ApplyFilter(dependenciesSet, SplitArgs(filter), filteredDependencies);
     if (filteredDependencies.empty()) {
       ProjMgrLogger::Error("no unresolved dependency was found with filter '" + filter + "'");
       return false;
     }
-    dependencies = filteredDependencies;
+    dependenciesSet = filteredDependencies;
   }
+  dependencies.assign(dependenciesSet.begin(), dependenciesSet.end());
   return true;
 }
 
-bool ProjMgrWorker::ListContexts(const string& filter, set<string>& contexts) {
+bool ProjMgrWorker::ListContexts(const string& filter, vector<string>& contexts) {
   if (m_contexts.empty()) {
     return false;
   }
+  set<string>contextsSet;
   for (auto& context : m_contexts) {
-    contexts.insert(context.first);
+    contextsSet.insert(context.first);
   }
   if (!filter.empty()) {
     set<string> filteredContexts;
-    ApplyFilter(contexts, SplitArgs(filter), filteredContexts);
+    ApplyFilter(contextsSet, SplitArgs(filter), filteredContexts);
     if (filteredContexts.empty()) {
       ProjMgrLogger::Error("no context was found with filter '" + filter + "'");
       return false;
     }
-    contexts = filteredContexts;
+    contextsSet = filteredContexts;
   }
+  contexts.assign(contextsSet.begin(), contextsSet.end());
   return true;
 }
 

tools/projmgr/swig/CMakeLists.txt

@@ -1,10 +1,2 @@
-find_package(SWIG REQUIRED)
-include(${SWIG_USE_FILE})
-
-find_package(PythonLibs)
-include_directories(projmgr PUBLIC ${PYTHON_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../include ${PROJECT_BINARY_DIR})
-set_source_files_properties(projmgr.i PROPERTIES CPLUSPLUS ON)
-
-swig_add_library(projmgr LANGUAGE python SOURCES projmgr.i)
-
-swig_link_libraries(projmgr ${PYTHON_LIBRARIES} projmgrlib)
+add_subdirectory(python)
+add_subdirectory(go)