Remove option to use USVFS prebuilt.

* Updated README for 6.7.0

.github/workflows/linting.yml

@@ -10,9 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Run clang-format
-        uses: jidicula/clang-format-action@v4.11.0
+      - name: Check format
+        uses: ModOrganizer2/check-formatting-action@master
         with:
-          clang-format-version: "16"
           check-path: "."
           exclude-regex: "third-party"

mob.ini

@@ -89,36 +89,35 @@ lz4     = true
 openssl = true
 pyqt    = true
 python  = true
-usvfs   = false
 
 [versions]
 vs             = 17
 vs_year        = 2022
 vs_toolset     = 14.3
 sdk            = 10.0.22621.0
-sevenz         = 23.01
-boost          = 1.83.0
+sevenz         = 24.05
+boost          = 1.85.0
 boost_vs       = 14.3
-fmt            = 8.1.1
+fmt            = 10.2.1
 gtest          = main
-libloot        = 0.22.3
+libloot        = 0.22.4
 lz4            = v1.9.4
 nmm            = 0.71.2
-openssl        = 3.2.0
-pyqt           = 6.5.3.dev2309101249
-pyqt_builder   = 1.15.3
-pyqt_sip       = 13.6.0
-python         = v3.11.5
-pybind11       = v2.11.1
+openssl        = 3.3.0
+pyqt           = 6.7.0
+pyqt_builder   = 1.16.2
+pyqt_sip       = 13.7.0
+python         = v3.12.3
+pybind11       = v2.12.0
 bzip2          = 1.0.8
-sip            = 6.7.12
-spdlog         = v1.10.0
-qt             = 6.5.0
+sip            = 6.8.3
+spdlog         = v1.14.1
+qt             = 6.7.0
 qt_vs          = 2019
-zlib           = v1.3
+zlib           = v1.3.1
 libbsarch      = 0.0.9
-usvfs          = qt6
-explorerpp     = 1.3.5
+usvfs          = master
+explorerpp     = 1.4.0
 
 ss_paper_lad_6788      = 7.2
 ss_paper_automata_6788 = 3.2

readme.md

@@ -25,26 +25,51 @@
 
 
 ## Quick start
-```
+```powershell
 > git clone https://github.com/ModOrganizer2/mob
 > cd mob
 > bootstrap
 > mob -d c:\somewhere build
 ```
 
-## Slow start
-- Install Qt 6.5.1 ([Installer](https://download.qt.io/official_releases/online_installers/qt-unified-windows-x64-online.exe)) and select these components:
+## Extended start
+
+### Qt - CLI based install using [aqt](https://github.com/miurahr/aqtinstall)
+
+[aqt](https://github.com/miurahr/aqtinstall) is a CLI installer for Qt, it makes installing Qt extremely quick and painless, and doesn't require a login
+
+#### Installing aqt via package manager
+- Start an administrative terminal
+- Install aqt using one of the two popular packaage managers
+  - `winget install --id=miurahr.aqtinstall  -e`
+  - `choco install aqt`
+
+#### Installing aqt via python/pip
+
+- Install [Python 3.9](https://www.python.org/downloads/release/python-390/)
+- Install [aqt](https://github.com/miurahr/aqtinstall) using `pip`
+
+#### Using aqt
+- Open a terminal with administrative rights, and run
+```powershell
+aqt install-qt --outputdir "C:\Qt" windows desktop 6.7.0 win64_msvc2019_64 -m qtwebengine qtimageformats qtpositioning qtserialport qtwebchannel qtwebsockets
+```
+
+### Qt - Manual installation
+- Install Qt 6.7.0 ([Installer](https://download.qt.io/official_releases/online_installers/qt-unified-windows-x64-online.exe)) and select these components:
   - MSVC 2019 64-bit
   - Additional Libraries:
     - Qt WebEngine (display nexus pages)
     - Qt Image Formats (display images in image tab and preview)
     - Qt Positioning (required by QtWebEngine)
     - Qt Serial Port (required by Qt Core)
-    - Qt Web Channel (required by QtWebEngine)
+    - Qt WebChannel (required by QtWebEngine)
     - Qt WebSockets (Nexus api/download)
   - Optional:
     - Qt Source Files
     - Qt Debug Files
+  
+### Visual Studio
 - Install Visual Studio 2022 ([Installer](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false))
   - Desktop development with C++
   - Desktop .NET desktop development (needed by OMOD and FOMOD installers)
@@ -56,22 +81,20 @@
     - C++ /CLI support for v143 build Tools (Latest)  (for OMOD and FOMOD installers)
     - Windows 11 SDK (get latest)
     - C++ Build Tools core features
-  - Optional:
-    - Git for Windows (if you don't have git already installed)
-- Start a shell
-  - If you have git in your path, a regular cmd shell works.
-  - If not, start the _x64 Native Tools Command Prompt for VS 2019_, it'll use Git for Windows installed above.
-- Do:
-	```
-	mkdir C:\dev
-	cd C:\dev
-	git clone https://github.com/ModOrganizer2/mob
-	cd mob
-	bootstrap
-	mob -d C:\dev\modorganizer build
-	```
-- Once `mob` is finished, everything will be in `C:\dev\modorganizer`. Mod Organizer can be run from `install\bin\ModOrganizer.exe`. The Visual Studio solution for Mod Organizer itself is `build\modorganizer_super\modorganizer\vsbuild\organizer.sln`.
+    - Git for Windows (Skip if you have this already installed outside of the VS installer)
+    - CMake tools for Windows (Skip if you have this already installed outside of the VS installer)
 
+## Setting up MOB
+- Open a shell. If you've installed Git or CMake through the VS installer, they won't be on your PATH, so you must use x64 Native Tools Command Prompt for VS 2022.- Pick a folder to develop MO2 in, for these steps it'll be `C:\dev`
+- Execute these commands
+```powershell
+mkdir C:\dev
+cd C:\dev
+git clone https://github.com/ModOrganizer2/mob
+./bootstrap.ps1
+mob -d C:\dev\modorganizer build
+```
+- Once `mob` is finished, everything will be in `C:\dev\modorganizer`. Mod Organizer can be run from `install\bin\ModOrganizer.exe`. The Visual Studio solution for Mod Organizer itself is `build\modorganizer_super\modorganizer\vsbuild\organizer.sln`.
 
 ### Prebuilts
 Some third-parties are not normally built from source, but this can be changed in the options by setting the various tasks in `[prebuilt]` to `false`. If OpenSSL is built from source, perl is required ([Strawberry Perl 5.30.2.1 installer](http://strawberryperl.com/download/5.30.2.1/strawberry-perl-5.30.2.1-64bit.msi)).

src/cmd/pr.cpp

@@ -122,7 +122,7 @@ namespace mob {
                 git_wrap g(task->source_path());
 
                 g.fetch(task->git_url().string(),
-                        fmt::format("pull/{}/head", pr.number));
+                        std::format("pull/{}/head", pr.number));
 
                 g.checkout("FETCH_HEAD");
             }
@@ -208,13 +208,10 @@ namespace mob {
     {
         nlohmann::json json;
 
-        constexpr auto* pattern =
-            "https://api.github.com/search/issues?per_page=100&q="
-            "is:pr+org:{org:}+author:{author:}+is:open+head:{branch:}";
+        constexpr auto* pattern = "https://api.github.com/search/issues?per_page=100&q="
+                                  "is:pr+org:{0:}+author:{1:}+is:open+head:{2:}";
 
-        const auto search_url =
-            fmt::format(pattern, fmt::arg("org", org), fmt::arg("author", author),
-                        fmt::arg("branch", branch));
+        const auto search_url = std::format(pattern, org, author, branch);
 
         u8cout << "search url is " << search_url << "\n";
 
@@ -275,7 +272,7 @@ namespace mob {
             return {};
         }
 
-        const url u(fmt::format("https://api.github.com/repos/{}/{}/pulls/{}",
+        const url u(std::format("https://api.github.com/repos/{}/{}/pulls/{}",
                                 task->org(), task->repo(), pr));
 
         curl_downloader dl;

src/cmd/release.cpp

@@ -367,7 +367,7 @@ namespace mob {
         }
 
         const auto q =
-            fmt::format("prefix {} already exists, delete?", path_to_utf8(prefix));
+            std::format("prefix {} already exists, delete?", path_to_utf8(prefix));
 
         if (ask_yes_no(q, yn::no) != yn::yes)
             return false;
@@ -489,7 +489,7 @@ namespace mob {
         const auto* lcp = static_cast<LANGANDCODEPAGE*>(value_pointer);
 
         const auto sub_block =
-            fmt::format(L"\\StringFileInfo\\{:04x}{:04x}\\FileVersion", lcp->wLanguage,
+            std::format(L"\\StringFileInfo\\{:04x}{:04x}\\FileVersion", lcp->wLanguage,
                         lcp->wCodePage);
 
         ret = VerQueryValueW(buffer.get(), sub_block.c_str(), &value_pointer,

src/core/context.cpp

@@ -5,25 +5,6 @@
 #include "../utility.h"
 #include "conf.h"
 
-namespace mob::details {
-
-    std::string converter<std::wstring>::convert(const std::wstring& s)
-    {
-        return utf16_to_utf8(s);
-    }
-
-    std::string converter<fs::path>::convert(const fs::path& s)
-    {
-        return utf16_to_utf8(s.native());
-    }
-
-    std::string converter<url>::convert(const url& u)
-    {
-        return u.string();
-    }
-
-}  // namespace mob::details
-
 namespace mob {
 
     // timestamps are relative to this

src/core/context.h

@@ -1,45 +1,7 @@
 #pragma once
 
 #include "../utility.h"
-
-// T to std::string converters
-//
-// those are kept in this namespace so they don't leak all over the place;
-// they're used directly by context::do_log() below
-
-namespace mob::details {
-
-    class mob::url;
-
-    template <class T, class = void>
-    struct converter {
-        static const T& convert(const T& t) { return t; }
-    };
-
-    template <>
-    struct converter<std::wstring> {
-        static std::string convert(const std::wstring& s);
-    };
-
-    template <>
-    struct converter<fs::path> {
-        static std::string convert(const fs::path& s);
-    };
-
-    template <>
-    struct converter<url> {
-        static std::string convert(const url& u);
-    };
-
-    template <class T>
-    struct converter<T, std::enable_if_t<std::is_enum_v<T>>> {
-        static std::string convert(T e)
-        {
-            return std::to_string(static_cast<std::underlying_type_t<T>>(e));
-        }
-    };
-
-}  // namespace mob::details
+#include "./formatters.h"
 
 namespace mob {
 
@@ -57,7 +19,7 @@ namespace mob {
     // in places where there is no context available, there's a global one can that
     // be retrieved with gcx() for logging
     //
-    // all log functions will use fmt::format() internally, so they can be used
+    // all log functions will use std::format() internally, so they can be used
     // like:
     //
     //    cx.log(context::generic, "eat more {}", "potatoes");
@@ -161,7 +123,7 @@ namespace mob {
         // logs a formatted string with the dump level
         //
         template <class... Args>
-        void dump(reason r, const char* f, Args&&... args) const
+        void dump(reason r, std::format_string<Args...> f, Args&&... args) const
         {
             do_log(false, r, level::dump, f, std::forward<Args>(args)...);
         }
@@ -169,7 +131,7 @@ namespace mob {
         // logs a formatted string with the trace level
         //
         template <class... Args>
-        void trace(reason r, const char* f, Args&&... args) const
+        void trace(reason r, std::format_string<Args...> f, Args&&... args) const
         {
             do_log(false, r, level::trace, f, std::forward<Args>(args)...);
         }
@@ -177,7 +139,7 @@ namespace mob {
         // logs a formatted string with the debug level
         //
         template <class... Args>
-        void debug(reason r, const char* f, Args&&... args) const
+        void debug(reason r, std::format_string<Args...> f, Args&&... args) const
         {
             do_log(false, r, level::debug, f, std::forward<Args>(args)...);
         }
@@ -185,7 +147,7 @@ namespace mob {
         // logs a formatted string with the info level
         //
         template <class... Args>
-        void info(reason r, const char* f, Args&&... args) const
+        void info(reason r, std::format_string<Args...> f, Args&&... args) const
         {
             do_log(false, r, level::info, f, std::forward<Args>(args)...);
         }
@@ -193,7 +155,7 @@ namespace mob {
         // logs a formatted string with the warning level
         //
         template <class... Args>
-        void warning(reason r, const char* f, Args&&... args) const
+        void warning(reason r, std::format_string<Args...> f, Args&&... args) const
         {
             do_log(false, r, level::warning, f, std::forward<Args>(args)...);
         }
@@ -201,7 +163,7 @@ namespace mob {
         // logs a formatted string with the error level
         //
         template <class... Args>
-        void error(reason r, const char* f, Args&&... args) const
+        void error(reason r, std::format_string<Args...> f, Args&&... args) const
         {
             do_log(false, r, level::error, f, std::forward<Args>(args)...);
         }
@@ -211,7 +173,8 @@ namespace mob {
         // tasks
         //
         template <class... Args>
-        [[noreturn]] void bail_out(reason r, const char* f, Args&&... args) const
+        [[noreturn]] void bail_out(reason r, std::format_string<Args...> f,
+                                   Args&&... args) const
         {
             do_log(true, r, level::error, f, std::forward<Args>(args)...);
         }
@@ -227,7 +190,8 @@ namespace mob {
         // bailed exception after logging
         //
         template <class... Args>
-        void do_log(bool bail, reason r, level lv, const char* f, Args&&... args) const
+        void do_log(bool bail, reason r, level lv, std::format_string<Args...> f,
+                    Args&&... args) const
         {
             // discard log if it's not enabled and it's not bailing out
             if (!bail && !enabled(lv))
@@ -235,9 +199,7 @@ namespace mob {
 
             try {
                 // formatting string
-                const std::string s =
-                    fmt::format(f, details::converter<std::decay_t<Args>>::convert(
-                                       std::forward<Args>(args))...);
+                const std::string s = std::format(f, std::forward<Args>(args)...);
 
                 do_log_impl(bail, r, lv, s);
             }
@@ -253,7 +215,7 @@ namespace mob {
                 // a ghetto conversion and hope it gives enough info
                 std::wstring s;
 
-                const char* p = f;
+                const char* p = f.get().data();
                 while (*p) {
                     s += (wchar_t)*p;
                     ++p;

src/core/formatters.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "../utility/string.h"
+
+template <>
+struct std::formatter<std::wstring, char> : std::formatter<std::string, char> {
+    template <class FmtContext>
+    FmtContext::iterator format(std::wstring const& s, FmtContext& ctx) const
+    {
+        return std::formatter<std::string, char>::format(mob::utf16_to_utf8(s), ctx);
+    }
+};
+
+template <>
+struct std::formatter<std::filesystem::path, char>
+    : std::formatter<std::basic_string<std::filesystem::path::value_type>, char> {
+    template <class FmtContext>
+    FmtContext::iterator format(std::filesystem::path const& s, FmtContext& ctx) const
+    {
+        return std::formatter<std::basic_string<std::filesystem::path::value_type>,
+                              char>::format(s.native(), ctx);
+    }
+};
+
+template <class Enum, class CharT>
+    requires std::is_enum_v<Enum>
+struct std::formatter<Enum, CharT>
+    : std::formatter<std::underlying_type_t<Enum>, CharT> {
+    template <class FmtContext>
+    FmtContext::iterator format(Enum v, FmtContext& ctx) const
+    {
+        return std::formatter<std::underlying_type_t<Enum>, CharT>::format(
+            static_cast<std::underlying_type_t<Enum>>(v), ctx);
+    }
+};

src/core/ini.cpp

@@ -10,11 +10,11 @@
 namespace mob {
 
     template <class... Args>
-    void ini_error(const ini_data& ini, std::size_t line, std::string_view f,
+    void ini_error(const ini_data& ini, std::size_t line, std::format_string<Args...> f,
                    Args&&... args)
     {
         gcx().bail_out(context::conf, "{}:{}: {}", path_to_utf8(ini.path), (line + 1),
-                       fmt::format(f, std::forward<Args>(args)...));
+                       std::format(f, std::forward<Args>(args)...));
     }
 
     ini_data::kv_map& ini_data::get_section(std::string_view name)

src/core/paths.cpp

@@ -326,7 +326,7 @@ namespace mob {
 
         // check known installation paths for a bunch of versions
         for (int v : {5, 6, 7, 8}) {
-            const fs::path inno_dir = fmt::format("Inno Setup {}", v);
+            const fs::path inno_dir = std::format("Inno Setup {}", v);
 
             // check for both architectures
             for (fs::path pf : {conf().path().pf_x86(), conf().path().pf_x64()}) {

src/main.cpp

@@ -29,12 +29,10 @@ namespace mob {
         add_task<parallel_tasks>()
             .add_task<sevenz>()
             .add_task<zlib>()
-            .add_task<fmt>()
             .add_task<gtest>()
             .add_task<libbsarch>()
             .add_task<libloot>()
             .add_task<openssl>()
-            .add_task<libffi>()
             .add_task<bzip2>();
 
         add_task<parallel_tasks>()

src/net.h

@@ -115,3 +115,12 @@ namespace mob {
     };
 
 }  // namespace mob
+
+template <>
+struct std::formatter<mob::url, char> : std::formatter<std::string, char> {
+    template <class FmtContext>
+    FmtContext::iterator format(mob::url const& u, FmtContext& ctx) const
+    {
+        return std::formatter<std::string, char>::format(u.string(), ctx);
+    }
+};

src/pch.cpp

@@ -1,2 +1 @@
 #include "pch.h"
-#include <fmt/format.cc>

src/pch.h

@@ -48,6 +48,7 @@
 #include <atomic>
 #include <charconv>
 #include <filesystem>
+#include <format>
 #include <fstream>
 #include <functional>
 #include <iostream>
@@ -69,7 +70,6 @@
 
 #include <clipp.h>
 #include <curl/curl.h>
-#include <fmt/format.h>
 #include <nlohmann/json.hpp>
 
 #pragma warning(pop)

src/tasks/explorerpp.cpp

@@ -7,9 +7,8 @@ namespace mob::tasks {
 
         url source_url()
         {
-            return "https://explorerplusplus.com/software/"
-                   "explorer++_" +
-                   explorerpp::version() + "_x64.zip";
+            return "https://download.explorerplusplus.com/stable/" +
+                   explorerpp::version() + "/explorerpp_x64.zip";
         }
 
     }  // namespace

src/tasks/fmt.cpp

@@ -1,94 +0,0 @@
-#include "pch.h"
-#include "tasks.h"
-
-namespace mob::tasks {
-
-    namespace {
-
-        url source_url()
-        {
-            return "https://github.com/fmtlib/fmt/releases/download/" + fmt::version() +
-                   "/fmt-" + fmt::version() + ".zip";
-        }
-
-        cmake create_cmake_tool(const fs::path& src_path,
-                                cmake::ops o = cmake::ops::generate)
-        {
-            return std::move(cmake(o)
-                                 .generator(cmake::vs)
-                                 .root(src_path)
-                                 .prefix(src_path / "build")
-                                 .def("FMT_TEST", "OFF")
-                                 .def("FMT_DOC", "OFF"));
-        }
-
-        fs::path solution_path()
-        {
-            const auto build_path = create_cmake_tool(fmt::source_path()).build_path();
-
-            return build_path / "INSTALL.vcxproj";
-        }
-
-        msbuild create_msbuild_tool(msbuild::ops o = msbuild::ops::build)
-        {
-            return std::move(msbuild(o).solution(solution_path()));
-        }
-
-    }  // namespace
-
-    fmt::fmt() : basic_task("fmt") {}
-
-    std::string fmt::version()
-    {
-        return conf().version().get("fmt");
-    }
-
-    bool fmt::prebuilt()
-    {
-        // no prebuilts available
-        return false;
-    }
-
-    fs::path fmt::source_path()
-    {
-        return conf().path().build() / ("fmt-" + version());
-    }
-
-    void fmt::do_clean(clean c)
-    {
-        // delete download
-        if (is_set(c, clean::redownload))
-            run_tool(downloader(source_url(), downloader::clean));
-
-        // delete the whole directory
-        if (is_set(c, clean::reextract)) {
-            cx().trace(context::reextract, "deleting {}", source_path());
-            op::delete_directory(cx(), source_path(), op::optional);
-
-            // no need to do anything else
-            return;
-        }
-
-        // cmake clean
-        if (is_set(c, clean::reconfigure))
-            run_tool(create_cmake_tool(source_path(), cmake::clean));
-
-        // msbuild clean
-        if (is_set(c, clean::rebuild))
-            run_tool(create_msbuild_tool(msbuild::clean));
-    }
-
-    void fmt::do_fetch()
-    {
-        const auto file = run_tool(downloader(source_url()));
-
-        run_tool(extractor().file(file).output(source_path()));
-    }
-
-    void fmt::do_build_and_install()
-    {
-        run_tool(create_cmake_tool(source_path()));
-        run_tool(create_msbuild_tool());
-    }
-
-}  // namespace mob::tasks

src/tasks/libffi.cpp

@@ -1,51 +0,0 @@
-#include "pch.h"
-#include "tasks.h"
-
-namespace mob::tasks {
-
-    // required by python
-
-    libffi::libffi() : basic_task("libffi") {}
-
-    std::string libffi::version()
-    {
-        return {};
-    }
-
-    bool libffi::prebuilt()
-    {
-        // actually always prebuilt
-        return false;
-    }
-
-    fs::path libffi::source_path()
-    {
-        return conf().path().build() / "libffi";
-    }
-
-    void libffi::do_clean(clean c)
-    {
-        // delete the whole thing
-        if (is_set(c, clean::reclone))
-            git_wrap::delete_directory(cx(), source_path());
-    }
-
-    void libffi::do_fetch()
-    {
-        run_tool(make_git()
-                     .url(make_git_url("python", "cpython-bin-deps"))
-                     .branch("libffi-3.4.4")
-                     .root(source_path()));
-    }
-
-    fs::path libffi::include_path()
-    {
-        return libffi::source_path() / "amd64" / "include";
-    }
-
-    fs::path libffi::lib_path()
-    {
-        return libffi::source_path() / "amd64";
-    }
-
-}  // namespace mob::tasks

src/tasks/libloot.cpp

@@ -60,7 +60,7 @@ namespace mob::tasks {
     void libloot::do_build_and_install()
     {
         // copy dll
-        op::copy_file_to_dir_if_better(cx(), source_path() / "loot.dll",
+        op::copy_file_to_dir_if_better(cx(), source_path() / "bin" / "loot.dll",
                                        conf().path().install_loot());
     }
 

src/tasks/modorganizer.cpp

@@ -211,7 +211,6 @@ namespace mob::tasks {
                              .def("DEPENDENCIES_DIR", conf().path().build())
                              .def("BOOST_ROOT", boost::source_path())
                              .def("BOOST_LIBRARYDIR", boost::lib_path(arch::x64))
-                             .def("FMT_ROOT", fmt::source_path())
                              .def("SPDLOG_ROOT", spdlog::source_path())
                              .def("LOOT_PATH", libloot::source_path())
                              .def("LZ4_ROOT", lz4::source_path())

src/tasks/python.cpp

@@ -156,6 +156,9 @@ namespace mob::tasks {
 
     void python::build_and_install_from_source()
     {
+        // download externals
+        prepare_dependencies();
+
         // build
         run_tool(create_msbuild_tool());
 
@@ -172,6 +175,12 @@ namespace mob::tasks {
         copy_files();
     }
 
+    void python::prepare_dependencies()
+    {
+        const auto bat = source_path() / "PCBuild" / "get_externals.bat";
+        run_tool(process_runner(process().binary(bat).cwd(source_path())));
+    }
+
     void python::package()
     {
         if (fs::exists(python_core_zip_file())) {
@@ -224,9 +233,7 @@ namespace mob::tasks {
                     {"bz2Dir=" + path_to_utf8(bzip2::source_path()),
                      "zlibDir=" + path_to_utf8(zlib::source_path()),
                      "opensslIncludeDir=" + path_to_utf8(openssl::include_path()),
-                     "opensslOutDir=" + path_to_utf8(openssl::source_path()),
-                     "libffiIncludeDir=" + path_to_utf8(libffi::include_path()),
-                     "libffiOutDir=" + path_to_utf8(libffi::lib_path())}));
+                     "opensslOutDir=" + path_to_utf8(openssl::source_path())}));
     }
 
     fs::path python::python_exe()