RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 17:12:43 +00:00
Code Issues Activity Actions

HackStudio: Use ProjectBuilder to build and run the current project

Browse source 
This enables building and running standalone serenity components from
Hack Studio :^)
This commit is contained in:
Itamar 2022-01-07 17:23:50 +02:00 • committed by Andreas Kling
parent bb6324a9a9
commit be81278634
3 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/DevTools/HackStudio/HackStudioWidget.cpp
View file

@ -162,6 +162,8 @@ HackStudioWidget::HackStudioWidget(String path_to_project)
} }
}; };
} }
m_project_builder = make<ProjectBuilder>(*m_terminal_wrapper, *m_project);
} }
void HackStudioWidget::update_actions() void HackStudioWidget::update_actions()
@ -923,20 +925,20 @@ String HackStudioWidget::get_project_executable_path() const
return String::formatted("{}/{}", m_project->root_path(), LexicalPath::basename(m_project->root_path())); return String::formatted("{}/{}", m_project->root_path(), LexicalPath::basename(m_project->root_path()));
} }
void HackStudioWidget::build(TerminalWrapper& wrapper) void HackStudioWidget::build()
{ {
if (active_file().ends_with(".js")) auto result = m_project_builder->build(active_file());
wrapper.run_command(String::formatted("js -A {}", active_file())); if (result.is_error()) {
else GUI::MessageBox::show(window(), String::formatted("{}", result.error()), "Build failed", GUI::MessageBox::Type::Error);
wrapper.run_command("make"); }
} }
void HackStudioWidget::run(TerminalWrapper& wrapper) void HackStudioWidget::run()
{ {
if (active_file().ends_with(".js")) auto result = m_project_builder->run(active_file());
wrapper.run_command(String::formatted("js {}", active_file())); if (result.is_error()) {
else GUI::MessageBox::show(window(), String::formatted("{}", result.error()), "Run failed", GUI::MessageBox::Type::Error);
wrapper.run_command("make run"); }
} }
void HackStudioWidget::hide_action_tabs() void HackStudioWidget::hide_action_tabs()
@ -1065,7 +1067,7 @@ NonnullRefPtr<GUI::Action> HackStudioWidget::create_build_action()
return; return;
reveal_action_tab(*m_terminal_wrapper); reveal_action_tab(*m_terminal_wrapper);
build(*m_terminal_wrapper); build();
m_stop_action->set_enabled(true); m_stop_action->set_enabled(true);
}); });
} }
@ -1074,7 +1076,7 @@ NonnullRefPtr<GUI::Action> HackStudioWidget::create_run_action()
{ {
return GUI::Action::create("&Run", { Mod_Ctrl, Key_R }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/program-run.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { return GUI::Action::create("&Run", { Mod_Ctrl, Key_R }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/program-run.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) {
reveal_action_tab(*m_terminal_wrapper); reveal_action_tab(*m_terminal_wrapper);
run(*m_terminal_wrapper); run();
m_stop_action->set_enabled(true); m_stop_action->set_enabled(true);
}); });
} }

6
Userland/DevTools/HackStudio/HackStudioWidget.h
View file

@ -18,6 +18,7 @@
#include "Git/GitWidget.h" #include "Git/GitWidget.h"
#include "Locator.h" #include "Locator.h"
#include "Project.h" #include "Project.h"
#include "ProjectBuilder.h"
#include "ProjectFile.h" #include "ProjectFile.h"
#include "TerminalWrapper.h" #include "TerminalWrapper.h"
#include "ToDoEntriesWidget.h" #include "ToDoEntriesWidget.h"
@ -133,8 +134,8 @@ private:
void create_project_tab(GUI::Widget& parent); void create_project_tab(GUI::Widget& parent);
void configure_project_tree_view(); void configure_project_tree_view();
void run(TerminalWrapper& wrapper); void run();
void build(TerminalWrapper& wrapper); void build();
void hide_action_tabs(); void hide_action_tabs();
bool any_document_is_dirty() const; bool any_document_is_dirty() const;
@ -228,5 +229,6 @@ private:
Mode m_mode { Mode::Code }; Mode m_mode { Mode::Code };
OwnPtr<Coredump::Inspector> m_coredump_inspector; OwnPtr<Coredump::Inspector> m_coredump_inspector;
OwnPtr<ProjectBuilder> m_project_builder;
}; };
} }

14
Userland/DevTools/HackStudio/ProjectBuilder.cpp
View file

@ -158,9 +158,13 @@ void ProjectBuilder::generate_cmake_library_definitions(StringBuilder& builder)
{ {
Vector<String> arguments = { "sh", "-c", "find Userland/Libraries -name CMakeLists.txt | xargs grep serenity_lib" }; Vector<String> arguments = { "sh", "-c", "find Userland/Libraries -name CMakeLists.txt | xargs grep serenity_lib" };
auto res = Core::command("/bin/sh", arguments, {}); auto res = Core::command("/bin/sh", arguments, {});
if (res.is_error()) {
warnln("{}", res.error());
return;
}
static const Regex<ECMA262> parse_library_definition(R"~~~(.+:serenity_lib[c]?\((\w+) (\w+)\).*)~~~"); static const Regex<ECMA262> parse_library_definition(R"~~~(.+:serenity_lib[c]?\((\w+) (\w+)\).*)~~~");
for (auto& line : res->stdout.split('\n')) { for (auto& line : res.value().stdout.split('\n')) {
RegexResult result; RegexResult result;
if (!parse_library_definition.search(line, result)) if (!parse_library_definition.search(line, result))
@ -180,9 +184,13 @@ void ProjectBuilder::generate_cmake_library_dependencies(StringBuilder& builder)
{ {
Vector<String> arguments = { "sh", "-c", "find Userland/Libraries -name CMakeLists.txt | xargs grep target_link_libraries" }; Vector<String> arguments = { "sh", "-c", "find Userland/Libraries -name CMakeLists.txt | xargs grep target_link_libraries" };
auto res = Core::command("/bin/sh", arguments, {}); auto res = Core::command("/bin/sh", arguments, {});
if (res.is_error()) {
warnln("{}", res.error());
return;
}
static const Regex<ECMA262> parse_library_definition(R"~~~(.+:target_link_libraries\((\w+) ([\w\s]+)\).*)~~~"); static const Regex<ECMA262> parse_library_definition(R"~~~(.+:target_link_libraries\((\w+) ([\w\s]+)\).*)~~~");
for (auto& line : res->stdout.split('\n')) { for (auto& line : res.value().stdout.split('\n')) {
RegexResult result; RegexResult result;
if (!parse_library_definition.search(line, result)) if (!parse_library_definition.search(line, result))
@ -201,7 +209,7 @@ void ProjectBuilder::generate_cmake_library_dependencies(StringBuilder& builder)
ErrorOr<void> ProjectBuilder::verify_cmake_is_installed() ErrorOr<void> ProjectBuilder::verify_cmake_is_installed()
{ {
auto res = Core::command("cmake --version", {}); auto res = Core::command("cmake --version", {});
if (res.has_value() && res->exit_code == 0) if (!res.is_error() && res.value().exit_code == 0)
return {}; return {};
return Error::from_string_literal("CMake port is not installed"sv); return Error::from_string_literal("CMake port is not installed"sv);
} }