From 95fa410e4525ab4419d1cb2624572d574615ed0f Mon Sep 17 00:00:00 2001
From: Mikael CAPELLE <mikael.capelle@thalesaleniaspace.com>
Date: Wed, 30 Aug 2023 15:52:35 +0200
Subject: [PATCH 1/3] Use CMake to build.

---
 CMakeLists.txt     |  4 ++++
 bootstrap.ps1      | 35 +++++------------------------------
 src/CMakeLists.txt | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 CMakeLists.txt
 create mode 100644 src/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..18e51e2
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(mob)
+add_subdirectory(src)
diff --git a/bootstrap.ps1 b/bootstrap.ps1
index 9e797d7..f50820f 100644
--- a/bootstrap.ps1
+++ b/bootstrap.ps1
@@ -1,40 +1,15 @@
 $root = $PSScriptRoot
 if (!$root) {
-	$root = "."
+    $root = "."
 }
 
-$installationPath = & $root\third-party\bin\vswhere.exe -products * -nologo -prerelease -latest -property installationPath
-if (! $?) {
-    Write-Error "vswhere returned $LastExitCode"
-    exit $LastExitCode
-}
-
-if (! $installationPath) {
-    Write-Error "Empty installation path"
-    exit 1
-}
-
-$opts = ""
-$opts += " $root\vs\mob.sln"
-$opts += " -m"
-$opts += " -p:Configuration=Release"
-$opts += " -noLogo"
-$opts += " -p:UseMultiToolTask=true"
-$opts += " -p:EnforceProcessCountAcrossBuilds=true"
-$opts += " -clp:ErrorsOnly;Verbosity=minimal"
-
-$vsDevCmd = "$installationPath\Common7\Tools\VsDevCmd.bat"
-if (!(Test-Path "$vsDevCmd")) {
-    Write-Error "VdDevCmd.bat not found at $vsDevCmd"
-    exit 1
-}
-
-& "${env:COMSPEC}" /c "`"$vsDevCmd`" -no_logo -arch=amd64 -host_arch=amd64 && msbuild $opts"
+cmake -B build . | Out-Null
+cmake --build build --config Release -- "-p:UseMultiToolTask=true" "-noLogo" "-p:EnforceProcessCountAcrossBuilds=true" "-clp:ErrorsOnly;Verbosity=minimal"
 
 if (! $?) {
     Write-Error "Build failed"
     exit $LastExitCode
 }
 
-Copy-Item "$root\build\Release\x64\mob.exe" "$root\mob.exe"
-echo "run ``.\mob -d prefix/path build`` to start building"
\ No newline at end of file
+Copy-Item "$root\build\src\Release\mob.exe" "$root\mob.exe"
+Write-Output "run ``.\mob -d prefix/path build`` to start building"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..7c15d53
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.16)
+
+file(GLOB_RECURSE src_files *.cpp)
+
+add_executable(mob ${src_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)

From 45508c3d9931965e9135eb00af6329e3d3f4c613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <capelle.mikael@gmail.com>
Date: Wed, 6 Sep 2023 18:05:57 +0200
Subject: [PATCH 2/3] Organize files as trees in the generated VS solution.

---
 CMakeLists.txt         |   2 +
 src/CMakeLists.txt     |  10 +-
 vs/debug.props         |  15 ---
 vs/mob.sln             |  25 ----
 vs/mob.vcxproj         | 162 -----------------------
 vs/mob.vcxproj.filters | 291 -----------------------------------------
 vs/props.props         |  32 -----
 vs/release.props       |  25 ----
 8 files changed, 10 insertions(+), 552 deletions(-)
 delete mode 100644 vs/debug.props
 delete mode 100644 vs/mob.sln
 delete mode 100644 vs/mob.vcxproj
 delete mode 100644 vs/mob.vcxproj.filters
 delete mode 100644 vs/props.props
 delete mode 100644 vs/release.props

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18e51e2..f015637 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,3 +2,5 @@ cmake_minimum_required(VERSION 3.16)
 
 project(mob)
 add_subdirectory(src)
+
+set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT mob)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c15d53..f52246c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
 
-file(GLOB_RECURSE src_files *.cpp)
+file(GLOB_RECURSE source_files *.cpp)
+file(GLOB RECURSE header_files *.h)
 
-add_executable(mob ${src_files})
+add_executable(mob ${source_files})
 set_target_properties(mob PROPERTIES CXX_STANDARD 20)
 
 target_compile_definitions(mob PUBLIC NOMINMAX)
@@ -14,3 +15,8 @@ target_link_libraries(mob PUBLIC
     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)
diff --git a/vs/debug.props b/vs/debug.props
deleted file mode 100644
index 745efbe..0000000
--- a/vs/debug.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>libcurl-d.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vs/mob.sln b/vs/mob.sln
deleted file mode 100644
index fe6f3cf..0000000
--- a/vs/mob.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30014.187
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mob", "mob.vcxproj", "{CB2CB683-78DA-44B9-B762-D195041F234E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CB2CB683-78DA-44B9-B762-D195041F234E}.Debug|x64.ActiveCfg = Debug|x64
-		{CB2CB683-78DA-44B9-B762-D195041F234E}.Debug|x64.Build.0 = Debug|x64
-		{CB2CB683-78DA-44B9-B762-D195041F234E}.Release|x64.ActiveCfg = Release|x64
-		{CB2CB683-78DA-44B9-B762-D195041F234E}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {84F7C190-1CD8-46DF-9349-05A62C5B02B5}
-	EndGlobalSection
-EndGlobal
diff --git a/vs/mob.vcxproj b/vs/mob.vcxproj
deleted file mode 100644
index cafed2a..0000000
--- a/vs/mob.vcxproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{cb2cb683-78da-44b9-b762-d195041f234e}</ProjectGuid>
-    <RootNamespace>mob</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="props.props" />
-    <Import Project="debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="props.props" />
-    <Import Project="release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link />
-    <ClCompile>
-      <BuildStlModules>false</BuildStlModules>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <BuildStlModules>false</BuildStlModules>
-    </ClCompile>
-    <Link />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\cmd\build.cpp" />
-    <ClCompile Include="..\src\cmd\cmake.cpp" />
-    <ClCompile Include="..\src\cmd\commands.cpp" />
-    <ClCompile Include="..\src\cmd\git.cpp" />
-    <ClCompile Include="..\src\cmd\list.cpp" />
-    <ClCompile Include="..\src\cmd\pr.cpp" />
-    <ClCompile Include="..\src\cmd\release.cpp" />
-    <ClCompile Include="..\src\cmd\tx.cpp" />
-    <ClCompile Include="..\src\core\conf.cpp" />
-    <ClCompile Include="..\src\core\context.cpp" />
-    <ClCompile Include="..\src\core\env.cpp" />
-    <ClCompile Include="..\src\core\ini.cpp" />
-    <ClCompile Include="..\src\core\op.cpp" />
-    <ClCompile Include="..\src\core\paths.cpp" />
-    <ClCompile Include="..\src\core\pipe.cpp" />
-    <ClCompile Include="..\src\core\process.cpp" />
-    <ClCompile Include="..\src\main.cpp" />
-    <ClCompile Include="..\src\net.cpp" />
-    <ClCompile Include="..\src\pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\boost.cpp" />
-    <ClCompile Include="..\src\tasks\boost_di.cpp" />
-    <ClCompile Include="..\src\tasks\bzip2.cpp" />
-    <ClCompile Include="..\src\tasks\explorerpp.cpp" />
-    <ClCompile Include="..\src\tasks\fmt.cpp" />
-    <ClCompile Include="..\src\tasks\gtest.cpp" />
-    <ClCompile Include="..\src\tasks\installer.cpp" />
-    <ClCompile Include="..\src\tasks\libbsarch.cpp" />
-    <ClCompile Include="..\src\tasks\libffi.cpp" />
-    <ClCompile Include="..\src\tasks\libloot.cpp" />
-    <ClCompile Include="..\src\tasks\licenses.cpp" />
-    <ClCompile Include="..\src\tasks\lz4.cpp" />
-    <ClCompile Include="..\src\tasks\modorganizer.cpp" />
-    <ClCompile Include="..\src\tasks\openssl.cpp" />
-    <ClCompile Include="..\src\tasks\pybind11.cpp" />
-    <ClCompile Include="..\src\tasks\pyqt.cpp" />
-    <ClCompile Include="..\src\tasks\python.cpp" />
-    <ClCompile Include="..\src\tasks\sevenz.cpp" />
-    <ClCompile Include="..\src\tasks\sip.cpp" />
-    <ClCompile Include="..\src\tasks\spdlog.cpp" />
-    <ClCompile Include="..\src\tasks\stylesheets.cpp" />
-    <ClCompile Include="..\src\tasks\task.cpp" />
-    <ClCompile Include="..\src\tasks\task_manager.cpp" />
-    <ClCompile Include="..\src\tasks\translations.cpp" />
-    <ClCompile Include="..\src\tasks\usvfs.cpp" />
-    <ClCompile Include="..\src\tasks\zlib.cpp" />
-    <ClCompile Include="..\src\tools\cmake.cpp" />
-    <ClCompile Include="..\src\tools\downloader.cpp" />
-    <ClCompile Include="..\src\tools\extractor.cpp" />
-    <ClCompile Include="..\src\tools\git.cpp" />
-    <ClCompile Include="..\src\tools\jom.cpp" />
-    <ClCompile Include="..\src\tools\msbuild.cpp" />
-    <ClCompile Include="..\src\tools\nmake.cpp" />
-    <ClCompile Include="..\src\tools\patcher.cpp" />
-    <ClCompile Include="..\src\tools\process_runner.cpp" />
-    <ClCompile Include="..\src\tools\python.cpp" />
-    <ClCompile Include="..\src\tools\tools.cpp" />
-    <ClCompile Include="..\src\utility.cpp" />
-    <ClCompile Include="..\src\utility\assert.cpp" />
-    <ClCompile Include="..\src\utility\fs.cpp" />
-    <ClCompile Include="..\src\utility\io.cpp" />
-    <ClCompile Include="..\src\utility\string.cpp" />
-    <ClCompile Include="..\src\utility\threading.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\cmd\commands.h" />
-    <ClInclude Include="..\src\core\conf.h" />
-    <ClInclude Include="..\src\core\context.h" />
-    <ClInclude Include="..\src\core\env.h" />
-    <ClInclude Include="..\src\core\ini.h" />
-    <ClInclude Include="..\src\core\op.h" />
-    <ClInclude Include="..\src\core\paths.h" />
-    <ClInclude Include="..\src\core\pipe.h" />
-    <ClInclude Include="..\src\core\process.h" />
-    <ClInclude Include="..\src\net.h" />
-    <ClInclude Include="..\src\pch.h" />
-    <ClInclude Include="..\src\tasks\task.h" />
-    <ClInclude Include="..\src\tasks\tasks.h" />
-    <ClInclude Include="..\src\tasks\task_manager.h" />
-    <ClInclude Include="..\src\tools\cmake.h" />
-    <ClInclude Include="..\src\tools\git.h" />
-    <ClInclude Include="..\src\tools\msbuild.h" />
-    <ClInclude Include="..\src\tools\tools.h" />
-    <ClInclude Include="..\src\utility.h" />
-    <ClInclude Include="..\src\utility\algo.h" />
-    <ClInclude Include="..\src\utility\assert.h" />
-    <ClInclude Include="..\src\utility\enum.h" />
-    <ClInclude Include="..\src\utility\fs.h" />
-    <ClInclude Include="..\src\utility\io.h" />
-    <ClInclude Include="..\src\utility\string.h" />
-    <ClInclude Include="..\src\utility\threading.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs/mob.vcxproj.filters b/vs/mob.vcxproj.filters
deleted file mode 100644
index de212c4..0000000
--- a/vs/mob.vcxproj.filters
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{23ea265d-5536-4626-b27a-5403447aec6e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\tasks">
-      <UniqueIdentifier>{892d19b8-e898-4c80-be14-e1ee1fb13209}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\tools">
-      <UniqueIdentifier>{b0afbfc3-9b49-4768-9077-a8284ced4416}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core">
-      <UniqueIdentifier>{6e4d31d5-100c-4a4d-8e7d-4c48939819bd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\utility">
-      <UniqueIdentifier>{78dd6066-d407-4450-b520-649454c15ee9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\cmd">
-      <UniqueIdentifier>{b9307be3-9ccb-4449-8aed-d9b69f0beda9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\main.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\pch.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\net.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\utility.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\fmt.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\gtest.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\libbsarch.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\libffi.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\libloot.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\openssl.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\python.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\sevenz.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\zlib.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\boost.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\bzip2.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\task.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\lz4.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\spdlog.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\usvfs.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\sip.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\pyqt.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\extractor.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\git.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\jom.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\msbuild.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\patcher.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\process_runner.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\tools.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\cmake.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\downloader.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\stylesheets.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\licenses.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\modorganizer.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\boost_di.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\explorerpp.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\installer.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\translations.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\env.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\op.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\process.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\conf.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\context.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\utility\threading.cpp">
-      <Filter>src\utility</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\utility\string.cpp">
-      <Filter>src\utility</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\utility\fs.cpp">
-      <Filter>src\utility</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\utility\io.cpp">
-      <Filter>src\utility</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\utility\assert.cpp">
-      <Filter>src\utility</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\commands.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\build.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\cmake.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\git.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\list.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\release.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\tx.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cmd\pr.cpp">
-      <Filter>src\cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\pipe.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\ini.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\core\paths.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\python.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\task_manager.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tasks\pybind11.cpp">
-      <Filter>src\tasks</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tools\nmake.cpp">
-      <Filter>src\tools</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pch.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\net.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tasks\task.h">
-      <Filter>src\tasks</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tasks\tasks.h">
-      <Filter>src\tasks</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tools\tools.h">
-      <Filter>src\tools</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\context.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\env.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\op.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\process.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\conf.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility\threading.h">
-      <Filter>src\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility\string.h">
-      <Filter>src\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility\assert.h">
-      <Filter>src\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility\fs.h">
-      <Filter>src\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility\algo.h">
-      <Filter>src\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility\io.h">
-      <Filter>src\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\cmd\commands.h">
-      <Filter>src\cmd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\utility\enum.h">
-      <Filter>src\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\pipe.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\ini.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\paths.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tools\git.h">
-      <Filter>src\tools</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tools\cmake.h">
-      <Filter>src\tools</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tools\msbuild.h">
-      <Filter>src\tools</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tasks\task_manager.h">
-      <Filter>src\tasks</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vs/props.props b/vs/props.props
deleted file mode 100644
index 046c06c..0000000
--- a/vs/props.props
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>$(SolutionDir)..\build\$(Configuration)\$(PlatformTarget)\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(ProjectName)\$(Configuration)\$(PlatformTarget)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <DiagnosticsFormat>Caret</DiagnosticsFormat>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <ObjectFileName>$(IntDir)fake\%(RelativeDir)</ObjectFileName>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;CURL_STATICLIB;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\third-party\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4566</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>..\third-party\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Ws2_32.lib;Crypt32.lib;Wldap32.lib;Shlwapi.lib;DbgHelp.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vs/release.props b/vs/release.props
deleted file mode 100644
index 451936a..0000000
--- a/vs/release.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>libcurl.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <ClCompile>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <StringPooling>true</StringPooling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file

From 42aef59f9ef6082633b5f8dddbe9c0265a68eb37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <capelle.mikael@gmail.com>
Date: Wed, 6 Sep 2023 18:30:01 +0200
Subject: [PATCH 3/3] Allow running bootstrap.ps1 from a different folder.

---
 bootstrap.ps1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bootstrap.ps1 b/bootstrap.ps1
index f50820f..69ce93a 100644
--- a/bootstrap.ps1
+++ b/bootstrap.ps1
@@ -3,8 +3,12 @@ if (!$root) {
     $root = "."
 }
 
-cmake -B build . | Out-Null
-cmake --build build --config Release -- "-p:UseMultiToolTask=true" "-noLogo" "-p:EnforceProcessCountAcrossBuilds=true" "-clp:ErrorsOnly;Verbosity=minimal"
+cmake -B $root/build $root | Out-Null
+cmake --build $root/build --config Release -- `
+    "-p:UseMultiToolTask=true" `
+    "-noLogo" `
+    "-p:EnforceProcessCountAcrossBuilds=true" `
+    "-clp:ErrorsOnly;Verbosity=minimal"
 
 if (! $?) {
     Write-Error "Build failed"