Skip to content

optmize buildtools init, avoid global static var #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sunrisepeak merged 1 commit into from
Mar 8, 2026
Merged

optmize buildtools init, avoid global static var #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/checker.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ namespace checker {

// detect flag
constexpr std::string D2X_WAIT = "D2X_WAIT";
static auto btools = d2x::load_buildtools();

std::pair<bool, std::string> build_with_error_handling(const std::string &target) {
std::pair<bool, std::string> build_with_error_handling(const auto& btools, const std::string &target) {
auto [exit_code, output] = btools.build(target);
return std::make_pair(exit_code == 0, output);
}

std::pair<bool, std::string> run_with_error_handling(const std::string &target) {
std::pair<bool, std::string> run_with_error_handling(const auto& btools, const std::string &target) {
auto [exit_code, output] = btools.run(target);
return std::make_pair(exit_code == 0, output);
}

export void run(const std::string& start_target = "") {

auto btools = d2x::load_buildtools();

btools.load_targets();

auto targets = btools.get_targets();
Expand Down Expand Up @@ -78,10 +79,10 @@ export void run(const std::string& start_target = "") {

while (!build_success) {

std::tie(build_success, output) = build_with_error_handling(target);
std::tie(build_success, output) = build_with_error_handling(btools, target);

if (build_success) {
std::tie(build_success, output) = run_with_error_handling(target);
std::tie(build_success, output) = run_with_error_handling(btools, target);
}

status = build_success;
Expand Down