Merge pull request ModOrganizer2#122 from ModOrganizer2/dev/clean-and…

…-fix

Cleaning and improvements

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"

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/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