[xpcc] Separate XPCC generator from :build:scons module

This adds the submodule :communication:xpcc:generator which copies the tools/xpcc_generator python tools for generating the XPCC communication. Before the `:build:scons` module copied these files iff the `:build:scons:xpcc.source` option was set, which was weird when using a custom SConscript, and having to set this to a `dummy.xml` source just to get these files copied.
modm-io · Aug 8, 2018 · cbbf3f6 · cbbf3f6
2 parents 1b98940 + be3a65a
commit cbbf3f6
Show file tree

Hide file tree

Showing 89 changed files with 100 additions and 80 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,8 +42,8 @@ jobs:
           command: |
             python2 tools/scripts/authors.py --handles --count --shoutout --since 2017-01-01
             python3 tools/scripts/authors.py --handles --count --shoutout --since 2017-01-01
-            python2 tools/system_design/builder/system_layout.py examples/communication/xml/communication.xml -o /tmp
-            python3 tools/system_design/builder/system_layout.py examples/communication/xml/communication.xml -o /tmp
+            python2 tools/xpcc_generator/builder/system_layout.py examples/xpcc/xml/communication.xml -o /tmp
+            python3 tools/xpcc_generator/builder/system_layout.py examples/xpcc/xml/communication.xml -o /tmp
 
   stm32f0-f1-examples:
     docker:

diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,4 @@ CMakeLists.txt
 examples/**/modm
 examples/**/SConstruct
 examples/**/Makefile
+examples/**/generated
diff --git a/examples/avr/communication/receiver/.gitignore b/examples/avr/communication/receiver/.gitignore
diff --git a/examples/avr/communication/sender/.gitignore b/examples/avr/communication/sender/.gitignore
diff --git a/.../receiver/component_receiver/receiver.cpp → .../receiver/component_receiver/receiver.cpp b/.../receiver/component_receiver/receiver.cpp → .../receiver/component_receiver/receiver.cpp
diff --git a/.../receiver/component_receiver/receiver.hpp → .../receiver/component_receiver/receiver.hpp b/.../receiver/component_receiver/receiver.hpp → .../receiver/component_receiver/receiver.hpp
@@ -18,7 +18,7 @@
 
 #include <modm/communication/xpcc/abstract_component.hpp>
 
-#include "communication/packets.hpp"
+#include <packets.hpp>
 
 namespace component
 {

diff --git a/examples/avr/communication/receiver/main.cpp → examples/avr/xpcc/receiver/main.cpp b/examples/avr/communication/receiver/main.cpp → examples/avr/xpcc/receiver/main.cpp
@@ -27,8 +27,8 @@ using systemClock = SystemClock;
 
 #include "component_receiver/receiver.hpp"
 
-#include "communication/postman.hpp"
-#include "communication/identifier.hpp"
+#include <postman.hpp>
+#include <identifier.hpp>
 
 // ----------------------------------------------------------------------------
 // Logging

diff --git a/...ples/avr/communication/sender/project.xml → examples/avr/xpcc/receiver/project.xml b/...ples/avr/communication/sender/project.xml → examples/avr/xpcc/receiver/project.xml
@@ -10,12 +10,12 @@
   <options>
     <option name=":target">atmega644</option>
     <option name=":platform:clock:f_cpu">14745600</option>
-    <option name=":build:build.path">../../../../build/avr/communication/sender</option>
-    <option name=":build:scons:xpcc.source">../../../communication/xml/communication.xml</option>
-    <option name=":build:scons:xpcc.container">sender</option>
+    <option name=":build:build.path">../../../../build/avr/xpcc/receiver</option>
+    <option name="::xpcc:generator:source">../../../xpcc/xml/communication.xml</option>
+    <option name="::xpcc:generator:container">receiver</option>
   </options>
   <modules>
-    <module>:communication:xpcc</module>
+    <module>:communication:xpcc:generator</module>
     <module>:debug</module>
     <module>:driver:mcp2515</module>
     <module>:platform:clock</module>

diff --git a/...cation/sender/component_sender/sender.cpp → ...r/xpcc/sender/component_sender/sender.cpp b/...cation/sender/component_sender/sender.cpp → ...r/xpcc/sender/component_sender/sender.cpp
@@ -17,8 +17,8 @@
 #undef MODM_LOG_LEVEL
 #define	MODM_LOG_LEVEL modm::log::DEBUG
 
-#include "communication/identifier.hpp"
-#include "communication/packets.hpp"
+#include <identifier.hpp>
+#include <packets.hpp>
 
 #include "sender.hpp"
 

diff --git a/...cation/sender/component_sender/sender.hpp → ...r/xpcc/sender/component_sender/sender.hpp b/...cation/sender/component_sender/sender.hpp → ...r/xpcc/sender/component_sender/sender.hpp
@@ -19,7 +19,7 @@
 #include <modm/communication/xpcc/abstract_component.hpp>
 #include <modm/processing/timer.hpp>
 
-#include "communication/packets.hpp"
+#include <packets.hpp>
 
 namespace component
 {

diff --git a/examples/avr/communication/sender/main.cpp → examples/avr/xpcc/sender/main.cpp b/examples/avr/communication/sender/main.cpp → examples/avr/xpcc/sender/main.cpp
@@ -27,8 +27,8 @@ using systemClock = SystemClock;
 
 #include "component_sender/sender.hpp"
 
-#include "communication/postman.hpp"
-#include "communication/identifier.hpp"
+#include <postman.hpp>
+#include <identifier.hpp>
 
 // ----------------------------------------------------------------------------
 // Logging

diff --git a/...es/avr/communication/receiver/project.xml → examples/avr/xpcc/sender/project.xml b/...es/avr/communication/receiver/project.xml → examples/avr/xpcc/sender/project.xml
@@ -10,12 +10,12 @@
   <options>
     <option name=":target">atmega644</option>
     <option name=":platform:clock:f_cpu">14745600</option>
-    <option name=":build:build.path">../../../../build/avr/communication/receiver</option>
-    <option name=":build:scons:xpcc.source">../../../communication/xml/communication.xml</option>
-    <option name=":build:scons:xpcc.container">receiver</option>
+    <option name=":build:build.path">../../../../build/avr/xpcc/sender</option>
+    <option name="::xpcc:generator:source">../../../xpcc/xml/communication.xml</option>
+    <option name="::xpcc:generator:container">sender</option>
   </options>
   <modules>
-    <module>:communication:xpcc</module>
+    <module>:communication:xpcc:generator</module>
     <module>:debug</module>
     <module>:driver:mcp2515</module>
     <module>:platform:clock</module>

diff --git a/examples/linux/communication/basic/.gitignore b/examples/linux/communication/basic/.gitignore
diff --git a/...ion/basic/component_receiver/receiver.cpp → ...pcc/basic/component_receiver/receiver.cpp b/...ion/basic/component_receiver/receiver.cpp → ...pcc/basic/component_receiver/receiver.cpp
diff --git a/...ion/basic/component_receiver/receiver.hpp → ...pcc/basic/component_receiver/receiver.hpp b/...ion/basic/component_receiver/receiver.hpp → ...pcc/basic/component_receiver/receiver.hpp
@@ -18,7 +18,7 @@
 
 #include <modm/communication/xpcc/abstract_component.hpp>
 
-#include "communication/packets.hpp"
+#include <packets.hpp>
 
 namespace component
 {

diff --git a/...ication/basic/component_sender/sender.cpp → ...ux/xpcc/basic/component_sender/sender.cpp b/...ication/basic/component_sender/sender.cpp → ...ux/xpcc/basic/component_sender/sender.cpp
@@ -17,8 +17,7 @@
 #undef MODM_LOG_LEVEL
 #define	MODM_LOG_LEVEL modm::log::DEBUG
 
-#include "communication/identifier.hpp"
-#include "communication/packets.hpp"
+#include <identifier.hpp>
 
 #include "sender.hpp"
 

diff --git a/...ication/basic/component_sender/sender.hpp → ...ux/xpcc/basic/component_sender/sender.hpp b/...ication/basic/component_sender/sender.hpp → ...ux/xpcc/basic/component_sender/sender.hpp
@@ -19,7 +19,7 @@
 #include <modm/communication/xpcc/abstract_component.hpp>
 #include <modm/processing/timer.hpp>
 
-#include "communication/packets.hpp"
+#include <packets.hpp>
 
 namespace component
 {

diff --git a/examples/linux/communication/basic/main.cpp → examples/linux/xpcc/basic/main.cpp b/examples/linux/communication/basic/main.cpp → examples/linux/xpcc/basic/main.cpp
@@ -26,8 +26,8 @@
 #include "component_receiver/receiver.hpp"
 #include "component_sender/sender.hpp"
 
-#include "communication/postman.hpp"
-#include "communication/identifier.hpp"
+#include <postman.hpp>
+#include <identifier.hpp>
 
 // Use TIPC on Linux only
 // xpcc::TipcConnector connector;

diff --git a/...les/linux/communication/basic/project.xml → examples/linux/xpcc/basic/project.xml b/...les/linux/communication/basic/project.xml → examples/linux/xpcc/basic/project.xml
@@ -9,13 +9,13 @@
 
   <options>
     <option name=":target">hosted-linux</option>
-    <option name=":build:build.path">../../../../build/linux/communication/basic</option>
-    <option name=":build:scons:xpcc.source">../../../communication/xml/communication.xml</option>
-    <option name=":build:scons:xpcc.container">sender receiver</option>
+    <option name=":build:build.path">../../../../build/linux/xpcc/basic</option>
+    <option name=":communication:xpcc:generator:source">../../../xpcc/xml/communication.xml</option>
+    <option name=":communication:xpcc:generator:container">sender receiver</option>
   </options>
   <modules>
     <module>:platform:core</module>
-    <module>:communication:xpcc</module>
+    <module>:communication:xpcc:generator</module>
     <module>:debug</module>
     <module>:build:scons</module>
   </modules>

diff --git a/examples/communication/xml/communication.dtd → examples/xpcc/xml/communication.dtd b/examples/communication/xml/communication.dtd → examples/xpcc/xml/communication.dtd
diff --git a/examples/communication/xml/communication.xml → examples/xpcc/xml/communication.xml b/examples/communication/xml/communication.xml → examples/xpcc/xml/communication.xml
diff --git a/examples/zmq/1_stm32/.gitignore b/examples/zmq/1_stm32/.gitignore
diff --git a/examples/zmq/1_stm32/component_odometry/odometry.cpp b/examples/zmq/1_stm32/component_odometry/odometry.cpp
@@ -16,9 +16,9 @@
 #undef MODM_LOG_LEVEL
 #define	MODM_LOG_LEVEL modm::log::DISABLED
 
-#include "communication/identifier.hpp"
-#include "communication/packets.hpp"
-#include "communication/communication.hpp"
+#include <identifier.hpp>
+#include <packets.hpp>
+#include <communication.hpp>
 
 #include "odometry.hpp"
 

diff --git a/examples/zmq/1_stm32/component_odometry/odometry.hpp b/examples/zmq/1_stm32/component_odometry/odometry.hpp
@@ -16,7 +16,7 @@
 #include <modm/communication/xpcc/abstract_component.hpp>
 #include <modm/processing/timer.hpp>
 
-#include "communication/packets.hpp"
+#include <packets.hpp>
 
 namespace component
 {

diff --git a/examples/zmq/1_stm32/main.cpp b/examples/zmq/1_stm32/main.cpp
@@ -19,8 +19,8 @@
 
 #include "component_odometry/odometry.hpp"
 
-#include "communication/postman.hpp"
-#include "communication/identifier.hpp"
+#include <postman.hpp>
+#include <identifier.hpp>
 
 using namespace Board;
 

diff --git a/examples/zmq/1_stm32/project.xml b/examples/zmq/1_stm32/project.xml
@@ -3,11 +3,11 @@
   <extends>../../../src/modm/board/disco_f407vg/board.xml</extends>
   <options>
     <option name=":build:build.path">../../../build/zmq/1_stm32</option>
-    <option name=":build:scons:xpcc.source">../../communication/xml/communication.xml</option>
-    <option name=":build:scons:xpcc.container">odometry</option>
+    <option name=":communication:xpcc:generator:source">../../xpcc/xml/communication.xml</option>
+    <option name=":communication:xpcc:generator:container">odometry</option>
   </options>
   <modules>
-    <module>:communication:xpcc</module>
+    <module>:communication:xpcc:generator</module>
     <module>:platform:can:1</module>
     <module>:platform:gpio</module>
     <module>:platform:timer:1</module>

diff --git a/examples/zmq/3_zmq_app/.gitignore b/examples/zmq/3_zmq_app/.gitignore
diff --git a/examples/zmq/3_zmq_app/component_gui/gui.cpp b/examples/zmq/3_zmq_app/component_gui/gui.cpp
@@ -12,9 +12,9 @@
 
 #include <modm/debug/logger.hpp>
 
-#include "communication/identifier.hpp"
-#include "communication/packets.hpp"
-#include "communication/communication.hpp"
+#include <identifier.hpp>
+#include <packets.hpp>
+#include <communication.hpp>
 
 #include "gui.hpp"
 

diff --git a/examples/zmq/3_zmq_app/component_gui/gui.hpp b/examples/zmq/3_zmq_app/component_gui/gui.hpp
@@ -16,7 +16,7 @@
 #include <modm/communication/xpcc/abstract_component.hpp>
 #include <modm/processing/timer.hpp>
 
-#include "communication/packets.hpp"
+#include <packets.hpp>
 
 namespace component
 {

diff --git a/examples/zmq/3_zmq_app/main.cpp b/examples/zmq/3_zmq_app/main.cpp
@@ -17,8 +17,8 @@
 
 #include "component_gui/gui.hpp"
 
-#include "communication/postman.hpp"
-#include "communication/identifier.hpp"
+#include <postman.hpp>
+#include <identifier.hpp>
 
 /**
  * Simple subscriber with zeromq.

diff --git a/examples/zmq/3_zmq_app/project.xml b/examples/zmq/3_zmq_app/project.xml
@@ -10,11 +10,11 @@
   <options>
     <option name=":target">hosted-linux</option>
     <option name=":build:build.path">../../../build/zmq/3_zmq_app</option>
-    <option name=":build:scons:xpcc.source">../../communication/xml/communication.xml</option>
-    <option name=":build:scons:xpcc.container">gui</option>
+    <option name=":communication:xpcc:generator:source">../../xpcc/xml/communication.xml</option>
+    <option name=":communication:xpcc:generator:container">gui</option>
   </options>
   <modules>
-    <module>:communication:xpcc</module>
+    <module>:communication:xpcc:generator</module>
     <module>:debug</module>
     <module>:platform:core</module>
     <module>:build:scons</module>

diff --git a/tools/build_script_generator/scons/module.lb b/tools/build_script_generator/scons/module.lb
@@ -27,19 +27,6 @@ def prepare(module, options):
     module.add_option(
         StringOption(name="image.source", default="",
                      description="Path to the image folder"))
-    module.add_option(
-        StringOption(name="xpcc.source", default="",
-                     description="Path to the XPCC source file"))
-    module.add_option(
-        StringOption(name="xpcc.container", default="",
-                     description="Name of the XPCC container to generate for"))
-    module.add_option(
-        StringOption(name="xpcc.generate", default="communication",
-                     description="Path to the XPCC generated folder"))
-    module.add_option(
-        StringOption(name="xpcc.namespace", default="robot",
-                     description="Namespace of the generated XPCC communications"))
-
     module.add_option(
         EnumerationOption(name="info.git", default="Disabled",
                           enumeration=["Disabled", "Info", "Info+Status"],
@@ -76,6 +63,7 @@ def build(env):
 
 def post_build(env, buildlog):
     is_unittest = env.has_module(":test")
+    has_xpcc_generator = env.has_module(":communication:xpcc:generator")
     has_image_source = len(env[":::image.source"])
 
     target = env["modm:target"]
@@ -89,8 +77,8 @@ def post_build(env, buildlog):
         "cmake_wrapper",
         "qtcreator",
     ]
-    if len(env[":::xpcc.source"]):
-        build_tools += ["system_design"]
+    if has_xpcc_generator:
+        build_tools += ["xpcc_generator"]
     if has_image_source:
         build_tools += ["bitmap"]
     if env[":::info.git"] != "Disabled" or env[":::info.build"]:
@@ -119,6 +107,11 @@ def post_build(env, buildlog):
         "is_unittest": is_unittest,
         "has_image_source": has_image_source,
         "image_source": env[":::image.source"],
+        "has_xpcc_generator": has_xpcc_generator,
+        "generator_source": env.get_option(":communication:xpcc:generator:source", ""),
+        "generator_container": env.get_option(":communication:xpcc:generator:container", ""),
+        "generator_path": env.get_option(":communication:xpcc:generator:path", ""),
+        "generator_namespace": env.get_option(":communication:xpcc:generator:namespace", ""),
     })
     # Set these substitutions for all templates
     env.substitutions = subs
@@ -140,9 +133,6 @@ def post_build(env, buildlog):
     # Copy the scons-build-tools
     env.copy(repopath("ext/dlr/scons-build-tools"), "ext/dlr/scons-build-tools")
     env.copy("site_tools", "scons/site_tools")
-    # Copy XPCC tools
-    if "system_design" in build_tools:
-        env.copy(repopath("tools/system_design"), "tools/system_design")
 
     # these are the ONLY files that are allowed to NOT be namespaced with modm!
     env.outbasepath = "."

diff --git a/tools/build_script_generator/scons/resources/SConscript.in b/tools/build_script_generator/scons/resources/SConscript.in
@@ -104,7 +104,7 @@ env.SetDefault(CONFIG_OPENOCD_COMMANDS = [
 %% endif
 
 # XPCC generator tool path
-env["XPCC_SYSTEM_DESIGN"] = join(abspath("."), "tools", "system_design")
+env["XPCC_SYSTEM_DESIGN"] = join(abspath("."), "tools", "xpcc_generator")
 
 # Toolchain configuration
 %% macro generate_flags_for_profile(name, profile, append=False)

diff --git a/tools/build_script_generator/scons/resources/SConstruct.in b/tools/build_script_generator/scons/resources/SConstruct.in
@@ -54,15 +54,15 @@ for image in env.FindFiles("{{ image_source }}", ".pbm"):
     source, _ = env.Bitmap(str(image))
     sources.append(source)
 %% endif
-%% if options[":::xpcc.source"] != ""
+%% if has_xpcc_generator
 # Generating XPCC sources
-env.Append(CPPPATH="{{ options[":::xpcc.generate"] }}")
-ignored.append("{{ options[":::xpcc.generate"] }}")
+env.Append(CPPPATH="{{ generator_path }}")
+ignored.append("{{ generator_path }}")
 sources += env.XpccCommunication(
-    xmlfile=abspath("{{ options[":::xpcc.source"] }}"),
-    container="{{ options[":::xpcc.container"] }}",
-    path=abspath("{{ options[":::xpcc.generate"] }}"),
-    namespace="{{ options[":::xpcc.namespace"] }}")
+    xmlfile=abspath("{{ generator_source }}"),
+    container="{{ generator_container }}",
+    path=abspath("{{ generator_path }}"),
+    namespace="{{ generator_namespace }}")
 %% endif
 
 %% if not is_unittest

diff --git a/...nerator/scons/site_tools/system_design.py → ...erator/scons/site_tools/xpcc_generator.py b/...nerator/scons/site_tools/system_design.py → ...erator/scons/site_tools/xpcc_generator.py
diff --git a/tools/system_design/builder/__init__.py → tools/xpcc_generator/builder/__init__.py b/tools/system_design/builder/__init__.py → tools/xpcc_generator/builder/__init__.py
diff --git a/tools/system_design/builder/builder_base.py → tools/xpcc_generator/builder/builder_base.py b/tools/system_design/builder/builder_base.py → tools/xpcc_generator/builder/builder_base.py
diff --git a/...ystem_design/builder/cpp_communication.py → ...cc_generator/builder/cpp_communication.py b/...ystem_design/builder/cpp_communication.py → ...cc_generator/builder/cpp_communication.py
diff --git a/...s/system_design/builder/cpp_identifier.py → .../xpcc_generator/builder/cpp_identifier.py b/...s/system_design/builder/cpp_identifier.py → .../xpcc_generator/builder/cpp_identifier.py
diff --git a/tools/system_design/builder/cpp_packets.py → tools/xpcc_generator/builder/cpp_packets.py b/tools/system_design/builder/cpp_packets.py → tools/xpcc_generator/builder/cpp_packets.py
diff --git a/tools/system_design/builder/cpp_postman.py → tools/xpcc_generator/builder/cpp_postman.py b/tools/system_design/builder/cpp_postman.py → tools/xpcc_generator/builder/cpp_postman.py
diff --git a/...em_design/builder/cpp_xpcc_task_caller.py → ...generator/builder/cpp_xpcc_task_caller.py b/...em_design/builder/cpp_xpcc_task_caller.py → ...generator/builder/cpp_xpcc_task_caller.py
diff --git a/.../system_design/builder/filter/__init__.py → ...xpcc_generator/builder/filter/__init__.py b/.../system_design/builder/filter/__init__.py → ...xpcc_generator/builder/filter/__init__.py
diff --git a/tools/system_design/builder/filter/cpp.py → tools/xpcc_generator/builder/filter/cpp.py b/tools/system_design/builder/filter/cpp.py → tools/xpcc_generator/builder/filter/cpp.py
diff --git a/tools/system_design/builder/filter/java.py → tools/xpcc_generator/builder/filter/java.py b/tools/system_design/builder/filter/java.py → tools/xpcc_generator/builder/filter/java.py
diff --git a/..._design/builder/generate_include_graph.py → ...nerator/builder/generate_include_graph.py b/..._design/builder/generate_include_graph.py → ...nerator/builder/generate_include_graph.py
diff --git a/...stem_design/builder/java_communication.py → ...c_generator/builder/java_communication.py b/...stem_design/builder/java_communication.py → ...c_generator/builder/java_communication.py
diff --git a/...s/system_design/builder/java_generator.py → .../xpcc_generator/builder/java_generator.py b/...s/system_design/builder/java_generator.py → .../xpcc_generator/builder/java_generator.py
diff --git a/.../system_design/builder/java_identifier.py → ...xpcc_generator/builder/java_identifier.py b/.../system_design/builder/java_identifier.py → ...xpcc_generator/builder/java_identifier.py
diff --git a/...design/builder/java_meta_communication.py → ...erator/builder/java_meta_communication.py b/...design/builder/java_meta_communication.py → ...erator/builder/java_meta_communication.py
diff --git a/...ystem_design/builder/java_meta_packets.py → ...cc_generator/builder/java_meta_packets.py b/...ystem_design/builder/java_meta_packets.py → ...cc_generator/builder/java_meta_packets.py
diff --git a/tools/system_design/builder/java_packets.py → tools/xpcc_generator/builder/java_packets.py b/tools/system_design/builder/java_packets.py → tools/xpcc_generator/builder/java_packets.py
diff --git a/...design/builder/java_packets_jaxb_index.py → ...erator/builder/java_packets_jaxb_index.py b/...design/builder/java_packets_jaxb_index.py → ...erator/builder/java_packets_jaxb_index.py
diff --git a/tools/system_design/builder/system_layout.py → ...s/xpcc_generator/builder/system_layout.py b/tools/system_design/builder/system_layout.py → ...s/xpcc_generator/builder/system_layout.py
@@ -34,9 +34,9 @@ class SystemLayoutBuilder(builder_base.Builder):
 	$ python3 system_layout.py ../../../../roboter/2012_captain/software/global/xml/robot.xml -o /tmp  -s simulator -s "drive simulation" -s "External"
 
 	# 2015
-	$ python3 system_layout.py ../../../../season/common/robot.xml --dtdpath ../../../tools/system_design/xml/dtd -o /tmp
-	$ python3 system_layout.py ../../../../season/common/robot.xml --dtdpath ../../../tools/system_design/xml/dtd -o /tmp -s "drive big simulation" -s "drive little simulation" -s "External" -s "simulator" -s "drive big"
 	
+	$ python3 system_layout.py ../../../../season/common/robot.xml --dtdpath ../../../tools/xpcc_generator/xml/dtd -o /tmp
+	$ python3 system_layout.py ../../../../season/common/robot.xml --dtdpath ../../../tools/xpcc_generator/xml/dtd -o /tmp -s "drive big simulation" -s "drive little simulation" -s "External" -s "simulator" -s "drive big"
 	A PDF called system.pdf is generated in /tmp/system.pdf.
 	
 	If you want to display callable actions for each component add the -a switch.

diff --git a/...m_design/builder/templates/cpp_caller.tpl → ...enerator/builder/templates/cpp_caller.tpl b/...m_design/builder/templates/cpp_caller.tpl → ...enerator/builder/templates/cpp_caller.tpl
diff --git a/...n/builder/templates/cpp_communication.tpl → ...r/builder/templates/cpp_communication.tpl b/...n/builder/templates/cpp_communication.tpl → ...r/builder/templates/cpp_communication.tpl
diff --git a/...n/builder/templates/include_graph.dot.tpl → ...r/builder/templates/include_graph.dot.tpl b/...n/builder/templates/include_graph.dot.tpl → ...r/builder/templates/include_graph.dot.tpl
diff --git a/.../builder/templates/java_communication.tpl → .../builder/templates/java_communication.tpl b/.../builder/templates/java_communication.tpl → .../builder/templates/java_communication.tpl
diff --git a/...ign/builder/templates/java_components.tpl → ...tor/builder/templates/java_components.tpl b/...ign/builder/templates/java_components.tpl → ...tor/builder/templates/java_components.tpl
diff --git a/...sign/builder/templates/java_generator.tpl → ...ator/builder/templates/java_generator.tpl b/...sign/builder/templates/java_generator.tpl → ...ator/builder/templates/java_generator.tpl
diff --git a/...ign/builder/templates/java_identifier.tpl → ...tor/builder/templates/java_identifier.tpl b/...ign/builder/templates/java_identifier.tpl → ...tor/builder/templates/java_identifier.tpl
diff --git a/...der/templates/java_meta_communication.tpl → ...der/templates/java_meta_communication.tpl b/...der/templates/java_meta_communication.tpl → ...der/templates/java_meta_communication.tpl
diff --git a/...n/builder/templates/java_meta_packets.tpl → ...r/builder/templates/java_meta_packets.tpl b/...n/builder/templates/java_meta_packets.tpl → ...r/builder/templates/java_meta_packets.tpl
diff --git a/...design/builder/templates/java_packets.tpl → ...erator/builder/templates/java_packets.tpl b/...design/builder/templates/java_packets.tpl → ...erator/builder/templates/java_packets.tpl
diff --git a/...der/templates/java_packets_jaxb_index.tpl → ...der/templates/java_packets_jaxb_index.tpl b/...der/templates/java_packets_jaxb_index.tpl → ...der/templates/java_packets_jaxb_index.tpl
diff --git a/..._design/builder/templates/postman.cpp.tpl → ...nerator/builder/templates/postman.cpp.tpl b/..._design/builder/templates/postman.cpp.tpl → ...nerator/builder/templates/postman.cpp.tpl
diff --git a/..._design/builder/templates/postman.hpp.tpl → ...nerator/builder/templates/postman.hpp.tpl b/..._design/builder/templates/postman.hpp.tpl → ...nerator/builder/templates/postman.hpp.tpl
diff --git a/...gn/builder/templates/robot_identifier.tpl → ...or/builder/templates/robot_identifier.tpl b/...gn/builder/templates/robot_identifier.tpl → ...or/builder/templates/robot_identifier.tpl
diff --git a/...n/builder/templates/robot_packets.cpp.tpl → ...r/builder/templates/robot_packets.cpp.tpl b/...n/builder/templates/robot_packets.cpp.tpl → ...r/builder/templates/robot_packets.cpp.tpl
diff --git a/...n/builder/templates/robot_packets.hpp.tpl → ...r/builder/templates/robot_packets.hpp.tpl b/...n/builder/templates/robot_packets.hpp.tpl → ...r/builder/templates/robot_packets.hpp.tpl