mirror of
https://github.com/ModOrganizer2/mob.git
synced 2026-07-27 14:07:05 -07:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bb0c4ce3d |
@@ -101,23 +101,22 @@ boost = 1.85.0
|
||||
boost_vs = 14.3
|
||||
fmt = 10.2.1
|
||||
gtest = main
|
||||
directxtex = main
|
||||
libloot = 0.23.0
|
||||
libloot = 0.22.4
|
||||
lz4 = v1.9.4
|
||||
nmm = 0.71.2
|
||||
openssl = 3.3.0
|
||||
pyqt = 6.7.1
|
||||
pyqt_builder = 1.16.4
|
||||
pyqt_sip = 13.8.0
|
||||
pyqt = 6.7.0
|
||||
pyqt_builder = 1.16.2
|
||||
pyqt_sip = 13.7.0
|
||||
python = v3.12.3
|
||||
pybind11 = v2.12.0
|
||||
bzip2 = 1.0.8
|
||||
sip = 6.8.6
|
||||
sip = 6.8.3
|
||||
spdlog = v1.14.1
|
||||
qt = 6.7.1
|
||||
qt = 6.7.0
|
||||
qt_vs = 2019
|
||||
zlib = v1.3.1
|
||||
libbsarch = 0.0.12
|
||||
libbsarch = 0.0.9
|
||||
usvfs = master
|
||||
explorerpp = 1.4.0
|
||||
ss_paper_lad_6788 = 7.2
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
param(
|
||||
[Parameter(Mandatory = $true)][String]$Path,
|
||||
[Parameter(Mandatory = $true)][String]$Output
|
||||
)
|
||||
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "boost")
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "lib32-msvc-14.3")
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "lib64-msvc-14.3")
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "LICENSE_1_0.txt")
|
||||
@@ -0,0 +1,13 @@
|
||||
param(
|
||||
[Parameter(Mandatory = $true)][String]$PyQtPath,
|
||||
[Parameter(Mandatory = $true)][String]$PythonPath,
|
||||
[Parameter(Mandatory = $true)][String]$Output
|
||||
)
|
||||
|
||||
$Output = [IO.Path]::GetFullPath($Output)
|
||||
|
||||
7z a $Output (Join-Path -Path $PyQtPath -ChildPath "LICENSE")
|
||||
|
||||
Push-Location $PythonPath
|
||||
7z a $Output "Lib/site-packages/PyQt6" "-xr!__pycache__"
|
||||
Pop-Location
|
||||
@@ -0,0 +1,10 @@
|
||||
param(
|
||||
[Parameter(Mandatory = $true)][String]$Path,
|
||||
[Parameter(Mandatory = $true)][String]$Output
|
||||
)
|
||||
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "PCbuild/amd64") "-xr!pythoncore_temp"
|
||||
7z rn $Output "amd64" "PCbuild/amd64"
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "Include") "-xr!internal" "-xr!sip.h"
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "Lib") "-xr!__pycache__" "-xr!site-packages"
|
||||
7z a $Output (Join-Path -Path $Path -ChildPath "LICENSE")
|
||||
+1
-2
@@ -33,8 +33,7 @@ namespace mob {
|
||||
.add_task<libbsarch>()
|
||||
.add_task<libloot>()
|
||||
.add_task<openssl>()
|
||||
.add_task<bzip2>()
|
||||
.add_task<directxtex>();
|
||||
.add_task<bzip2>();
|
||||
|
||||
add_task<parallel_tasks>()
|
||||
.add_task<tasks::python>()
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
#include "pch.h"
|
||||
#include "tasks.h"
|
||||
|
||||
namespace mob::tasks {
|
||||
|
||||
namespace {
|
||||
|
||||
msbuild create_msbuild_tool(arch a, config config,
|
||||
msbuild::ops o = msbuild::build)
|
||||
{
|
||||
return std::move(msbuild(o).architecture(a).configuration(config).solution(
|
||||
directxtex::source_path() / "DirectXTex" /
|
||||
"DirectXTex_Desktop_2022.vcxproj"));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
directxtex::directxtex() : basic_task("directxtex") {}
|
||||
|
||||
std::string directxtex::version()
|
||||
{
|
||||
return conf().version().get("directxtex");
|
||||
}
|
||||
|
||||
bool directxtex::prebuilt()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
fs::path directxtex::source_path()
|
||||
{
|
||||
return conf().path().build() / "DirectXTex";
|
||||
}
|
||||
|
||||
void directxtex::do_clean(clean c)
|
||||
{
|
||||
if (is_set(c, clean::reclone)) {
|
||||
git_wrap::delete_directory(cx(), source_path());
|
||||
return;
|
||||
}
|
||||
|
||||
if (is_set(c, clean::rebuild)) {
|
||||
run_tool(create_msbuild_tool(arch::x64, config::release, msbuild::clean));
|
||||
run_tool(create_msbuild_tool(arch::x64, config::debug, msbuild::clean));
|
||||
}
|
||||
}
|
||||
|
||||
void directxtex::do_fetch()
|
||||
{
|
||||
run_tool(make_git()
|
||||
.url(make_git_url("microsoft", "DirectXTex"))
|
||||
.branch(version())
|
||||
.root(source_path()));
|
||||
}
|
||||
|
||||
void directxtex::do_build_and_install()
|
||||
{
|
||||
op::create_directories(cx(), directxtex::source_path() / "Include");
|
||||
op::create_directories(cx(), directxtex::source_path() / "Lib" / "Debug");
|
||||
op::create_directories(cx(), directxtex::source_path() / "Lib" / "Release");
|
||||
|
||||
// DO NOT run these in parallel because both generate files that are shared
|
||||
// between release and debug
|
||||
run_tool(create_msbuild_tool(arch::x64, config::release));
|
||||
run_tool(create_msbuild_tool(arch::x64, config::debug));
|
||||
|
||||
const auto binary_path =
|
||||
source_path() / "DirectXTex" / "Bin" / "Desktop_2022" / "x64";
|
||||
|
||||
for (const auto& header : {"DDS.h", "DirectXTex.h", "DirectXTex.inl "}) {
|
||||
op::copy_file_to_dir_if_better(cx(), source_path() / "DirectXTex" / header,
|
||||
source_path() / "Include");
|
||||
}
|
||||
op::copy_file_to_dir_if_better(cx(), binary_path / "Debug" / "DirectXTex.lib",
|
||||
source_path() / "Lib" / "Debug");
|
||||
op::copy_file_to_dir_if_better(cx(), binary_path / "Release" / "DirectXTex.lib",
|
||||
source_path() / "Lib" / "Release");
|
||||
}
|
||||
|
||||
} // namespace mob::tasks
|
||||
@@ -226,7 +226,6 @@ namespace mob::tasks {
|
||||
gtest::build_path(arch::x64, c == config::debug ? config::debug
|
||||
: config::release))
|
||||
.def("OPENSSL_ROOT_DIR", openssl::source_path())
|
||||
.def("DIRECTXTEX_ROOT", directxtex::source_path())
|
||||
.root(root));
|
||||
}
|
||||
|
||||
|
||||
@@ -77,20 +77,6 @@ namespace mob::tasks {
|
||||
void do_fetch() override;
|
||||
};
|
||||
|
||||
class directxtex : public basic_task<directxtex> {
|
||||
public:
|
||||
directxtex();
|
||||
|
||||
static std::string version();
|
||||
static bool prebuilt();
|
||||
static fs::path source_path();
|
||||
|
||||
protected:
|
||||
void do_clean(clean c) override;
|
||||
void do_fetch() override;
|
||||
void do_build_and_install() override;
|
||||
};
|
||||
|
||||
class explorerpp : public basic_task<explorerpp> {
|
||||
public:
|
||||
explorerpp();
|
||||
|
||||
Reference in New Issue
Block a user