adjustments to facilitating to std::format

when it's ready, which it's not...

Author: ab9rf

CMakeLists.txt

@@ -46,8 +46,8 @@ option(REMOVE_SYMBOLS_FROM_DF_STUBS "Remove debug symbols from DF stubs. (Reduce
 macro(CHECK_GCC compiler_path)
     execute_process(COMMAND ${compiler_path} -dumpversion OUTPUT_VARIABLE GCC_VERSION_OUT)
     string(STRIP "${GCC_VERSION_OUT}" GCC_VERSION_OUT)
-    if(${GCC_VERSION_OUT} VERSION_LESS "10")
-        message(SEND_ERROR "${compiler_path} version ${GCC_VERSION_OUT} cannot be used - use GCC 10 or later")
+    if(${GCC_VERSION_OUT} VERSION_LESS "11")
+        message(SEND_ERROR "${compiler_path} version ${GCC_VERSION_OUT} cannot be used - use GCC 11 or later")
     endif()
 endmacro()
 
@@ -347,13 +347,16 @@ if(BUILD_LIBRARY)
     endif()
 endif()
 
+# this can be made conditional once we get to better platform support for std::format
 INCLUDE(FetchContent)
 FetchContent_Declare(
     fmt
     GIT_REPOSITORY https://github.com/fmtlib/fmt.git
     GIT_TAG 790b9389ae99c4ddebdd2736a8602eca1fec684e # 12.1.0 + bugfix for MSVC warning + build time improvements
 )
 FetchContent_MakeAvailable(fmt)
+set(FMTLIB fmt)
+add_definitions("-DUSE_FMTLIB")
 
 if(APPLE)
     # libstdc++ (GCC 4.8.5 for OS X 10.6)
@@ -436,7 +439,7 @@ macro(dfhack_test name files)
 if(BUILD_LIBRARY AND UNIX AND NOT APPLE) # remove this once our MSVC build env has been updated
     add_executable(${name} ${files})
     target_include_directories(${name} PUBLIC depends/googletest/googletest/include)
-    target_link_libraries(${name} dfhack fmt gtest)
+    target_link_libraries(${name} dfhack ${FMTLIB} gtest)
     add_test(NAME ${name} COMMAND ${name})
 endif()
 endmacro()

library/CMakeLists.txt

@@ -58,6 +58,7 @@ set(MAIN_HEADERS
     include/DebugManager.h
     include/Error.h
     include/Export.h
+    include/Format.h
     include/Hooks.h
     include/LuaTools.h
     include/LuaWrapper.h
@@ -320,12 +321,12 @@ if(UNIX)
 endif()
 
 if(APPLE)
-    set(PROJECT_LIBS dl dfhack-md5 fmt ${DFHACK_TINYXML})
+    set(PROJECT_LIBS dl dfhack-md5 ${FMTLIB} ${DFHACK_TINYXML})
 elseif(UNIX)
-    set(PROJECT_LIBS rt dl dfhack-md5 fmt ${DFHACK_TINYXML})
+    set(PROJECT_LIBS rt dl dfhack-md5 ${FMTLIB} ${DFHACK_TINYXML})
 else(WIN32)
     # FIXME: do we really need psapi?
-    set(PROJECT_LIBS psapi dbghelp dfhack-md5 fmt ${DFHACK_TINYXML})
+    set(PROJECT_LIBS psapi dbghelp dfhack-md5 ${FMTLIB} ${DFHACK_TINYXML})
 endif()
 
 set(VERSION_SRCS DFHackVersion.cpp)
@@ -391,7 +392,7 @@ else()
     set_target_properties(dfhack PROPERTIES COMPILE_FLAGS "-include Export.h" )
     set_target_properties(dfhack-client PROPERTIES COMPILE_FLAGS "-include Export.h" )
     add_library(dfhooks_dfhack SHARED Hooks.cpp)
-    target_link_libraries(dfhooks_dfhack dfhack fmt)
+    target_link_libraries(dfhooks_dfhack dfhack ${FMTLIB})
 endif()
 
 # effectively disables debug builds...
@@ -420,7 +421,7 @@ endif()
 target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_static dfhack-version ${PROJECT_LIBS})
 set_target_properties(dfhack PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
-target_link_libraries(dfhack-client protobuf-lite clsocket jsoncpp_static fmt)
+target_link_libraries(dfhack-client protobuf-lite clsocket jsoncpp_static ${FMTLIB})
 if(WIN32)
     target_link_libraries(dfhack-client dbghelp)
 endif()

library/Core.cpp

@@ -41,6 +41,7 @@ distribution.
 #include "LuaTools.h"
 #include "DFHackVersion.h"
 #include "md5wrapper.h"
+#include "Format.h"
 
 #include "modules/DFSDL.h"
 #include "modules/DFSteam.h"
@@ -87,7 +88,6 @@ distribution.
 #include <filesystem>
 #include <SDL_events.h>
 
-#include <fmt/std.h>
 
 #ifdef _WIN32
 #define NOMINMAX
@@ -525,18 +525,19 @@ std::filesystem::path Core::findScript(std::string name)
 {
     std::vector<std::filesystem::path> paths;
     getScriptPaths(&paths);
-    for (auto it = paths.begin(); it != paths.end(); ++it)
+    for (auto& path : paths)
     {
         std::error_code ec;
-        std::filesystem::path path = std::filesystem::weakly_canonical(*it / name, ec);
+        auto raw_path = path / name;
+        std::filesystem::path load_path = std::filesystem::weakly_canonical(raw_path, ec);
         if (ec)
         {
-            con.printerr("Error loading '{}' ({})\n", *it / name, ec.message());
+            con.printerr("Error loading '{}' ({})\n", raw_path, ec.message());
             continue;
         }
 
-        if (Filesystem::isfile(path))
-            return path;
+        if (Filesystem::isfile(load_path))
+            return load_path;
     }
     return {};
 }

library/Error.cpp

@@ -1,7 +1,7 @@
 #include "Error.h"
+#include "Format.h"
 #include "MiscUtils.h"
 
-#include <fmt/format.h>
 #include <string>
 
 using namespace DFHack::Error;

library/LuaTools.cpp

@@ -249,7 +249,7 @@ static void signal_typeid_error(color_ostream* out, lua_State* state,
                                 int val_index, bool perr, bool signal)
 {
     std::string typestr = type ? type->getFullName() : "any pointer";
-    std::string error = fmt::format(fmt::runtime(msg), typestr);
+    std::string error = fmt::vformat(msg, fmt::make_format_args(typestr)); //FIXME: C++26
 
     if (signal)
     {

library/Process.cpp

@@ -35,8 +35,7 @@ distribution.
 #include <vector>
 #include <filesystem>
 
-#include <fmt/format.h>
-#include <fmt/ostream.h>
+#include "Format.h"
 
 #ifndef WIN32
 #include <dirent.h>

library/VersionInfoFactory.cpp

@@ -209,15 +209,15 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem)
         else if (type == "md5-hash")
         {
             const char *cstr_value = pMemEntry->Attribute("value");
-            fmt::print(stderr, "{} ({}): MD5: {}\n", cstr_name, cstr_os, cstr_value ? cstr_value : "NULL");
+            std::cerr << fmt::format("{} ({}): MD5: {}\n", cstr_name, cstr_os, cstr_value ? cstr_value : "NULL");
             if(!cstr_value)
                 throw Error::SymbolsXmlUnderspecifiedEntry(cstr_name);
             mem->addMD5(cstr_value);
         }
         else if (type == "binary-timestamp")
         {
             const char *cstr_value = pMemEntry->Attribute("value");
-            fmt::print(stderr, "{} ({}): PE: {}\n", cstr_name, cstr_os, cstr_value ? cstr_value : "NULL");
+            std::cerr << fmt::format("{} ({}): PE: {}\n", cstr_name, cstr_os, cstr_value ? cstr_value : "NULL");
             if(!cstr_value)
                 throw Error::SymbolsXmlUnderspecifiedEntry(cstr_name);
             mem->addPE(strtol(cstr_value, 0, 16));

library/include/ColorText.h

@@ -24,6 +24,7 @@ distribution.
 
 #pragma once
 #include "Export.h"
+#include "Format.h"
 
 #include <list>
 #include <fstream>
@@ -33,9 +34,6 @@ distribution.
 #include <stdarg.h>
 #include <sstream>
 
-#include <fmt/format.h>
-#include <fmt/std.h>
-
 namespace dfproto
 {
     class CoreTextNotification;

library/include/DataDefs.h

@@ -35,8 +35,7 @@ distribution.
 
 #include "BitArray.h"
 #include "Export.h"
-
-#include <fmt/format.h>
+#include "Format.h"
 
 struct lua_State;
 

library/include/Format.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#ifdef USE_FMTLIB
+
+#include <fmt/format.h>
+#include <fmt/std.h>
+#include <fmt/ostream.h>
+
+#else
+
+#include <format>
+
+namespace fmt = std;
+
+#endif