CMake cleanup

Author: gershnik

CMakeLists.txt

@@ -36,7 +36,6 @@ if(${Python3_Interpreter_FOUND})
     file(GLOB UNICODE_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/*.py)
 
     set(UNICODE_GENERATED_FILES
-        ${CMAKE_CURRENT_LIST_DIR}/lib/inc/sys_string/impl/unicode/mappings_data.h
         ${CMAKE_CURRENT_LIST_DIR}/lib/inc/sys_string/impl/unicode/mappings.h
         ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data.h
         ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data_15.h
@@ -59,6 +58,13 @@ if(${Python3_Interpreter_FOUND})
             ${UNICODE_GENERATED_FILES}
     )
 
+    target_sources(generate_unicode_mappings
+    PRIVATE
+        ${UNICODE_SCRIPTS}
+    )
+
+    set_source_files_properties(${UNICODE_SCRIPTS} PROPERTIES XCODE_EXPLICIT_FILE_TYPE text.script.python)
+
     add_dependencies(sys_string generate_unicode_mappings)
 
 endif()

lib/CMakeLists.txt

@@ -56,7 +56,6 @@ set(UNICODE_FILES
     ${SRCDIR}/inc/sys_string/impl/unicode/algorithms.h
     ${SRCDIR}/inc/sys_string/impl/unicode/mappings_common.h
     ${SRCDIR}/inc/sys_string/impl/unicode/mappings.h
-    ${SRCDIR}/inc/sys_string/impl/unicode/mappings_data.h
     ${SRCDIR}/inc/sys_string/impl/unicode/mappings_icu.h
 )
 source_group("Unicode" FILES ${UNICODE_FILES} ${SOURCES})

lib/inc/sys_string/impl/unicode/algorithms.h

@@ -12,7 +12,6 @@
     #include <sys_string/impl/unicode/mappings_icu.h>
 #else
     #include <sys_string/impl/unicode/mappings.h>
-    #include <sys_string/impl/unicode/mappings_data.h>
 #endif
 #include <sys_string/impl/unicode/utf_util.h>
 #include <sys_string/impl/util/iter_util.h>

lib/inc/sys_string/impl/unicode/mappings.h

@@ -18,7 +18,6 @@
 parser = argparse.ArgumentParser()
 
 parser.add_argument('datadir')
-parser.add_argument('implfile')
 parser.add_argument('hfile')
 parser.add_argument('test_grapheme_data_h')
 parser.add_argument('test_grapheme_data_15_h')
@@ -27,7 +26,6 @@
 args = parser.parse_args()
 
 datadir = Path(args.datadir)
-implfile = Path(args.implfile)
 hfile = Path(args.hfile)
 testfiles = (
     Path(args.test_grapheme_data_h),
@@ -328,25 +326,7 @@ def main():
                         print_enum((grapheme_cluster_break_prop_values, grapheme_related_emoji_values, grapheme_related_prop_values), 
                                     grapheme_masks)),
                    4)}
-}}
-
-#endif
-
-''')      
-
-
-    write_file(implfile, f'''//THIS FILE IS GENERATED. PLEASE DO NOT EDIT DIRECTLY
-
-//
-// Copyright 2020 Eugene Gershnik
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://github.com/gershnik/sys_string/blob/master/LICENSE
-//
 
-namespace sysstr::util::unicode 
-{{
 
     {indent_insert(whitespaces.print_impl('is_whitespace'), 4)}
     {indent_insert(case_info_builder.print_impl(), 4)}
@@ -359,9 +339,11 @@ def main():
         normalizer::data_size +
         grapheme_cluster_break_prop::data_size;
     static_assert(total_data_size == {total_data_size});
-
 }}
-''')
+
+#endif
+
+''')      
 
     for testfile, tests in zip(testfiles[:2], test_cases[:2]):
         write_file(testfile, f'''

lib/inc/sys_string/impl/unicode/mappings_data.h

@@ -401,4 +401,5 @@ def print_impl(self):
 
         {indent_insert(self.__decomp_builder.print_impl("normalizer::lookup"), 8)}
         '''
-        return dedent(ret)
+        return dedent(ret)
+