From 1b1b9ae8aea64d85b38c621816a40c9b42a86e31 Mon Sep 17 00:00:00 2001
From: sangelovic <angelovic.s@gmail.com>
Date: Fri, 26 Apr 2019 00:03:46 +0200
Subject: [PATCH] Move code generator to tools subdirectory for higher
 consistency with OSS standards

---
 CMakeLists.txt                                |  2 +-
 {stub-generator => tools}/CMakeLists.txt      | 22 +++++++++----------
 .../xml2cpp-codegen}/AdaptorGenerator.cpp     |  0
 .../xml2cpp-codegen}/AdaptorGenerator.h       |  0
 .../xml2cpp-codegen}/BaseGenerator.cpp        |  0
 .../xml2cpp-codegen}/BaseGenerator.h          |  0
 .../xml2cpp-codegen}/ProxyGenerator.cpp       |  0
 .../xml2cpp-codegen}/ProxyGenerator.h         |  0
 .../xml2cpp-codegen}/generator_utils.cpp      |  0
 .../xml2cpp-codegen}/generator_utils.h        |  0
 .../xml2cpp-codegen}/xml.cpp                  |  0
 .../xml2cpp-codegen}/xml.h                    |  0
 .../xml2cpp-codegen}/xml2cpp.cpp              |  0
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename {stub-generator => tools}/CMakeLists.txt (70%)
 rename {stub-generator => tools/xml2cpp-codegen}/AdaptorGenerator.cpp (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/AdaptorGenerator.h (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/BaseGenerator.cpp (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/BaseGenerator.h (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/ProxyGenerator.cpp (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/ProxyGenerator.h (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/generator_utils.cpp (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/generator_utils.h (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/xml.cpp (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/xml.h (100%)
 rename {stub-generator => tools/xml2cpp-codegen}/xml2cpp.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec02543..9577a7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ endif()
 option(BUILD_CODE_GEN "Build and install interface stub code generator (default OFF)" OFF)
 
 if(BUILD_CODE_GEN)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/stub-generator")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/tools")
 endif()
 
 #----------------------------------
diff --git a/stub-generator/CMakeLists.txt b/tools/CMakeLists.txt
similarity index 70%
rename from stub-generator/CMakeLists.txt
rename to tools/CMakeLists.txt
index 6c1f7f0..b225c08 100644
--- a/stub-generator/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -19,17 +19,17 @@ find_package(EXPAT REQUIRED)
 #-------------------------------
 
 set(SDBUSCPP_XML2CPP_SRCS
-    xml2cpp.cpp
-    xml.h
-    xml.cpp
-    generator_utils.h
-    generator_utils.cpp
-    BaseGenerator.h
-    BaseGenerator.cpp
-    AdaptorGenerator.h
-    AdaptorGenerator.cpp
-    ProxyGenerator.h
-    ProxyGenerator.cpp)
+    xml2cpp-codegen/xml2cpp.cpp
+    xml2cpp-codegen/xml.h
+    xml2cpp-codegen/xml.cpp
+    xml2cpp-codegen/generator_utils.h
+    xml2cpp-codegen/generator_utils.cpp
+    xml2cpp-codegen/BaseGenerator.h
+    xml2cpp-codegen/BaseGenerator.cpp
+    xml2cpp-codegen/AdaptorGenerator.h
+    xml2cpp-codegen/AdaptorGenerator.cpp
+    xml2cpp-codegen/ProxyGenerator.h
+    xml2cpp-codegen/ProxyGenerator.cpp)
 
 #-------------------------------
 # GENERAL COMPILER CONFIGURATION
diff --git a/stub-generator/AdaptorGenerator.cpp b/tools/xml2cpp-codegen/AdaptorGenerator.cpp
similarity index 100%
rename from stub-generator/AdaptorGenerator.cpp
rename to tools/xml2cpp-codegen/AdaptorGenerator.cpp
diff --git a/stub-generator/AdaptorGenerator.h b/tools/xml2cpp-codegen/AdaptorGenerator.h
similarity index 100%
rename from stub-generator/AdaptorGenerator.h
rename to tools/xml2cpp-codegen/AdaptorGenerator.h
diff --git a/stub-generator/BaseGenerator.cpp b/tools/xml2cpp-codegen/BaseGenerator.cpp
similarity index 100%
rename from stub-generator/BaseGenerator.cpp
rename to tools/xml2cpp-codegen/BaseGenerator.cpp
diff --git a/stub-generator/BaseGenerator.h b/tools/xml2cpp-codegen/BaseGenerator.h
similarity index 100%
rename from stub-generator/BaseGenerator.h
rename to tools/xml2cpp-codegen/BaseGenerator.h
diff --git a/stub-generator/ProxyGenerator.cpp b/tools/xml2cpp-codegen/ProxyGenerator.cpp
similarity index 100%
rename from stub-generator/ProxyGenerator.cpp
rename to tools/xml2cpp-codegen/ProxyGenerator.cpp
diff --git a/stub-generator/ProxyGenerator.h b/tools/xml2cpp-codegen/ProxyGenerator.h
similarity index 100%
rename from stub-generator/ProxyGenerator.h
rename to tools/xml2cpp-codegen/ProxyGenerator.h
diff --git a/stub-generator/generator_utils.cpp b/tools/xml2cpp-codegen/generator_utils.cpp
similarity index 100%
rename from stub-generator/generator_utils.cpp
rename to tools/xml2cpp-codegen/generator_utils.cpp
diff --git a/stub-generator/generator_utils.h b/tools/xml2cpp-codegen/generator_utils.h
similarity index 100%
rename from stub-generator/generator_utils.h
rename to tools/xml2cpp-codegen/generator_utils.h
diff --git a/stub-generator/xml.cpp b/tools/xml2cpp-codegen/xml.cpp
similarity index 100%
rename from stub-generator/xml.cpp
rename to tools/xml2cpp-codegen/xml.cpp
diff --git a/stub-generator/xml.h b/tools/xml2cpp-codegen/xml.h
similarity index 100%
rename from stub-generator/xml.h
rename to tools/xml2cpp-codegen/xml.h
diff --git a/stub-generator/xml2cpp.cpp b/tools/xml2cpp-codegen/xml2cpp.cpp
similarity index 100%
rename from stub-generator/xml2cpp.cpp
rename to tools/xml2cpp-codegen/xml2cpp.cpp