libloot 0.22.3, openssl 3.2.0

Update 6788-00 styles

bootstrap.ps1

@@ -1,4 +1,10 @@
-param([switch]$Verbose)
+param(
+    [switch]
+    $Verbose,
+    [ValidateSet("Debug", "RelWithDebInfo", "Release")]
+    [string]
+    $Config = "Release"
+)
 
 $root = $PSScriptRoot
 if (!$root) {
@@ -23,7 +29,7 @@ if (! $installationPath) {
 $opts = ""
 $opts += " $root\build\mob.sln"
 $opts += " -m"
-$opts += " -p:Configuration=Release"
+$opts += " -p:Configuration=${Config}"
 $opts += " -noLogo"
 $opts += " -p:UseMultiToolTask=true"
 $opts += " -p:EnforceProcessCountAcrossBuilds=true"
@@ -45,5 +51,5 @@ if (! $?) {
     exit $LastExitCode
 }
 
-Copy-Item "$root\build\src\Release\mob.exe" "$root\mob.exe"
+Copy-Item "$root\build\src\${Config}\mob.exe" "$root\mob.exe"
 Write-Output "run ``.\mob -d prefix/path build`` to start building"

mob.ini

@@ -101,17 +101,17 @@ boost          = 1.83.0
 boost_vs       = 14.3
 fmt            = 8.1.1
 gtest          = main
-libloot        = 0.21.0
+libloot        = 0.22.3
 lz4            = v1.9.4
 nmm            = 0.71.2
-openssl        = 3.1.2
+openssl        = 3.2.0
 pyqt           = 6.5.3.dev2309101249
-pyqt_builder   = 1.15.2
-pyqt_sip       = 13.5.2
+pyqt_builder   = 1.15.3
+pyqt_sip       = 13.6.0
 python         = v3.11.5
-pybind11       = v2.10.4
+pybind11       = v2.11.1
 bzip2          = 1.0.8
-sip            = 6.7.11
+sip            = 6.7.12
 spdlog         = v1.10.0
 qt             = 6.5.0
 qt_vs          = 2019
@@ -120,12 +120,13 @@ libbsarch      = 0.0.9
 usvfs          = qt6
 explorerpp     = 1.3.5
 
-ss_paper_lad_6788      = 7.0
-ss_paper_automata_6788 = 3.0
-ss_paper_mono_6788     = 2.2
+ss_paper_lad_6788      = 7.2
+ss_paper_automata_6788 = 3.2
+ss_paper_mono_6788     = 3.2
 ss_dark_mode_1809_6788 = 3.0
 ss_morrowind_trosski   = 1.1
 ss_skyrim_trosski      = v1.1
+ss_starfield_trosski   = V1.11
 ss_fallout3_trosski    = v1.11
 ss_fallout4_trosski    = v1.11
 

patches/ncc/sources/publish.bat.patch

@@ -1,10 +0,0 @@
---- publish.bat	Thu Apr 30 00:08:44 2020
-+++ publish.bat	Thu Apr 30 00:08:14 2020
-@@ -1,6 +1,6 @@
- set _NMMPATH=%~dp0..\Nexus-Mod-Manager
- set _NMMCLIPATH=%~dp0
--set outputPath=..\..\install\bin
-+set outputPath=%~1
-
- mkdir  "%outputPath%\NCC"
- copy "%_NMMPATH%\Stage\Release\AntlrUtil.dll" "%outputPath%\NCC"

patches/python/sources/openssl.props.patch

@@ -1,10 +1,10 @@
 --- PCbuild/openssl.props	(revision 5c02a39a0b31a330e06b4d6f44835afb205dc7cc)
 +++ PCbuild/openssl.props	(date 1575994670797)
 @@ -13,6 +13,7 @@
-     <_DLLSuffix>-1_1</_DLLSuffix>
+     <_DLLSuffix>-3</_DLLSuffix>
      <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
      <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
 +    <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64</_DLLSuffix>
+     <OpenSSLDLLSuffix Condition="$(OpenSSLDLLSuffix) == ''">$(_DLLSuffix)</OpenSSLDLLSuffix>
    </PropertyGroup>
    <ItemGroup>
-     <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />

src/core/conf.cpp

@@ -378,8 +378,13 @@ namespace mob {
 
                 MOB_ASSERT(!tasks.empty());
 
-                for (auto& t : tasks)
+                for (auto& t : tasks) {
+                    if (t->name() != task &&
+                        details::find_string_for_task(t->name(), key)) {
+                        continue;
+                    }
                     details::set_string_for_task(t->name(), key, value);
+                }
             }
             else {
                 // global task option

src/tasks/pyqt.cpp

@@ -37,9 +37,12 @@ namespace mob::tasks {
 
         url source_url()
         {
-            return "https://pypi.io/packages/source/P/PyQt6/"
-                   "PyQt6-" +
-                   pyqt::version() + ".tar.gz";
+            const auto version = pyqt::version();
+            std::string base   = "https://pypi.io/packages/source/P/PyQt6/";
+            if (version.find("dev") != std::string::npos) {
+                base = "https://riverbankcomputing.com/pypi/packages/PyQt6/";
+            }
+            return base + "PyQt6-" + pyqt::version() + ".tar.gz";
         }
 
         url prebuilt_url()

src/tasks/stylesheets.cpp

@@ -9,11 +9,10 @@ namespace mob::tasks {
                  conf().version().get("ss_paper_lad_6788"), "paper-light-and-dark", ""},
 
                 {"6788-00", "paper-automata",
-                 conf().version().get("ss_paper_automata_6788"), "3.0.Paper.Automata",
-                 "2. Paper Automata-64439-A2-3-0-1610629680"},
+                 conf().version().get("ss_paper_automata_6788"), "paper-automata", ""},
 
                 {"6788-00", "paper-mono", conf().version().get("ss_paper_mono_6788"),
-                 "Paper-Mono", ""},
+                 "paper-mono", ""},
 
                 {"6788-00", "1809-dark-mode",
                  conf().version().get("ss_dark_mode_1809_6788"), "1809", ""},
@@ -32,7 +31,11 @@ namespace mob::tasks {
 
                 {"Trosski", "Mod-Organizer2-Fallout-4-Stylesheet",
                  conf().version().get("ss_fallout4_trosski"), "Fallout4-MO2-Stylesheet",
-                 ""}};
+                 ""},
+
+                {"Trosski", "Starfield_MO2_Stylesheet",
+                 conf().version().get("ss_starfield_trosski"),
+                 "Starfield.MO2.Stylsheet", ""}};
     }
 
     stylesheets::stylesheets() : task("ss", "stylesheets") {}

src/tools/nmake.cpp

@@ -56,6 +56,9 @@ namespace mob {
                 if (f.line.find("Copyright (C) Microsoft Corporation.") !=
                     std::string::npos)
                     f.lv = context::level::trace;
+                if (f.line.find("Microsoft (R) Program Maintenance Utility") !=
+                    std::string::npos)
+                    f.lv = context::level::trace;
             })
             .arg("/C", process::log_quiet)  // silent
             .arg("/S", process::log_quiet)  // silent

src/utility.cpp

@@ -14,8 +14,8 @@ namespace mob {
 
     url make_prebuilt_url(const std::string& filename)
     {
-        return "https://github.com/ModOrganizer2/modorganizer-umbrella/"
-               "releases/download/2.0/" +
+        return "https://github.com/ModOrganizer2/mob/"
+               "releases/download/2.5-dependencies/" +
                filename;
     }