mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 09:51:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

js: Port to LibMain :^)

Browse source 
This wasn't particularly difficult, and there's not much use for the
nicer interface yet either. While unveil() is of limited use in js(1)
as it should be able to open arbitrary files, I feel like we should be
able to add a pledge() call.
This commit is contained in:
Linus Groh 2021-11-22 19:25:30 +00:00 • committed by Andreas Kling
parent ba0f89a4d1
commit cfecfbb214
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Meta/Lagom/CMakeLists.txt
View file

@ -455,7 +455,7 @@ if (BUILD_LAGOM)
add_executable(js_lagom ../../Userland/Utilities/js.cpp) add_executable(js_lagom ../../Userland/Utilities/js.cpp)
set_target_properties(js_lagom PROPERTIES OUTPUT_NAME js) set_target_properties(js_lagom PROPERTIES OUTPUT_NAME js)
target_link_libraries(js_lagom LagomJS LagomLine Threads::Threads) target_link_libraries(js_lagom LagomJS LagomLine LagomMain Threads::Threads)
add_executable(markdown-check_lagom ../../Userland/Utilities/markdown-check.cpp) add_executable(markdown-check_lagom ../../Userland/Utilities/markdown-check.cpp)
set_target_properties(markdown-check_lagom PROPERTIES OUTPUT_NAME markdown-check) set_target_properties(markdown-check_lagom PROPERTIES OUTPUT_NAME markdown-check)

2
Userland/Utilities/CMakeLists.txt
View file

@ -70,7 +70,7 @@ target_link_libraries(grep LibRegex)
target_link_libraries(gunzip LibCompress) target_link_libraries(gunzip LibCompress)
target_link_libraries(gzip LibCompress) target_link_libraries(gzip LibCompress)
target_link_libraries(id LibMain) target_link_libraries(id LibMain)
target_link_libraries(js LibJS LibLine) target_link_libraries(js LibJS LibLine LibMain)
target_link_libraries(keymap LibKeyboard) target_link_libraries(keymap LibKeyboard)
target_link_libraries(lspci LibPCIDB) target_link_libraries(lspci LibPCIDB)
target_link_libraries(lsusb LibUSBDB) target_link_libraries(lsusb LibUSBDB)

5
Userland/Utilities/js.cpp
View file

@ -60,6 +60,7 @@
#include <LibJS/Runtime/TypedArray.h> #include <LibJS/Runtime/TypedArray.h>
#include <LibJS/Runtime/Value.h> #include <LibJS/Runtime/Value.h>
#include <LibLine/Editor.h> #include <LibLine/Editor.h>
#include <LibMain/Main.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -1102,7 +1103,7 @@ public:
} }
}; };
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
bool gc_on_every_allocation = false; bool gc_on_every_allocation = false;
bool disable_syntax_highlight = false; bool disable_syntax_highlight = false;
@ -1123,7 +1124,7 @@ int main(int argc, char** argv)
#endif #endif
args_parser.add_option(disable_syntax_highlight, "Disable live syntax highlighting", "no-syntax-highlight", 's'); args_parser.add_option(disable_syntax_highlight, "Disable live syntax highlighting", "no-syntax-highlight", 's');
args_parser.add_positional_argument(script_paths, "Path to script files", "scripts", Core::ArgsParser::Required::No); args_parser.add_positional_argument(script_paths, "Path to script files", "scripts", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(arguments.argc, arguments.argv);
bool syntax_highlight = !disable_syntax_highlight; bool syntax_highlight = !disable_syntax_highlight;