improve single header generation (#8)

- add automatic version to the generated cib.hpp header
- reorganize tests to mirror production code directory structure
- move include guards so they are in natural locations in generated cib.hpp

Author: lukevalenty

.gitignore

@@ -1,4 +1,5 @@
 /generated-includes/
 /build/
 /Testing/
-/cmake-build*
+/cmake-build*
+/venv/

CMakeLists.txt

@@ -21,6 +21,7 @@ target_sources(Cib
 
 add_custom_command(
     DEPENDS
+        ${CMAKE_SOURCE_DIR}/tools/gen_release_header.py
         ${CMAKE_SOURCE_DIR}/include/cib/*
         ${CMAKE_SOURCE_DIR}/include/cib/detail/*
     COMMAND

include/cib/builder_meta.hpp

@@ -1,12 +1,12 @@
-#ifndef COMPILE_TIME_INIT_BUILD_BUILDER_META_HPP
-#define COMPILE_TIME_INIT_BUILD_BUILDER_META_HPP
-
-
 #include "detail/compiler.hpp"
 
 #include <utility>
 
 
+#ifndef COMPILE_TIME_INIT_BUILD_BUILDER_META_HPP
+#define COMPILE_TIME_INIT_BUILD_BUILDER_META_HPP
+
+
 namespace cib {
     template<
         typename BuilderT,

include/cib/built.hpp

@@ -1,8 +1,8 @@
-#ifndef COMPILE_TIME_INIT_BUILD_BUILT_HPP
-#define COMPILE_TIME_INIT_BUILD_BUILT_HPP
+#include "builder_meta.hpp"
 
 
-#include "builder_meta.hpp"
+#ifndef COMPILE_TIME_INIT_BUILD_BUILT_HPP
+#define COMPILE_TIME_INIT_BUILD_BUILT_HPP
 
 
 namespace cib {

include/cib/callback.hpp

@@ -1,7 +1,3 @@
-#ifndef COMPILE_TIME_INIT_BUILD_CALLBACK_HPP
-#define COMPILE_TIME_INIT_BUILD_CALLBACK_HPP
-
-
 #include "builder_meta.hpp"
 #include "detail/meta.hpp"
 #include "detail/compiler.hpp"
@@ -10,6 +6,10 @@
 #include <type_traits>
 
 
+#ifndef COMPILE_TIME_INIT_BUILD_CALLBACK_HPP
+#define COMPILE_TIME_INIT_BUILD_CALLBACK_HPP
+
+
 namespace cib {
     /**
      * Extension point/builder for simple callbacks.

include/cib/cib.hpp

@@ -31,6 +31,9 @@
 
 /*
  * cib - Compile-time Initialization and Build
+ * ..~~VERSION~~..
+ *
+ * For the documentation and the latest version, see the official github repo:
  * https://github.com/intel/compile-time-init-build
  */
 

include/cib/config.hpp

@@ -1,7 +1,3 @@
-#ifndef COMPILE_TIME_INIT_BUILD_CONFIG_HPP
-#define COMPILE_TIME_INIT_BUILD_CONFIG_HPP
-
-
 #include "detail/compiler.hpp"
 #include "detail/meta.hpp"
 #include "builder_meta.hpp"
@@ -10,6 +6,10 @@
 #include <type_traits>
 
 
+#ifndef COMPILE_TIME_INIT_BUILD_CONFIG_HPP
+#define COMPILE_TIME_INIT_BUILD_CONFIG_HPP
+
+
 namespace cib {
     namespace detail {
         template<typename Lhs, typename Rhs>

include/cib/detail/meta.hpp

@@ -1,13 +1,13 @@
-#ifndef COMPILE_TIME_INIT_BUILD_META_HPP
-#define COMPILE_TIME_INIT_BUILD_META_HPP
-
-
 #include "compiler.hpp"
 
 #include <tuple>
 #include <type_traits>
 
 
+#ifndef COMPILE_TIME_INIT_BUILD_META_HPP
+#define COMPILE_TIME_INIT_BUILD_META_HPP
+
+
 namespace cib::detail {
     template<int value>
     CIB_CONSTEXPR auto int_ = std::integral_constant<int, value>{};

include/cib/nexus.hpp

@@ -1,14 +1,14 @@
-#ifndef COMPILE_TIME_INIT_BUILD_NEXUS_HPP
-#define COMPILE_TIME_INIT_BUILD_NEXUS_HPP
-
-
 #include "detail/compiler.hpp"
 #include "detail/meta.hpp"
 #include "built.hpp"
 
 #include <type_traits>
 
 
+#ifndef COMPILE_TIME_INIT_BUILD_NEXUS_HPP
+#define COMPILE_TIME_INIT_BUILD_NEXUS_HPP
+
+
 namespace cib {
     template<typename ConfigT>
     struct initialized_builders {

test/CMakeLists.txt

@@ -3,7 +3,7 @@ project(compile_time_init_build)
 
 set(CMAKE_CXX_STANDARD 17)
 
-add_executable(tests test_meta.cpp test_builder_meta.cpp test_callback.cpp test_nexus.cpp)
+add_executable(tests detail/meta.cpp builder_meta.cpp callback.cpp nexus.cpp)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     target_compile_options(tests