fix: use CMake and set version

Author: henryiii

.github/workflows/build.yml

@@ -22,11 +22,8 @@ jobs:
 
     - uses: actions/setup-python@v2
 
-    - name: Make header
-      run: python ./scripts/MakeSingleHeader.py include/CLI/* --output CLI11.hpp
-
     - name: Prepare CMake config
-      run: cmake -S . -B build
+      run: cmake -S . -B build -DCLI11_SINGLE_FILE=ON
 
     - name: Make package
       run: cmake --build build --target package_source
@@ -37,10 +34,13 @@ jobs:
         cp build/CLI11-*-Source.* CLI11-Source
         cp build/CLI11-*-Source.* .
 
+    - name: Make header
+      run: cmake --build build --target CLI11-generate-single-file
+
     - uses: actions/upload-artifact@v2
       with:
         name: CLI11.hpp
-        path: CLI11.hpp
+        path: build/include/CLI11.hpp
 
     - uses: actions/upload-artifact@v2
       with:

CMakeLists.txt

@@ -247,7 +247,10 @@ if(CLI11_SINGLE_FILE)
     add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp"
         COMMAND Python::Interpreter
         "${CMAKE_CURRENT_SOURCE_DIR}/scripts/MakeSingleHeader.py"
-        "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp"
+        ${CLI11_headers}
+        --main "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.hpp.in"
+        --output "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp"
+        --version "${CLI11_VERSION}"
         DEPENDS
         "${CMAKE_CURRENT_SOURCE_DIR}/include/CLI/CLI.hpp"
         ${CLI11_headers})

include/CLI/App.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-// #[CLI11:public_includes:set]
+// [CLI11:public_includes:set]
 #include <algorithm>
 #include <cstdint>
 #include <functional>
@@ -19,7 +19,7 @@
 #include <string>
 #include <utility>
 #include <vector>
-// #[CLI11:public_includes:end]
+// [CLI11:public_includes:end]
 
 // CLI Library includes
 #include "ConfigFwd.hpp"

include/CLI/Option.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-// #[CLI11:public_includes:set]
+// [CLI11:public_includes:set]
 #include <algorithm>
 #include <functional>
 #include <memory>
@@ -15,7 +15,7 @@
 #include <tuple>
 #include <utility>
 #include <vector>
-// #[CLI11:public_includes:end]
+// [CLI11:public_includes:end]
 
 #include "Error.hpp"
 #include "Macros.hpp"

include/CLI/StringTools.hpp

@@ -15,7 +15,7 @@
 #include <string>
 #include <type_traits>
 #include <vector>
-// [CLI11:public_includes:set]
+// [CLI11:public_includes:end]
 
 namespace CLI {
 

scripts/MakeSingleHeader.py

@@ -62,12 +62,17 @@ def read_header(self, filename):
                 ), "{name} read in more than once! Quitting.".format(name=name)
                 self[name] = content
             elif action == "set":
-                self[name] = self.get("name", set()) | set(content.strip().splitlines())
+                self[name] = self.get(name, set()) | set(content.strip().splitlines())
             else:
                 raise RuntimeError("Action not understood, must be verbatim or set")
 
+    def post_process(self):
+        for key in self:
+            if isinstance(self[key], set):
+                self[key] = "\n".join(self[key])
 
-def MakeHeader(output, main_header, files, tag, namespace, macro=None):
+
+def MakeHeader(output, main_header, files, tag, namespace, macro=None, version=None):
     groups = HeaderGroups(tag)
 
     # Set tag if possible to class variable
@@ -80,14 +85,13 @@ def MakeHeader(output, main_header, files, tag, namespace, macro=None):
     except OSError:
         groups["git"] = ""
 
-    with open(main_header) as f:
-        header = f.read()
-
     for f in files:
         groups.read_header(f)
 
     groups["namespace"] = namespace
-    groups["version"] = "HACK"
+    groups["version"] = version or groups["git"]
+
+    groups.post_process()
 
     with open(main_header) as f:
         single_header = f.read().format(**groups)
@@ -122,6 +126,15 @@ def MakeHeader(output, main_header, files, tag, namespace, macro=None):
     parser.add_argument(
         "--macro", nargs=2, help="Replaces OLD_PREFIX_ with NEW_PREFIX_"
     )
+    parser.add_argument("--version", help="Include this version in the generated file")
     args = parser.parse_args()
 
-    MakeHeader(args.output, args.main, args.files, args.tag, args.namespace, args.macro)
+    MakeHeader(
+        args.output,
+        args.main,
+        args.files,
+        args.tag,
+        args.namespace,
+        args.macro,
+        args.version,
+    )