From 07da68aceec6a91af89e830fae1a0ebb9998069c Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Mon, 4 May 2020 08:47:09 -0400 Subject: [PATCH] revisited usvfs, only building usvfs_proxy now --- src/tasks/tasks.h | 2 ++ src/tasks/usvfs.cpp | 9 +++++++++ src/tasks/zlib.cpp | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/src/tasks/tasks.h b/src/tasks/tasks.h index 2532566..5b06558 100644 --- a/src/tasks/tasks.h +++ b/src/tasks/tasks.h @@ -332,6 +332,7 @@ public: protected: void do_fetch() override; void do_build_and_install() override; + void do_clean_for_rebuild() override; }; @@ -344,6 +345,7 @@ public: protected: void do_fetch() override; void do_build_and_install() override; + void do_clean_for_rebuild() override; private: static url source_url(); diff --git a/src/tasks/usvfs.cpp b/src/tasks/usvfs.cpp index 2b993dc..250f153 100644 --- a/src/tasks/usvfs.cpp +++ b/src/tasks/usvfs.cpp @@ -14,6 +14,13 @@ fs::path usvfs::source_path() return paths::build() / "usvfs"; } +void usvfs::do_clean_for_rebuild() +{ + op::delete_directory(cx(), source_path() / "bin", op::optional); + op::delete_directory(cx(), source_path() / "lib", op::optional); + op::delete_directory(cx(), source_path() / "vsbuild" / "Release", op::optional); +} + void usvfs::do_fetch() { run_tool(git_clone() @@ -31,10 +38,12 @@ void usvfs::do_build_and_install() run_tool(msbuild() .platform("x64") + .projects({"usvfs_proxy"}) .solution(source_path() / "vsbuild" / "usvfs.sln")); run_tool(msbuild() .platform("x86") + .projects({"usvfs_proxy"}) .solution(source_path() / "vsbuild" / "usvfs.sln")); } diff --git a/src/tasks/zlib.cpp b/src/tasks/zlib.cpp index 8de89b2..b615d49 100644 --- a/src/tasks/zlib.cpp +++ b/src/tasks/zlib.cpp @@ -14,6 +14,11 @@ fs::path zlib::source_path() return paths::build() / ("zlib-" + versions::zlib()); } +void zlib::do_clean_for_rebuild() +{ + cmake::clean(cx(), source_path()); +} + void zlib::do_fetch() { const auto file = run_tool(downloader(source_url()));