Fix cmake.toml and cleanup amalgamate.py

CMakeLists.txt

@@ -190,7 +190,7 @@ if(SAFETYHOOK_AMALGAMATE) # amalgamate
 	add_custom_command(
 	    OUTPUT ${AMALGAMATED_FILE} ${AMALGAMATED_HEADER}
 	    DEPENDS ${HEADER_FILES} ${SOURCE_FILES} ${AMALGAMATE_SCRIPT}
-	    COMMAND ${Python3_EXECUTABLE} ${AMALGAMATE_SCRIPT} ${AMALGAMATED_FILE} ${AMALGAMATED_HEADER}
+	    COMMAND ${Python3_EXECUTABLE} ${AMALGAMATE_SCRIPT}
 	    MAIN_DEPENDENCY ${AMALGAMATE_SCRIPT}
 	    COMMENT "Amalgamating"
 	)

amalgamate.py

@@ -4,6 +4,7 @@
 from typing import List, Set
 from glob import glob
 from shutil import rmtree
+from textwrap import dedent
 
 import os
 import re
@@ -21,8 +22,8 @@
 FILE_HEADER = ['// DO NOT EDIT. This file is auto-generated by `amalgamate.py`.', '']
 
 parser = argparse.ArgumentParser(description='bundles cpp and hpp files together')
-parser.add_argument('--polyfill', action='store_true', 
-        help='replace std::except with a polyfill so it can be compiled on C++20 or older. https://raw.githubusercontent.com/TartanLlama/expected/master/include/tl/expected.hpp')
+parser.add_argument('--polyfill', action='store_true',
+                    help='replace std::except with a polyfill so it can be compiled on C++20 or older. https://raw.githubusercontent.com/TartanLlama/expected/master/include/tl/expected.hpp')
 
 
 # Python versions before 3.10 don't have the root_dir argument for glob, so we 
@@ -160,10 +161,21 @@ def merge_sources(*, source_dir: Path, covered_headers: Set[Path]):
 
     return output
 
+
 def do_polyfill(content):
-    return content.replace('#include <expected>', '#if __has_include("expected.hpp")\n#include <expected.hpp>\n#else\n#include <tl/expected.hpp>\n#endif\n') \
-                  .replace('std::expected', 'tl::expected') \
-                  .replace('std::unexpected', 'tl::unexpected')
+    return content.replace('#include <expected>',
+                           dedent('''
+                           #if __has_include("tl/expected.hpp")
+                               #include "tl/expected.hpp"
+                           #elif __has_include("expected.hpp")
+                               #include "expected.hpp"
+                           #else
+                               #error "No <expected> polyfill found"
+                           #endif
+                           ''')) \
+        .replace('std::expected', 'tl::expected') \
+        .replace('std::unexpected', 'tl::unexpected')
+
 
 def main():
     args = parser.parse_args()

cmake.toml

@@ -97,7 +97,7 @@ set(AMALGAMATE_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/amalgamate.py)
 add_custom_command(
     OUTPUT ${AMALGAMATED_FILE} ${AMALGAMATED_HEADER}
     DEPENDS ${HEADER_FILES} ${SOURCE_FILES} ${AMALGAMATE_SCRIPT}
-    COMMAND ${Python3_EXECUTABLE} ${AMALGAMATE_SCRIPT} ${AMALGAMATED_FILE} ${AMALGAMATED_HEADER}
+    COMMAND ${Python3_EXECUTABLE} ${AMALGAMATE_SCRIPT}
     MAIN_DEPENDENCY ${AMALGAMATE_SCRIPT}
     COMMENT "Amalgamating"
 )