mo2/mob
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/mob.git synced 2026-07-27 14:07:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Upgrade dependencies. (#132)

Browse Source 
* Upgrade dependencies.
* Upgrade to Python 3.12
* Remove fmt tasks switch from fmt to std::format internally.

---------

Co-authored-by: Jeremy Rimpo <jrim@rimpo.org>
This commit is contained in:
Mikaël Capelle
2024-05-25 14:25:40 +02:00
committed by GitHub
co-authored by Jeremy Rimpo
parent eaae1e44c9
commit b0688f81b9
35 changed files with 125 additions and 11334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mob.ini
+15 -15
View File
@@ -96,29 +96,29 @@ 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
explorerpp = 1.4.0
ss_paper_lad_6788 = 7.2
ss_paper_automata_6788 = 3.2
src/cmd/pr.cpp
+7 -10
View File
@@ -116,13 +116,13 @@ namespace mob {
if (!task)
return 1;
u8cout << "checking out pr " << pr.number << " "
<< "in " << task->name() << "\n";
u8cout << "checking out pr " << pr.number << " " << "in "
<< task->name() << "\n";
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
+2 -2
View File
@@ -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
-19
View File
@@ -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
+14 -52
View File
@@ -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
+35
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
-2
View File
@@ -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
+9
View File
@@ -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
View File
@@ -1,2 +1 @@
#include "pch.h"
#include <fmt/format.cc>
src/pch.h
+1 -1
View File
@@ -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
+2 -3
View File
@@ -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
-94
View File
@@ -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
-51
View File
@@ -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
+1 -1
View File
@@ -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
-1
View File
@@ -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
+10 -3
View File
@@ -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()
src/tasks/tasks.h
+1 -32
View File
@@ -90,20 +90,6 @@ namespace mob::tasks {
void do_fetch() override;
};
class fmt : public basic_task<fmt> {
public:
fmt();
static std::string version();
static bool prebuilt();
static fs::path source_path();
protected:
void do_clean(clean c) override;
void do_fetch() override;
void do_build_and_install() override;
};
class gtest : public basic_task<gtest> {
public:
gtest();
@@ -146,24 +132,6 @@ namespace mob::tasks {
void do_build_and_install() override;
};
// needed by python
//
class libffi : public basic_task<libffi> {
public:
libffi();
static std::string version();
static bool prebuilt();
static fs::path source_path();
static fs::path include_path();
static fs::path lib_path();
protected:
void do_clean(clean c) override;
void do_fetch() override;
};
class libloot : public basic_task<libloot> {
public:
libloot();
@@ -462,6 +430,7 @@ namespace mob::tasks {
void build_and_install_prebuilt();
void build_and_install_from_source();
void prepare_dependencies();
void package();
void install_pip();
void copy_files();
src/tasks/translations.cpp
+5 -5
View File
@@ -135,7 +135,7 @@ namespace mob::tasks {
if (dir_cs.size() != 2) {
warnings_.push_back(
::fmt::format("bad directory name '{}'; skipping", dir_name));
::std::format("bad directory name '{}'; skipping", dir_name));
return {};
}
@@ -143,7 +143,7 @@ namespace mob::tasks {
const auto project_name = trim_copy(dir_cs[1]);
if (project_name.empty()) {
warnings_.push_back(
::fmt::format("bad directory name '{}', skipping", dir_name));
::std::format("bad directory name '{}', skipping", dir_name));
return {};
}
@@ -162,7 +162,7 @@ namespace mob::tasks {
// there should only be .ts files in there
if (path.extension() != ".ts") {
warnings_.push_back(
::fmt::format("{} is not a .ts file", path_to_utf8(path)));
::std::format("{} is not a .ts file", path_to_utf8(path)));
continue;
}
@@ -204,7 +204,7 @@ namespace mob::tasks {
if (!warned_.contains(gamebryo_ts)) {
warned_.insert(gamebryo_ts);
warnings_.push_back(::fmt::format(
warnings_.push_back(::std::format(
"{} is a gamebryo plugin but there is no '{}'; the "
".qm file will be missing some translations (will "
"only warn once)",
@@ -223,7 +223,7 @@ namespace mob::tasks {
if (!t) {
warnings_.push_back(
::fmt::format("directory '{}' was parsed as project '{}', but there's "
::std::format("directory '{}' was parsed as project '{}', but there's "
"no task with this name",
dir, project));

Some files were not shown because too many files have changed in this diff Show More