move utf8.h library into its own folder.

engine/interfaces/sc_bcp_api.cpp

@@ -13,7 +13,7 @@
 #include <curl/curl.h>
 #endif
 
-#include "util/utf8-2.h"
+#include "util/utf8.h/utf8.h"
 
 // ==========================================================================
 // Blizzard Community Platform API

source_files/QT_engine.pri

@@ -2,17 +2,22 @@
 # To change the list of source files for the simc engine lib, update this file and run synchronize.py
 
 
+ HEADERS += engine/buff/sc_buff.hpp
  HEADERS += engine/util/xml.hpp
  HEADERS += engine/util/timeline.hpp
  HEADERS += engine/util/stopwatch.hpp
  HEADERS += engine/util/sc_resourcepaths.hpp
  HEADERS += engine/util/sample_data.hpp
  HEADERS += engine/util/rng.hpp
  HEADERS += engine/util/io.hpp
- HEADERS += engine/buff/sc_buff.hpp
  HEADERS += engine/util/generic.hpp
  HEADERS += engine/util/concurrency.hpp
  HEADERS += engine/util/cache.hpp
+ HEADERS += engine/util/utf8-cpp/utf8/unchecked.h
+ HEADERS += engine/util/utf8-cpp/utf8/core.h
+ HEADERS += engine/util/utf8-cpp/utf8/checked.h
+ HEADERS += engine/util/utf8-cpp/utf8.h
+ HEADERS += engine/util/utf8.h/utf8.h
  HEADERS += engine/sim/x6_pantheon.hpp
  HEADERS += engine/sim/sc_profileset.hpp
  HEADERS += engine/sim/sc_option.hpp
@@ -33,10 +38,6 @@
  HEADERS += engine/config.hpp
  HEADERS += engine/dbc/data_enums.hh
  HEADERS += engine/dbc/data_definitions.hh
- HEADERS += engine/util/utf8-cpp/utf8/unchecked.h
- HEADERS += engine/util/utf8-cpp/utf8/core.h
- HEADERS += engine/util/utf8-cpp/utf8/checked.h
- HEADERS += engine/util/utf8-cpp/utf8.h
  HEADERS += engine/class_modules/paladin/sc_paladin.hpp
  HEADERS += engine/class_modules/warlock/sc_warlock.hpp
  HEADERS += engine/class_modules/priest/sc_priest.hpp

source_files/VS_engine.props

@@ -5,17 +5,22 @@ To change the list of source files, update the QT_ files and run synchronize.py
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
+		<ClInclude Include="..\engine\buff\sc_buff.hpp" />
 		<ClInclude Include="..\engine\util\xml.hpp" />
 		<ClInclude Include="..\engine\util\timeline.hpp" />
 		<ClInclude Include="..\engine\util\stopwatch.hpp" />
 		<ClInclude Include="..\engine\util\sc_resourcepaths.hpp" />
 		<ClInclude Include="..\engine\util\sample_data.hpp" />
 		<ClInclude Include="..\engine\util\rng.hpp" />
 		<ClInclude Include="..\engine\util\io.hpp" />
-		<ClInclude Include="..\engine\buff\sc_buff.hpp" />
 		<ClInclude Include="..\engine\util\generic.hpp" />
 		<ClInclude Include="..\engine\util\concurrency.hpp" />
 		<ClInclude Include="..\engine\util\cache.hpp" />
+		<ClInclude Include="..\engine\util\utf8-cpp\utf8\unchecked.h" />
+		<ClInclude Include="..\engine\util\utf8-cpp\utf8\core.h" />
+		<ClInclude Include="..\engine\util\utf8-cpp\utf8\checked.h" />
+		<ClInclude Include="..\engine\util\utf8-cpp\utf8.h" />
+		<ClInclude Include="..\engine\util\utf8.h\utf8.h" />
 		<ClInclude Include="..\engine\sim\x6_pantheon.hpp" />
 		<ClInclude Include="..\engine\sim\sc_profileset.hpp" />
 		<ClInclude Include="..\engine\sim\sc_option.hpp" />
@@ -35,10 +40,6 @@ To change the list of source files, update the QT_ files and run synchronize.py
 		<ClInclude Include="..\engine\config.hpp" />
 		<ClInclude Include="..\engine\dbc\data_enums.hh" />
 		<ClInclude Include="..\engine\dbc\data_definitions.hh" />
-		<ClInclude Include="..\engine\util\utf8-cpp\utf8\unchecked.h" />
-		<ClInclude Include="..\engine\util\utf8-cpp\utf8\core.h" />
-		<ClInclude Include="..\engine\util\utf8-cpp\utf8\checked.h" />
-		<ClInclude Include="..\engine\util\utf8-cpp\utf8.h" />
 		<ClInclude Include="..\engine\class_modules\paladin\sc_paladin.hpp" />
 		<ClInclude Include="..\engine\class_modules\warlock\sc_warlock.hpp" />
 		<ClInclude Include="..\engine\class_modules\priest\sc_priest.hpp" />

source_files/cmake_engine.txt

@@ -1,15 +1,20 @@
 set(source_files
+buff/sc_buff.hpp
 util/xml.hpp
 util/timeline.hpp
 util/stopwatch.hpp
 util/sc_resourcepaths.hpp
 util/sample_data.hpp
 util/rng.hpp
 util/io.hpp
-buff/sc_buff.hpp
 util/generic.hpp
 util/concurrency.hpp
 util/cache.hpp
+util/utf8-cpp/utf8/unchecked.h
+util/utf8-cpp/utf8/core.h
+util/utf8-cpp/utf8/checked.h
+util/utf8-cpp/utf8.h
+util/utf8.h/utf8.h
 sim/x6_pantheon.hpp
 sim/sc_profileset.hpp
 sim/sc_option.hpp
@@ -29,10 +34,6 @@ sc_enums.hpp
 config.hpp
 dbc/data_enums.hh
 dbc/data_definitions.hh
-util/utf8-cpp/utf8/unchecked.h
-util/utf8-cpp/utf8/core.h
-util/utf8-cpp/utf8/checked.h
-util/utf8-cpp/utf8.h
 class_modules/paladin/sc_paladin.hpp
 class_modules/warlock/sc_warlock.hpp
 class_modules/priest/sc_priest.hpp

source_files/synchronize.py

@@ -18,14 +18,13 @@ def parse_qt(filename):
     out = []
     with open(filename, "r") as f:
         for line in f:
-            match = re.search(r"(\s*)(SOURCES|HEADERS|PRECOMPILED_HEADER)(\s*\+?\=\s*)([\w\/-]*?)([\w]*)(\.\w*)", line)
+            match = re.search(r"(\s*)(SOURCES|HEADERS|PRECOMPILED_HEADER)(\s*\+?\=\s*)([\.\w\/-]*)(\.\w*)", line)
             if match:
                 file_type = match.group(2)
-                fullpath = match.group(4) + match.group(5) + match.group(6)
+                fullpath = match.group(4) + match.group(5)
                 dirname = match.group(4)
-                corename = match.group(5)
-                ending = match.group(6)
-                result = (file_type, fullpath, dirname, corename, ending)
+                ending = match.group(5)
+                result = (file_type, fullpath, dirname, ending)
                 out.append(result)
     return out
 
@@ -162,7 +161,7 @@ def create_vs_str(entries, gui=False):
 
 def create_cmake_str(entries):
     engine_source = list(entries)
-    engine_cpp_files = [fullpath for file_type, fullpath, dirname, corename, ending in engine_source if file_type == "SOURCES" or file_type == "HEADERS"]
+    engine_cpp_files = [fullpath for file_type, fullpath, dirname, ending in engine_source if file_type == "SOURCES" or file_type == "HEADERS"]
     engine_cpp_files = [pathlib.Path(f) for f in engine_cpp_files]
     engine_cpp_files = ["/".join(p.parts[1:]) for p in engine_cpp_files]
     output = "set(source_files\n{}\n)".format("\n".join(engine_cpp_files))