C++ domain generator

Use the newly introduced C++ api to send commands thus avoiding sockets
during domain generation from EDD (.pfw).

The socket and the python binding have been removed with this rework.

The EDD transduction flow is now:
EDD ---PFWScriptGenerator.py---> PF commands --domainGenerator.exe--> XML
instead of:
EDD ---PFWScriptGenerator.py---> python structures --python bindings--> XML

Signed-off-by: David Wagner <[email protected]>

Author: dawagner

test/xml-generator/CMakeLists.txt

@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-if (BUILD_TESTING AND PYTHON_BINDINGS)
+if (BUILD_TESTING)
 
     find_package(PythonInterp 2 REQUIRED)
 

tools/xmlGenerator/CMakeLists.txt

@@ -26,6 +26,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+add_executable(domainGeneratorConnector domainGeneratorConnector.cpp)
+target_link_libraries(domainGeneratorConnector PRIVATE parameter pfw_utility)
+
+install(TARGETS domainGeneratorConnector RUNTIME DESTINATION bin)
+
 install(PROGRAMS
     domainGenerator.sh
     domainGenerator.py

tools/xmlGenerator/PFWScriptGenerator.py

@@ -44,63 +44,35 @@ def __init__(self):
     def getScript(self):
         return self._script
 
+    def _appendCommand(self, *args):
+        self._script.append(list(args))
+
     def _doCreateDomain(self, name):
-        self._script.append(
-                "{cmd} {domain}".format(
-                cmd="createDomain",
-                domain=name))
+        self._appendCommand("createDomain", name)
 
     def _doSetSequenceAware(self):
-        self._script.append(
-                "{cmd} {domain} {aware}".format(
-                cmd="setSequenceAwareness",
-                domain=self._ctx_domain,
-                aware="true"))
+        self._appendCommand("setSequenceAwareness", self._ctx_domain, "true")
 
     def _doAddElement(self, path):
-        self._script.append(
-                "{cmd} {domain} {path}".format(
-                cmd="addElement",
-                domain=self._ctx_domain,
-                path=path))
+        self._appendCommand("addElement", self._ctx_domain, path)
 
     def _doCreateConfiguration(self, name):
-        self._script.append(
-                "{cmd} {domain} {config}".format(
-                cmd="createConfiguration",
-                domain=self._ctx_domain,
-                config=name))
+        self._appendCommand("createConfiguration", self._ctx_domain, name)
 
     def _doSetElementSequence(self, paths):
-        self._script.append(
-                "{cmd} {domain} {config} {paths}".format(
-                cmd="setElementSequence",
-                domain=self._ctx_domain,
-                config=self._ctx_configuration,
-                paths=" ".join(paths)))
+        self._appendCommand("setElementSequence", self._ctx_domain, self._ctx_configuration, " ".join(paths))
 
     def _doSetRule(self, rule):
-        self._script.append(
-                "{cmd} {domain} {config} {rule}".format(
-                cmd="setRule",
-                domain=self._ctx_domain,
-                config=self._ctx_configuration,
-                rule=rule))
+        self._appendCommand("setRule", self._ctx_domain, self._ctx_configuration, rule)
 
     def _doSetParameter(self, path, value):
-        self._script.append(
-                "{cmd} {domain} {config} {path} '{value}'".format(
-                cmd="setConfigurationParameter",
-                domain=self._ctx_domain,
-                config=self._ctx_configuration,
-                path=path,
-                value=value))
+        self._appendCommand("setConfigurationParameter", self._ctx_domain, self._ctx_configuration, path, value)
 
 class ArgparseArgumentParser(object) :
     """class that parse command line arguments with argparse library
 
     result of parsing are the class atributs"""
-    def __init__(self) :
+    def __init__(self):
 
         myArgParser = argparse.ArgumentParser(description='Process domain scripts.')