Remove option to use USVFS prebuilt.

* Updated README for 6.7.0

.clang-format

@@ -0,0 +1,26 @@
+---
+# We'll use defaults from the LLVM style, but with 4 columns indentation.
+BasedOnStyle: LLVM
+IndentWidth: 4
+---
+Language: Cpp
+# Force pointers to the type for C++.
+DerivePointerAlignment: false
+PointerAlignment: Left
+AlignConsecutiveAssignments: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Empty
+AlwaysBreakTemplateDeclarations: Yes
+AccessModifierOffset: -4
+AlignTrailingComments: true
+SpacesBeforeTrailingComments: 2
+NamespaceIndentation: All
+MaxEmptyLinesToKeep: 1
+BreakBeforeBraces: Stroustrup
+ColumnLimit: 88
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^"pch.h"$'
+    Priority: -1
+    SortPriority: -1

.git-blame-ignore-revs

@@ -0,0 +1 @@
+d0913d07d33929d7b753a3a09a0dac70e5befbc1

.gitattributes

@@ -0,0 +1,7 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cpp text eol=crlf
+*.h text eol=crlf

.github/workflows/build.yml

@@ -0,0 +1,16 @@
+name: Build Mob
+
+on:
+  push:
+    branches: master
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build Mob
+        shell: pwsh
+        run: ./bootstrap.ps1 -Verbose

.github/workflows/linting.yml

@@ -0,0 +1,17 @@
+name: Lint Mob
+
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Check format
+        uses: ModOrganizer2/check-formatting-action@master
+        with:
+          check-path: "."
+          exclude-regex: "third-party"

CMakeLists.txt

@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(mob)
+add_subdirectory(src)
+
+set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT mob)

bootstrap.ps1

@@ -1,8 +1,20 @@
+param(
+    [switch]
+    $Verbose,
+    [ValidateSet("Debug", "RelWithDebInfo", "Release")]
+    [string]
+    $Config = "Release"
+)
+
 $root = $PSScriptRoot
 if (!$root) {
-	$root = "."
+    $root = "."
 }
 
+$output = if ($Verbose) { "Out-Default" } else { "Out-Null" }
+
+cmake -B $root/build $root | & $output
+
 $installationPath = & $root\third-party\bin\vswhere.exe -products * -nologo -prerelease -latest -property installationPath
 if (! $?) {
     Write-Error "vswhere returned $LastExitCode"
@@ -15,13 +27,16 @@ if (! $installationPath) {
 }
 
 $opts = ""
-$opts += " $root\vs\mob.sln"
+$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"
-$opts += " -clp:ErrorsOnly;Verbosity=minimal"
+
+if (!$Verbose) {
+    $opts += " -clp:ErrorsOnly;Verbosity=minimal"
+}
 
 $vsDevCmd = "$installationPath\Common7\Tools\VsDevCmd.bat"
 if (!(Test-Path "$vsDevCmd")) {
@@ -36,5 +51,5 @@ if (! $?) {
     exit $LastExitCode
 }
 
-Copy-Item "$root\build\Release\x64\mob.exe" "$root\mob.exe"
+Copy-Item "$root\build\src\${Config}\mob.exe" "$root\mob.exe"
-echo "run ``.\mob -d prefix/path build`` to start building"
+Write-Output "run ``.\mob -d prefix/path build`` to start building"

licenses/ValveFileVDF.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Matthias Moeller 2016 m_moeller@live.de
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

licenses/openssl.txt

@@ -1,125 +1,177 @@
 
-  LICENSE ISSUES
+                                 Apache License
-  ==============
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
 
-  The OpenSSL toolkit stays under a double license, i.e. both the conditions of
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts.
 
-  OpenSSL License
+   1. Definitions.
-  ---------------
 
-/* ====================================================================
+      "License" shall mean the terms and conditions for use, reproduction,
- * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+      and distribution as defined by Sections 1 through 9 of this document.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
- Original SSLeay License
+      "Licensor" shall mean the copyright owner or entity authorized by
- -----------------------
+      the copyright owner that is granting the License.
 
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+      "Legal Entity" shall mean the union of the acting entity and all
- * All rights reserved.
+      other entities that control, are controlled by, or are under common
- *
+      control with that entity. For the purposes of this definition,
- * This package is an SSL implementation written
+      "control" means (i) the power, direct or indirect, to cause the
- * by Eric Young (eay@cryptsoft.com).
+      direction or management of such entity, whether by contract or
- * The implementation was written so as to conform with Netscapes SSL.
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *
+      outstanding shares, or (iii) beneficial ownership of such entity.
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
 
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

mob.ini

@@ -89,45 +89,45 @@ 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
+sevenz         = 24.05
-boost          = 1.82.0
+boost          = 1.85.0
 boost_vs       = 14.3
-fmt            = 8.1.1
+fmt            = 10.2.1
 gtest          = main
-libloot        = 0.19.4
+libloot        = 0.22.4
 lz4            = v1.9.4
 nmm            = 0.71.2
-openssl        = 1.1.1u
+openssl        = 3.3.0
-pyqt           = 6.5.1
+pyqt           = 6.7.0
-pyqt_builder   = 1.15.1
+pyqt_builder   = 1.16.2
-pyqt_sip       = 13.5.1
+pyqt_sip       = 13.7.0
-python         = v3.10.12
+python         = v3.12.3
-pybind11       = v2.10.4
+pybind11       = v2.12.0
 bzip2          = 1.0.8
-sip            = 6.7.1
+sip            = 6.8.3
-spdlog         = v1.10.0
+spdlog         = v1.14.1
-qt             = 6.5.1
+qt             = 6.7.0
 qt_vs          = 2019
-zlib           = v1.2.13
+zlib           = v1.3.1
 libbsarch      = 0.0.9
-usvfs          = qt6
+usvfs          = master
-explorerpp     = 1.3.5
+explorerpp     = 1.4.0
 
-ss_paper_lad_6788      = 7.0
+ss_paper_lad_6788      = 7.2
-ss_paper_automata_6788 = 3.0
+ss_paper_automata_6788 = 3.2
-ss_paper_mono_6788     = 2.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_fallout3_trosski    = v1.1
+ss_starfield_trosski   = V1.11
-ss_fallout4_trosski    = v1.1
+ss_fallout3_trosski    = v1.11
+ss_fallout4_trosski    = v1.11
 
 [paths]
 third_party          =

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

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
+## Extended 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:
+
+### 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 (Skip if you have this already installed outside of the VS installer)
-    - Git for Windows (if you don't have git already installed)
+    - CMake tools for Windows (Skip if you have this already installed outside of the VS installer)
-- 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`.
 
+## 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/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.16)
+
+file(GLOB_RECURSE source_files *.cpp)
+file(GLOB_RECURSE header_files *.h)
+
+add_executable(mob ${source_files} ${header_files})
+set_target_properties(mob PROPERTIES CXX_STANDARD 20)
+
+target_compile_definitions(mob PUBLIC NOMINMAX)
+target_compile_options(mob PUBLIC "/MT")
+target_include_directories(mob PUBLIC ${CMAKE_SOURCE_DIR}/third-party/include)
+target_link_libraries(mob PUBLIC
+    wsock32 ws2_32 crypt32 wldap32 dbghelp shlwapi version
+    optimized ${CMAKE_SOURCE_DIR}/third-party/lib/libcurl.lib
+    debug ${CMAKE_SOURCE_DIR}/third-party/lib/libcurl-d.lib
+    optimized ${CMAKE_SOURCE_DIR}/third-party/lib/zlib.lib
+    debug ${CMAKE_SOURCE_DIR}/third-party/lib/zlibd.lib)
+
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}
+    PREFIX src
+    FILES ${source_files} ${header_files})
+set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT mob)

src/cmd/build.cpp

@@ -1,200 +1,195 @@
 #include "pch.h"
-#include "commands.h"
-#include "../core/ini.h"
 #include "../core/conf.h"
 #include "../core/context.h"
+#include "../core/ini.h"
 #include "../core/op.h"
 #include "../tasks/task_manager.h"
+#include "commands.h"
 
-namespace mob
+namespace mob {
-{
 
-build_command::build_command()
+    build_command::build_command() : command(requires_options | handle_sigint) {}
-	: command(requires_options | handle_sigint)
-{
-}
 
-command::meta_t build_command::meta() const
+    command::meta_t build_command::meta() const
-{
+    {
-	return
+        return {"build", "builds tasks"};
-	{
+    }
-		"build",
-		"builds tasks"
-	};
-}
 
-clipp::group build_command::do_group()
+    clipp::group build_command::do_group()
-{
+    {
-	return
+        return (clipp::command("build")).set(picked_),
-		(clipp::command("build")).set(picked_),
 
-		(clipp::option("-h", "--help") >> help_)
+               (clipp::option("-h", "--help") >> help_) % ("shows this message"),
-			% ("shows this message"),
 
-		(clipp::option("-g", "--redownload") >> redownload_)
+               (clipp::option("-g", "--redownload") >> redownload_) %
-			% "redownloads archives, see --reextract",
+                   "redownloads archives, see --reextract",
 
-		(clipp::option("-e", "--reextract") >> reextract_)
+               (clipp::option("-e", "--reextract") >> reextract_) %
-			% "deletes source directories and re-extracts archives",
+                   "deletes source directories and re-extracts archives",
 
-		(clipp::option("-c", "--reconfigure") >> reconfigure_)
+               (clipp::option("-c", "--reconfigure") >> reconfigure_) %
-			% "reconfigures the task by running cmake, configure scripts, "
+                   "reconfigures the task by running cmake, configure scripts, "
-			   "etc.; some tasks might have to delete the whole source "
+                   "etc.; some tasks might have to delete the whole source "
-			   "directory",
+                   "directory",
 
-		(clipp::option("-b", "--rebuild") >> rebuild_)
+               (clipp::option("-b", "--rebuild") >> rebuild_) %
-			%  "cleans and rebuilds projects; some tasks might have to "
+                   "cleans and rebuilds projects; some tasks might have to "
-			   "delete the whole source directory",
+                   "delete the whole source directory",
 
-		(clipp::option("-n", "--new") >> new_)
+               (clipp::option("-n", "--new") >> new_) %
-			% "deletes everything and starts from scratch",
+                   "deletes everything and starts from scratch",
 
-		(
+               (clipp::option("--clean-task").call([&] {
-			clipp::option("--clean-task").call([&]{ clean_ = true; }) |
+                   clean_ = true;
-			clipp::option("--no-clean-task").call([&]{ clean_ = false; })
+               }) |
-		) % "sets whether tasks are cleaned",
+                clipp::option("--no-clean-task").call([&] {
+                    clean_ = false;
+                })) %
+                   "sets whether tasks are cleaned",
 
-		(
+               (clipp::option("--fetch-task").call([&] {
-			clipp::option("--fetch-task").call([&]{ fetch_ = true; }) |
+                   fetch_ = true;
-			clipp::option("--no-fetch-task").call([&]{ fetch_ = false; })
+               }) |
-		) % "sets whether tasks are fetched",
+                clipp::option("--no-fetch-task").call([&] {
+                    fetch_ = false;
+                })) %
+                   "sets whether tasks are fetched",
 
-		(
+               (clipp::option("--build-task").call([&] {
-			clipp::option("--build-task").call([&]{ build_ = true; }) |
+                   build_ = true;
-			clipp::option("--no-build-task").call([&]{ build_ = false; })
+               }) |
-		) % "sets whether tasks are built",
+                clipp::option("--no-build-task").call([&] {
+                    build_ = false;
+                })) %
+                   "sets whether tasks are built",
 
-		(
+               (clipp::option("--pull").call([&] {
-			clipp::option("--pull").call([&]{ nopull_ = false; }) |
+                   nopull_ = false;
-			clipp::option("--no-pull").call([&]{ nopull_ = true; })
+               }) |
-		) % "whether to pull repos that are already cloned; global override",
+                clipp::option("--no-pull").call([&] {
+                    nopull_ = true;
+                })) %
+                   "whether to pull repos that are already cloned; global override",
 
-		(
+               (clipp::option("--revert-ts").call([&] {
-			clipp::option("--revert-ts").call([&]{ revert_ts_ = true; }) |
+                   revert_ts_ = true;
-			clipp::option("--no-revert-ts").call([&]{ revert_ts_ = false; })
+               }) |
-		) % "whether to revert all the .ts files in a repo before pulling to "
+                clipp::option("--no-revert-ts").call([&] {
-		    "avoid merge errors; global override",
+                    revert_ts_ = false;
+                })) %
+                   "whether to revert all the .ts files in a repo before pulling to "
+                   "avoid merge errors; global override",
 
-		(clipp::option("--ignore-uncommitted-changes") >> ignore_uncommitted_)
+               (clipp::option("--ignore-uncommitted-changes") >> ignore_uncommitted_) %
-			% "when --reextract is given, directories controlled by git will "
+                   "when --reextract is given, directories controlled by git will "
-			  "be deleted even if they contain uncommitted changes",
+                   "be deleted even if they contain uncommitted changes",
 
-		(clipp::option("--keep-msbuild") >> keep_msbuild_)
+               (clipp::option("--keep-msbuild") >> keep_msbuild_) %
-			% "don't terminate msbuild.exe instances after building",
+                   "don't terminate msbuild.exe instances after building",
 
-		(clipp::opt_values(
+               (clipp::opt_values(clipp::match::prefix_not("-"), "task", tasks_)) %
-			clipp::match::prefix_not("-"), "task", tasks_))
+                   "tasks to run; specify 'super' to only build modorganizer "
-			% "tasks to run; specify 'super' to only build modorganizer "
+                   "projects";
-			"projects";
+    }
-}
 
-void build_command::convert_cl_to_conf()
+    void build_command::convert_cl_to_conf()
-{
+    {
-	command::convert_cl_to_conf();
+        command::convert_cl_to_conf();
 
-	if (redownload_ || new_)
+        if (redownload_ || new_)
-		common.options.push_back("global/redownload=true");
+            common.options.push_back("global/redownload=true");
 
-	if (reextract_ || new_)
+        if (reextract_ || new_)
-		common.options.push_back("global/reextract=true");
+            common.options.push_back("global/reextract=true");
 
-	if (reconfigure_ || new_)
+        if (reconfigure_ || new_)
-		common.options.push_back("global/reconfigure=true");
+            common.options.push_back("global/reconfigure=true");
 
-	if (rebuild_ || new_)
+        if (rebuild_ || new_)
-		common.options.push_back("global/rebuild=true");
+            common.options.push_back("global/rebuild=true");
 
-	if (ignore_uncommitted_)
+        if (ignore_uncommitted_)
-		common.options.push_back("global/ignore_uncommitted=true");
+            common.options.push_back("global/ignore_uncommitted=true");
 
-	if (clean_)
+        if (clean_) {
-	{
+            if (*clean_)
-		if (*clean_)
+                common.options.push_back("global/clean_task=true");
-			common.options.push_back("global/clean_task=true");
+            else
-		else
+                common.options.push_back("global/clean_task=false");
-			common.options.push_back("global/clean_task=false");
+        }
-	}
 
-	if (fetch_)
+        if (fetch_) {
-	{
+            if (*fetch_)
-		if (*fetch_)
+                common.options.push_back("global/fetch_task=true");
-			common.options.push_back("global/fetch_task=true");
+            else
-		else
+                common.options.push_back("global/fetch_task=false");
-			common.options.push_back("global/fetch_task=false");
+        }
-	}
 
-	if (build_)
+        if (build_) {
-	{
+            if (*build_)
-		if (*build_)
+                common.options.push_back("global/build_task=true");
-			common.options.push_back("global/build_task=true");
+            else
-		else
+                common.options.push_back("global/build_task=false");
-			common.options.push_back("global/build_task=false");
+        }
-	}
 
-	if (nopull_)
+        if (nopull_) {
-	{
+            if (*nopull_)
-		if (*nopull_)
+                common.options.push_back("_override:task/no_pull=true");
-			common.options.push_back("_override:task/no_pull=true");
+            else
-		else
+                common.options.push_back("_override:task/no_pull=false");
-			common.options.push_back("_override:task/no_pull=false");
+        }
-	}
 
-	if (revert_ts_)
+        if (revert_ts_) {
-	{
+            if (*revert_ts_)
-		if (*revert_ts_)
+                common.options.push_back("_override:task/revert_ts=true");
-			common.options.push_back("_override:task/revert_ts=true");
+            else
-		else
+                common.options.push_back("_override:task/revert_ts=false");
-			common.options.push_back("_override:task/revert_ts=false");
+        }
-	}
 
-	if (!tasks_.empty())
+        if (!tasks_.empty())
-		set_task_enabled_flags(tasks_);
+            set_task_enabled_flags(tasks_);
-}
+    }
 
-int build_command::do_run()
+    int build_command::do_run()
-{
+    {
-	try
+        try {
-	{
+            create_prefix_ini();
-		create_prefix_ini();
 
-		task_manager::instance().run_all();
+            task_manager::instance().run_all();
 
-		if (!keep_msbuild_)
+            if (!keep_msbuild_)
-			terminate_msbuild();
+                terminate_msbuild();
 
-		mob::gcx().info(mob::context::generic, "mob done");
+            mob::gcx().info(mob::context::generic, "mob done");
-		return 0;
+            return 0;
-	}
+        }
-	catch(bailed&)
+        catch (bailed&) {
-	{
+            gcx().error(context::generic, "bailing out");
-		gcx().error(context::generic, "bailing out");
+            return 1;
-		return 1;
+        }
-	}
+    }
-}
 
-void build_command::create_prefix_ini()
+    void build_command::create_prefix_ini()
-{
+    {
-	const auto prefix = conf().path().prefix();
+        const auto prefix = conf().path().prefix();
 
-	// creating prefix
+        // creating prefix
-	if (!exists(prefix))
+        if (!exists(prefix))
-		op::create_directories(gcx(), prefix);
+            op::create_directories(gcx(), prefix);
 
-	const auto ini = prefix / default_ini_filename();
+        const auto ini = prefix / default_ini_filename();
-	if (!exists(ini))
+        if (!exists(ini)) {
-	{
+            std::ofstream(ini) << "[paths]\n"
-		std::ofstream(ini)
+                               << "prefix = .\n";
-			<< "[paths]\n"
+        }
-			<< "prefix = .\n";
+    }
-	}
-}
 
-void build_command::terminate_msbuild()
+    void build_command::terminate_msbuild()
-{
+    {
-	if (conf().global().dry())
+        if (conf().global().dry())
-		return;
+            return;
 
-	system("taskkill /im msbuild.exe /f > NUL 2>&1");
+        system("taskkill /im msbuild.exe /f > NUL 2>&1");
-}
+    }
 
-}	// namespace
+}  // namespace mob

src/cmd/cmake.cpp

@@ -1,83 +1,65 @@
 #include "pch.h"
-#include "commands.h"
 #include "../tasks/tasks.h"
+#include "commands.h"
 
-namespace mob
+namespace mob {
-{
 
-cmake_command::cmake_command()
+    cmake_command::cmake_command() : command(requires_options) {}
-	: command(requires_options)
-{
-}
 
-command::meta_t cmake_command::meta() const
+    command::meta_t cmake_command::meta() const
-{
+    {
-	return
+        return {"cmake", "runs cmake in a directory"};
-	{
+    }
-		"cmake",
-		"runs cmake in a directory"
-	};
-}
 
-clipp::group cmake_command::do_group()
+    clipp::group cmake_command::do_group()
-{
+    {
-	return clipp::group(
+        return clipp::group(
-		clipp::command("cmake").set(picked_),
+            clipp::command("cmake").set(picked_),
 
-		(clipp::option("-h", "--help") >> help_)
+            (clipp::option("-h", "--help") >> help_) % "shows this message",
-			% "shows this message",
 
-		(clipp::option("-G", "--generator")
+            (clipp::option("-G", "--generator") & clipp::value("GEN") >> gen_) %
-			& clipp::value("GEN") >> gen_)
+                ("sets the -G option for cmake [default: VS]"),
-			% ("sets the -G option for cmake [default: VS]"),
 
-		(clipp::option("-c", "--cmd")
+            (clipp::option("-c", "--cmd") & clipp::value("CMD") >> cmd_) %
-			& clipp::value("CMD") >> cmd_)
+                "overrides the cmake command line [default: \"..\"]",
-			% "overrides the cmake command line [default: \"..\"]",
 
-		(
+            (clipp::option("--x64").set(x64_, true) |
-			clipp::option("--x64").set(x64_, true) |
+             clipp::option("--x86").set(x64_, false)) %
-			clipp::option("--x86").set(x64_, false)
+                "whether to use the x64 or x86 vcvars; if -G is not set, "
-		)
+                "whether to pass \"-A Win32\" or \"-A x64\" for the default "
-			% "whether to use the x64 or x86 vcvars; if -G is not set, "
+                "VS generator [default: x64]",
-			  "whether to pass \"-A Win32\" or \"-A x64\" for the default "
-			  "VS generator [default: x64]",
 
-		(clipp::option("--install-prefix")
+            (clipp::option("--install-prefix") & clipp::value("PATH") >> prefix_) %
-			& clipp::value("PATH") >> prefix_)
+                "sets CMAKE_INSTALL_PREFIX [default: empty]",
-			% "sets CMAKE_INSTALL_PREFIX [default: empty]",
 
-		(clipp::value("PATH") >> path_)
+            (clipp::value("PATH") >> path_) % "path from which to run `cmake`");
-			% "path from which to run `cmake`"
+    }
-	);
-}
 
-int cmake_command::do_run()
+    int cmake_command::do_run()
-{
+    {
-	auto t = tasks::modorganizer::create_cmake_tool(
+        auto t = tasks::modorganizer::create_cmake_tool(fs::path(utf8_to_utf16(path_)));
-		fs::path(utf8_to_utf16(path_)));
 
-	t.generator(gen_);
+        t.generator(gen_);
-	t.cmd(cmd_);
+        t.cmd(cmd_);
-	t.prefix(prefix_);
+        t.prefix(prefix_);
-	t.output(path_);
+        t.output(path_);
 
-	if (!x64_)
+        if (!x64_)
-		t.architecture(arch::x86);
+            t.architecture(arch::x86);
 
-	// copy the global context, the tool will modify it
+        // copy the global context, the tool will modify it
-	context cxcopy(gcx());
+        context cxcopy(gcx());
 
-	t.run(cxcopy);
+        t.run(cxcopy);
 
-	return 0;
+        return 0;
-}
+    }
 
-std::string cmake_command::do_doc()
+    std::string cmake_command::do_doc()
-{
+    {
-	return
+        return "Runs `cmake ..` in the given directory with the same command line\n"
-		"Runs `cmake ..` in the given directory with the same command line\n"
+               "as the one used for modorganizer projects.";
-		"as the one used for modorganizer projects.";
+    }
-}
 
-}	// namespace
+}  // namespace mob

src/cmd/git.cpp

@@ -1,285 +1,247 @@
 #include "pch.h"
-#include "commands.h"
 #include "../tasks/tasks.h"
 #include "../tools/tools.h"
+#include "commands.h"
 
-namespace mob
+namespace mob {
-{
 
-git_command::git_command()
+    git_command::git_command() : command(requires_options) {}
-	: command(requires_options)
-{
-}
 
-command::meta_t git_command::meta() const
+    command::meta_t git_command::meta() const
-{
+    {
-	return
+        return {"git", "manages the git repos"};
-	{
+    }
-		"git",
-		"manages the git repos"
-	};
-}
 
-clipp::group git_command::do_group()
+    clipp::group git_command::do_group()
-{
+    {
-	return clipp::group(
+        return clipp::group(
-		clipp::command("git").set(picked_),
+            clipp::command("git").set(picked_),
 
-		(clipp::option("-h", "--help") >> help_)
+            (clipp::option("-h", "--help") >> help_) % ("shows this message"),
-			% ("shows this message"),
 
-		"set-remotes" %
+            "set-remotes" %
-		(clipp::command("set-remotes").set(mode_, modes::set_remotes),
+                    (clipp::command("set-remotes").set(mode_, modes::set_remotes),
-			(clipp::required("-u", "--username")
+                     (clipp::required("-u", "--username") &
-				& clipp::value("USERNAME") >> username_)
+                      clipp::value("USERNAME") >> username_) %
-				% "git username",
+                         "git username",
 
-			(clipp::required("-e", "--email")
+                     (clipp::required("-e", "--email") &
-				& clipp::value("EMAIL") >> email_)
+                      clipp::value("EMAIL") >> email_) %
-				% "git email",
+                         "git email",
 
-			(clipp::option("-k", "--key")
+                     (clipp::option("-k", "--key") & clipp::value("PATH") >> key_) %
-				& clipp::value("PATH") >> key_)
+                         "path to putty key",
-				% "path to putty key",
 
-			(clipp::option("-s", "--no-push").set(nopush_)
+                     (clipp::option("-s", "--no-push").set(nopush_) %
-				% "disables pushing to 'upstream' by changing the push url "
+                      "disables pushing to 'upstream' by changing the push url "
-				  "to 'nopushurl' to avoid accidental pushes"),
+                      "to 'nopushurl' to avoid accidental pushes"),
 
-			(clipp::option("-p", "--push-origin").set(push_default_)
+                     (clipp::option("-p", "--push-origin").set(push_default_) %
-				% "sets the new 'origin' remote as the default push target"),
+                      "sets the new 'origin' remote as the default push target"),
 
-			(clipp::opt_value("path") >> path_)
+                     (clipp::opt_value("path") >> path_) % "only use this repo")
-				% "only use this repo"
-		)
 
-		|
+                |
 
-		"add-remote" %
+                "add-remote" %
-		(clipp::command("add-remote").set(mode_, modes::add_remote),
+                    (clipp::command("add-remote").set(mode_, modes::add_remote),
-			(clipp::required("-n", "--name")
+                     (clipp::required("-n", "--name") &
-				& clipp::value("NAME") >> remote_)
+                      clipp::value("NAME") >> remote_) %
-				% "name of new remote",
+                         "name of new remote",
 
-			(clipp::required("-u", "--username")
+                     (clipp::required("-u", "--username") &
-				& clipp::value("USERNAME") >> username_)
+                      clipp::value("USERNAME") >> username_) %
-				% "git username",
+                         "git username",
 
-			(clipp::option("-k", "--key")
+                     (clipp::option("-k", "--key") & clipp::value("PATH") >> key_) %
-				& clipp::value("PATH") >> key_)
+                         "path to putty key",
-				% "path to putty key",
 
-			(clipp::option("-p", "--push-origin").set(push_default_)
+                     (clipp::option("-p", "--push-origin").set(push_default_) %
-				% "sets this new remote as the default push target"),
+                      "sets this new remote as the default push target"),
 
-			(clipp::opt_value("path") >> path_)
+                     (clipp::opt_value("path") >> path_) % "only use this repo")
-				% "only use this repo"
-		)
 
-		|
+                |
 
-		"ignore-ts" %
+                "ignore-ts" % (clipp::command("ignore-ts").set(mode_, modes::ignore_ts),
-		(clipp::command("ignore-ts").set(mode_, modes::ignore_ts),
+                               (clipp::command("on").set(tson_, true) |
-			(
+                                clipp::command("off").set(tson_, false)))
-				clipp::command("on").set(tson_, true) |
-				clipp::command("off").set(tson_, false)
-			)
-		)
 
-		|
+                |
 
-		"branches" %
+                "branches" % (clipp::command("branches").set(mode_, modes::branches),
-		(clipp::command("branches").set(mode_, modes::branches),
+                              clipp::option("-a", "--all").set(all_branches_) %
-			clipp::option("-a", "--all").set(all_branches_)
+                                  "shows all branches, including those on master"));
-				% "shows all branches, including those on master"
+    }
-		)
-	);
-}
 
-int git_command::do_run()
+    int git_command::do_run()
-{
+    {
-	switch (mode_)
+        switch (mode_) {
-	{
+        case modes::set_remotes: {
-		case modes::set_remotes:
+            do_set_remotes();
-		{
+            break;
-			do_set_remotes();
+        }
-			break;
-		}
 
-		case modes::add_remote:
+        case modes::add_remote: {
-		{
+            do_add_remote();
-			do_add_remote();
+            break;
-			break;
+        }
-		}
 
-		case modes::ignore_ts:
+        case modes::ignore_ts: {
-		{
+            do_ignore_ts();
-			do_ignore_ts();
+            break;
-			break;
+        }
-		}
 
-		case modes::branches:
+        case modes::branches: {
-		{
+            do_branches();
-			do_branches();
+            break;
-			break;
+        }
-		}
 
-		case modes::none:
+        case modes::none:
-		default:
+        default:
-			u8cerr << "bad git mode " << static_cast<int>(mode_) << "\n";
+            u8cerr << "bad git mode " << static_cast<int>(mode_) << "\n";
-			throw bailed();
+            throw bailed();
-	}
+        }
 
-	return 0;
+        return 0;
-}
+    }
 
-std::string git_command::do_doc()
+    std::string git_command::do_doc()
-{
+    {
-	return
+        return "All the commands will go through all modorganizer repos, plus usvfs\n"
-		"All the commands will go through all modorganizer repos, plus usvfs\n"
+               "and NCC.\n"
-		"and NCC.\n"
+               "\n"
-		"\n"
+               "Commands:\n"
-		"Commands:\n"
+               "set-remotes\n"
-		"set-remotes\n"
+               "  For each repo, this first sets the username and email. Then, it\n"
-		"  For each repo, this first sets the username and email. Then, it\n"
+               "  will rename the remote 'origin' to 'upstream' and create a new\n"
-		"  will rename the remote 'origin' to 'upstream' and create a new\n"
+               "  remote 'origin' with the given information. If the remote\n"
-		"  remote 'origin' with the given information. If the remote\n"
+               "  'upstream' already exists in a repo, nothing happens.\n"
-		"  'upstream' already exists in a repo, nothing happens.\n"
+               "\n"
-		"\n"
+               "add-remote\n"
-		"add-remote\n"
+               "  For each repo, adds a new remote with the given information. If a\n"
-		"  For each repo, adds a new remote with the given information. If a\n"
+               "  remote with the same name already exists, nothing happens.\n"
-		"  remote with the same name already exists, nothing happens.\n"
+               "\n"
-		"\n"
+               "ignore-ts\n"
-		"ignore-ts\n"
+               "  Toggles the --assume-changed status of all .ts files in all repos.\n"
-		"  Toggles the --assume-changed status of all .ts files in all repos.\n"
+               "\n"
-		"\n"
+               "branches\n"
-		"branches\n"
+               "  Lists all git repos that are not on master. With -a, show all \n"
-		"  Lists all git repos that are not on master. With -a, show all \n"
+               "  repos and their current branch.";
-		"  repos and their current branch.";
+    }
-}
 
-void git_command::do_set_remotes()
+    void git_command::do_set_remotes()
-{
+    {
-	if (path_.empty())
+        if (path_.empty()) {
-	{
+            const auto repos = get_repos();
-		const auto repos = get_repos();
 
-		for (auto&& r : repos)
+            for (auto&& r : repos)
-			do_set_remotes(r);
+                do_set_remotes(r);
-	}
+        }
-	else
+        else {
-	{
+            do_set_remotes(path_);
-		do_set_remotes(path_);
+        }
-	}
+    }
-}
 
-void git_command::do_set_remotes(const fs::path& r)
+    void git_command::do_set_remotes(const fs::path& r)
-{
+    {
-	u8cout << "setting up " << path_to_utf8(r.filename()) << "\n";
+        u8cout << "setting up " << path_to_utf8(r.filename()) << "\n";
 
-	git_wrap(r).set_credentials(username_, email_);
+        git_wrap(r).set_credentials(username_, email_);
 
-	git_wrap(r).set_origin_and_upstream_remotes(
+        git_wrap(r).set_origin_and_upstream_remotes(username_, key_, nopush_,
-		username_, key_, nopush_, push_default_);
+                                                    push_default_);
-}
+    }
 
-void git_command::do_add_remote()
+    void git_command::do_add_remote()
-{
+    {
-	u8cout
+        u8cout << "adding remote '" << remote_ << "' "
-		<< "adding remote '" << remote_ << "' "
+               << "from '" << username_ << "' to repos\n";
-		<< "from '" << username_ << "' to repos\n";
 
-	if (path_.empty())
+        if (path_.empty()) {
-	{
+            const auto repos = get_repos();
-		const auto repos = get_repos();
 
-		for (auto&& r : repos)
+            for (auto&& r : repos)
-			do_add_remote(r);
+                do_add_remote(r);
-	}
+        }
-	else
+        else {
-	{
+            do_add_remote(path_);
-		do_add_remote(path_);
+        }
-	}
+    }
-}
 
-void git_command::do_add_remote(const fs::path& r)
+    void git_command::do_add_remote(const fs::path& r)
-{
+    {
-	u8cout << path_to_utf8(r.filename()) << "\n";
+        u8cout << path_to_utf8(r.filename()) << "\n";
-	git_wrap(r).add_remote(remote_, username_, key_, push_default_);
+        git_wrap(r).add_remote(remote_, username_, key_, push_default_);
-}
+    }
 
-void git_command::do_ignore_ts()
+    void git_command::do_ignore_ts()
-{
+    {
-	if (tson_)
+        if (tson_)
-		u8cout << "ignoring .ts files\n";
+            u8cout << "ignoring .ts files\n";
-	else
+        else
-		u8cout << "un-ignoring .ts files\n";
+            u8cout << "un-ignoring .ts files\n";
 
-	if (path_.empty())
+        if (path_.empty()) {
-	{
+            const auto repos = get_repos();
-		const auto repos = get_repos();
 
-		for (auto&& r : repos)
+            for (auto&& r : repos)
-			do_ignore_ts(r);
+                do_ignore_ts(r);
-	}
+        }
-	else
+        else {
-	{
+            do_ignore_ts(path_);
-		do_ignore_ts(path_);
+        }
-	}
+    }
-}
 
-void git_command::do_ignore_ts(const fs::path& r)
+    void git_command::do_ignore_ts(const fs::path& r)
-{
+    {
-	u8cout << path_to_utf8(r.filename()) << "\n";
+        u8cout << path_to_utf8(r.filename()) << "\n";
-	git_wrap(r).ignore_ts(tson_);
+        git_wrap(r).ignore_ts(tson_);
-}
+    }
 
-void git_command::do_branches()
+    void git_command::do_branches()
-{
+    {
-	std::vector<std::pair<std::string, std::string>> v;
+        std::vector<std::pair<std::string, std::string>> v;
 
-	for (auto&& r : get_repos())
+        for (auto&& r : get_repos()) {
-	{
+            const auto b = git_wrap(r).current_branch();
-		const auto b = git_wrap(r).current_branch();
+            if (b == "master" && !all_branches_)
-		if (b == "master" && !all_branches_)
+                continue;
-			continue;
 
-		if (b.empty())
+            if (b.empty())
-			v.push_back({r.filename().string(), "detached head"});
+                v.push_back({r.filename().string(), "detached head"});
-		else
+            else
-			v.push_back({r.filename().string(), b});
+                v.push_back({r.filename().string(), b});
-	}
+        }
 
-	u8cout << table(v, 0, 3) << "\n";
+        u8cout << table(v, 0, 3) << "\n";
-}
+    }
 
-std::vector<fs::path> git_command::get_repos() const
+    std::vector<fs::path> git_command::get_repos() const
-{
+    {
-	std::vector<fs::path> v;
+        std::vector<fs::path> v;
 
-	// usvfs
+        // usvfs
-	if (fs::exists(tasks::usvfs::source_path()))
+        if (fs::exists(tasks::usvfs::source_path()))
-		v.push_back(tasks::usvfs::source_path());
+            v.push_back(tasks::usvfs::source_path());
 
-	const auto super = tasks::modorganizer::super_path();
+        const auto super = tasks::modorganizer::super_path();
 
-	// all directories in super except for those starting with a dot
+        // all directories in super except for those starting with a dot
-	if (fs::exists(super))
+        if (fs::exists(super)) {
-	{
+            for (auto e : fs::directory_iterator(super)) {
-		for (auto e : fs::directory_iterator(super))
+                if (!e.is_directory())
-		{
+                    continue;
-			if (!e.is_directory())
-				continue;
 
-			const auto p = e.path();
+                const auto p = e.path();
-			if (path_to_utf8(p.filename()).starts_with("."))
+                if (path_to_utf8(p.filename()).starts_with("."))
-				continue;
+                    continue;
 
-			v.push_back(p);
+                v.push_back(p);
-		}
+            }
-	}
+        }
 
-	return v;
+        return v;
-}
+    }
 
-}	// namespace
+}  // namespace mob

src/cmd/list.cpp

@@ -1,100 +1,83 @@
 #include "pch.h"
-#include "commands.h"
-#include "../tasks/task_manager.h"
 #include "../tasks/task.h"
+#include "../tasks/task_manager.h"
 #include "../utility/io.h"
+#include "commands.h"
 
-namespace mob
+namespace mob {
-{
 
-command::meta_t list_command::meta() const
+    command::meta_t list_command::meta() const
-{
+    {
-	return
+        return {"list", "lists available tasks"};
-	{
+    }
-		"list",
-		"lists available tasks"
-	};
-}
 
-clipp::group list_command::do_group()
+    clipp::group list_command::do_group()
-{
+    {
-	return clipp::group(
+        return clipp::group(
-		clipp::command("list").set(picked_),
+            clipp::command("list").set(picked_),
 
-		(clipp::option("-h", "--help") >> help_)
+            (clipp::option("-h", "--help") >> help_) % "shows this message",
-			% "shows this message",
 
-		(clipp::option("-a", "--all") >> all_)
+            (clipp::option("-a", "--all") >> all_) %
-			% "shows all the tasks, including pseudo parallel tasks",
+                "shows all the tasks, including pseudo parallel tasks",
 
-		(clipp::option("-i", "--aliases") >> aliases_)
+            (clipp::option("-i", "--aliases") >> aliases_) % "shows only aliases",
-			% "shows only aliases",
 
-		(clipp::opt_values(
+            (clipp::opt_values(clipp::match::prefix_not("-"), "task", tasks_)) %
-			clipp::match::prefix_not("-"), "task", tasks_))
+                "with -a; when given, acts like the tasks given to `build` and "
-			% "with -a; when given, acts like the tasks given to `build` and "
+                "shows only the tasks that would run");
-			  "shows only the tasks that would run"
+    }
-	);
-}
 
-int list_command::do_run()
+    int list_command::do_run()
-{
+    {
-	auto& tm = task_manager::instance();
+        auto& tm = task_manager::instance();
 
-	if (aliases_)
+        if (aliases_) {
-	{
+            load_options();
-		load_options();
+            dump_aliases();
-		dump_aliases();
+        }
-	}
+        else {
-	else
+            if (all_) {
-	{
+                if (!tasks_.empty())
-		if (all_)
+                    set_task_enabled_flags(tasks_);
-		{
-			if (!tasks_.empty())
-				set_task_enabled_flags(tasks_);
 
-			load_options();
+                load_options();
-			dump(tm.top_level(), 0);
+                dump(tm.top_level(), 0);
 
-			u8cout << "\n\naliases:\n";
+                u8cout << "\n\naliases:\n";
-			dump_aliases();
+                dump_aliases();
-		}
+            }
-		else
+            else {
-		{
+                for (auto&& t : tm.all())
-			for (auto&& t : tm.all())
+                    u8cout << " - " << join(t->names(), ", ") << "\n";
-				u8cout << " - " << join(t->names(), ", ") << "\n";
+            }
-		}
+        }
-	}
 
+        return 0;
+    }
 
-	return 0;
+    void list_command::dump(const std::vector<task*>& v, std::size_t indent) const
-}
+    {
+        for (auto&& t : v) {
+            if (!t->enabled())
+                continue;
 
-void list_command::dump(const std::vector<task*>& v, std::size_t indent) const
+            u8cout << std::string(indent * 4, ' ') << " - " << join(t->names(), ",")
-{
+                   << "\n";
-	for (auto&& t : v)
-	{
-		if (!t->enabled())
-			continue;
 
-		u8cout
+            if (auto* pt = dynamic_cast<parallel_tasks*>(t))
-			<< std::string(indent*4, ' ')
+                dump(pt->children(), indent + 1);
-			<< " - " << join(t->names(), ",")
+        }
-			<< "\n";
+    }
 
-		if (auto* pt=dynamic_cast<parallel_tasks*>(t))
+    void list_command::dump_aliases() const
-			dump(pt->children(), indent + 1);
+    {
-	}
+        const auto v = task_manager::instance().aliases();
-}
+        if (v.empty())
+            return;
 
-void list_command::dump_aliases() const
+        for (auto&& [k, patterns] : v)
-{
+            u8cout << " - " << k << ": " << join(patterns, ", ") << "\n";
-	const auto v = task_manager::instance().aliases();
+    }
-	if (v.empty())
-		return;
 
-	for (auto&& [k, patterns] : v)
+}  // namespace mob
-		u8cout << " - " << k << ": " << join(patterns, ", ") << "\n";
-}
-
-}	// namespace