diff --git a/bootstrap.ps1 b/bootstrap.ps1 index 10df715..98decdc 100644 --- a/bootstrap.ps1 +++ b/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" diff --git a/patches/ncc/sources/publish.bat.patch b/patches/ncc/sources/publish.bat.patch deleted file mode 100644 index 25ee2d2..0000000 --- a/patches/ncc/sources/publish.bat.patch +++ /dev/null @@ -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" diff --git a/src/core/conf.cpp b/src/core/conf.cpp index 1f99b02..acaa076 100644 --- a/src/core/conf.cpp +++ b/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 diff --git a/src/tasks/pyqt.cpp b/src/tasks/pyqt.cpp index d43f231..20e8397 100644 --- a/src/tasks/pyqt.cpp +++ b/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() diff --git a/src/tools/nmake.cpp b/src/tools/nmake.cpp index 3366c78..abd011e 100644 --- a/src/tools/nmake.cpp +++ b/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