beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
ladybird/Meta/Lagom/CMakeLists.txt

238 lines
12 KiB
Text
Raw Normal View History

Lagom: Let's not hard-code the compiler. Add compiler-relevant flags though. I'm still getting the hang of this CMake thing.
2019-07-26 09:02:47 +00:00
cmake_minimum_required (VERSION 3.0)
Lagom: Set project() right away Checking CMAKE_CXX_COMPILER_ID before project() does not work.
2019-07-30 13:27:10 +00:00
project (Lagom)
Lagom: Import the beginnings of a "port" of Serenity libs for the outside. The C++ facilities of Serenity are getting pretty comfortable, and I'd like to take them with me to projects outside the system. Let's make it a bit easier to do that by bundling AK and LibCore (for now) into a portable library called "Lagom". :^)
2019-07-25 09:56:08 +00:00
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
if (NOT ENABLE_OSS_FUZZ)
Meta: Build AK and LibRegex tests in Lagom and for Serenity These tests were never built for the serenity target. Move their Lagom build steps to the Lagom CMakeLists.txt, and add serenity build steps for them. Also, fix the build errors when building them with the serenity cross-compiler :^)
2021-01-17 21:25:12 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-literal-suffix -O2 -Wall -Wextra -Werror -std=c++2a -fPIC -g -Wno-deprecated-copy")
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2a -fPIC -g -Wno-deprecated-copy")
endif()
Lagom/CMake: Add -fconstexpr-steps for AppleClang
2021-05-01 03:19:14 +00:00
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$")
Meta: Increase fconstexpr-steps for Clang Lagom builds Clang's default constexpr-steps limit is 1048576, which is not enough for LibGfx's generation of the unicode bidirectional class lookup table while GCC doesn't have any limit at all, so this patch increases the limit to an arbitrarily larger value.
2021-04-24 13:42:53 +00:00
# Clang's default constexpr-steps limit is 1048576(2^20), GCC doesn't have one
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual -Wno-user-defined-literals -fconstexpr-steps=16777216")
Lagom: Add clang address/memory/undefined-behavior analyzer support Adding the ability to turn on Clang analyzer support in the Lagom build. Right now the following are working warning free on the LibJS test suite: -DENABLE_MEMORY_SANITIZER:BOOL=ON -DENABLE_ADDRESS_SANITIZER:BOOL=ON The following analyzer produces errors when running the LibJS test suite: -DENABLE_UNDEFINED_SANITIZER:BOOL=ON
2020-04-05 10:21:03 +00:00
if (ENABLE_ADDRESS_SANITIZER)
add_definitions(-fsanitize=address -fno-omit-frame-pointer)
set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=address")
endif()
if (ENABLE_MEMORY_SANITIZER)
add_definitions(-fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer)
set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=memory -fsanitize-memory-track-origins")
endif()
if (ENABLE_UNDEFINED_SANITIZER)
add_definitions(-fsanitize=undefined -fno-omit-frame-pointer)
set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=undefined")
endif()
Lagom: Add fuzz testing for LibJS using libFuzzer (#1692) Note: clang only (see https://llvm.org/docs/LibFuzzer.html) - add FuzzJs which will run the LibJS parser on random javascript inputs - added a basic dictionary of javascript tokens To use fuzzer: CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -DENABLE_FUZZER_SANITIZER=1 .. Fuzzers/FuzzJs -dict=../Fuzzers/FuzzJs.dict
2020-04-08 08:40:02 +00:00
if (ENABLE_FUZZER_SANITIZER)
add_definitions(-fsanitize=fuzzer -fno-omit-frame-pointer)
Lagom: Use -fsanitize=fuzzer, not -fsanitize=fuzzer-no-link Fuzzers don't link for me without this change.
2020-11-13 20:47:32 +00:00
set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=fuzzer")
Lagom: Add fuzz testing for LibJS using libFuzzer (#1692) Note: clang only (see https://llvm.org/docs/LibFuzzer.html) - add FuzzJs which will run the LibJS parser on random javascript inputs - added a basic dictionary of javascript tokens To use fuzzer: CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -DENABLE_FUZZER_SANITIZER=1 .. Fuzzers/FuzzJs -dict=../Fuzzers/FuzzJs.dict
2020-04-08 08:40:02 +00:00
endif()
Lagom/Fuzzers: Fix FuzzilliJs build and update patch for new Fuzzilli version -fsanitize=fuzzer was being added to LINKER_FLAGS from Lagom/CMakeLists, which we don't want with FuzzilliJs as we want to define the functions it provides ourselves.
2021-01-23 19:41:44 +00:00
set(ORIGINAL_CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
set(ORIGINAL_CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
set(ORIGINAL_CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
Lagom: Add clang address/memory/undefined-behavior analyzer support Adding the ability to turn on Clang analyzer support in the Lagom build. Right now the following are working warning free on the LibJS test suite: -DENABLE_MEMORY_SANITIZER:BOOL=ON -DENABLE_ADDRESS_SANITIZER:BOOL=ON The following analyzer produces errors when running the LibJS test suite: -DENABLE_UNDEFINED_SANITIZER:BOOL=ON
2020-04-05 10:21:03 +00:00
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
Lagom: Let's not hard-code the compiler. Add compiler-relevant flags though. I'm still getting the hang of this CMake thing.
2019-07-26 09:02:47 +00:00
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
Lagom: Build with -Wno-literal-suffix when using GCC This is already set in the root CMakeLists.txt as well as here for Clang (-Wno-user-defined-literals), but was forgotten for GCC which made an Lagom-only build (cmake ../Meta/Lagom [...]) fail.
2021-02-27 11:39:55 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined -Wno-literal-suffix")
Lagom: Let's not hard-code the compiler. Add compiler-relevant flags though. I'm still getting the hang of this CMake thing.
2019-07-26 09:02:47 +00:00
endif()
Lagom: Import the beginnings of a "port" of Serenity libs for the outside. The C++ facilities of Serenity are getting pretty comfortable, and I'd like to take them with me to projects outside the system. Let's make it a bit easier to do that by bundling AK and LibCore (for now) into a portable library called "Lagom". :^)
2019-07-25 09:56:08 +00:00
CMake: Use CONFIGURE_DEPENDS in existing globs.
2020-10-28 19:01:29 +00:00
file(GLOB AK_SOURCES CONFIGURE_DEPENDS "../../AK/*.cpp")
Meta + Lagom: Fix paths after movement of tests to Tests/ Not sure how this didn't cause a build break when I originally moved them in #6891. Better fix them now.
2021-05-07 11:02:12 +00:00
file(GLOB AK_TEST_SOURCES CONFIGURE_DEPENDS "../../Tests/AK/*.cpp")
Lagom/Fuzzers: Add fuzzer for zip file parser
2021-03-27 15:04:24 +00:00
file(GLOB LIBARCHIVE_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibArchive/*.cpp")
Lagom/Fuzzers: Add WAV fuzzer
2021-02-28 22:43:07 +00:00
file(GLOB LIBAUDIO_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibAudio/*.cpp")
list(REMOVE_ITEM LIBAUDIO_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibAudio/ClientConnection.cpp")
Libraries: Move to Userland/Libraries/
2021-01-12 11:17:30 +00:00
file(GLOB LIBREGEX_LIBC_SOURCES "../../Userland/Libraries/LibRegex/C/Regex.cpp")
file(GLOB LIBREGEX_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibRegex/*.cpp")
Meta + Lagom: Fix paths after movement of tests to Tests/ Not sure how this didn't cause a build break when I originally moved them in #6891. Better fix them now.
2021-05-07 11:02:12 +00:00
file(GLOB LIBREGEX_TESTS CONFIGURE_DEPENDS "../../Tests/LibRegex/*.cpp")
Libraries: Move to Userland/Libraries/
2021-01-12 11:17:30 +00:00
file(GLOB LIBCORE_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCore/*.cpp")
file(GLOB LIBELF_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibELF/*.cpp")
Loader.so+LibELF: Move most of Loader.so's logic into ELF::DynamicLinker Loader.so now just performs the initial self relocations and static LibC initialisation before handing over to ELF::DynamicLinker::linker_main to handle the rest of the process. As a trade-off, ELF::DynamicLinker needs to be explicitly excluded from Lagom unless we really want to try writing a cross platform dynamic loader
2021-01-01 23:54:43 +00:00
# There's no way we can reliably make this cross platform
Libraries: Move to Userland/Libraries/
2021-01-12 11:17:30 +00:00
list(REMOVE_ITEM LIBELF_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibELF/DynamicLinker.cpp")
file(GLOB LIBGEMINI_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGemini/*.cpp")
file(GLOB LIBGFX_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/*.cpp")
file(GLOB LIBGUI_GML_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGUI/GML*.cpp")
Lagom: CMakeLists.txt housekeeping - Remove unused LIBM_SOURCES - Some cosmetic and whitespace changes
2021-02-27 11:36:11 +00:00
list(REMOVE_ITEM LIBGUI_GML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibGUI/GMLSyntaxHighlighter.cpp")
Libraries: Move to Userland/Libraries/
2021-01-12 11:17:30 +00:00
file(GLOB LIBHTTP_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibHTTP/*.cpp")
file(GLOB LIBIPC_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibIPC/*.cpp")
file(GLOB LIBLINE_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibLine/*.cpp")
file(GLOB LIBMARKDOWN_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibMarkdown/*.cpp")
file(GLOB LIBX86_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibX86/*.cpp")
file(GLOB LIBJS_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibJS/*.cpp")
file(GLOB LIBJS_SUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibJS/*/*.cpp")
file(GLOB LIBCOMPRESS_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCompress/*.cpp")
Meta + Lagom: Fix paths after movement of tests to Tests/ Not sure how this didn't cause a build break when I originally moved them in #6891. Better fix them now.
2021-05-07 11:02:12 +00:00
file(GLOB LIBCOMPRESS_TESTS CONFIGURE_DEPENDS "../../Tests/LibCompress/*.cpp")
Libraries: Move to Userland/Libraries/
2021-01-12 11:17:30 +00:00
file(GLOB LIBCRYPTO_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCrypto/*.cpp")
file(GLOB LIBCRYPTO_SUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCrypto/*/*.cpp")
LibCrypto: Split BigInteger operations into an Algorithms class Since the operations are already complicated and will become even more so soon, let's split them into their own files. We can also integrate the NumberTheory operations that would better fit there into this class as well. This commit doesn't change behaviors, but moves the allocation of some variables into caller classes.
2021-05-10 18:55:25 +00:00
file(GLOB LIBCRYPTO_SUBSUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibCrypto/*/*/*.cpp")
Libraries: Move to Userland/Libraries/
2021-01-12 11:17:30 +00:00
file(GLOB LIBTLS_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibTLS/*.cpp")
file(GLOB LIBTTF_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibTTF/*.cpp")
Lagom: Build LibTextCodec into Lagom
2021-02-16 18:00:02 +00:00
file(GLOB LIBTEXTCODEC_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibTextCodec/*.cpp")
Shell: Move to Userland/Shell/
2021-01-12 10:53:14 +00:00
file(GLOB SHELL_SOURCES CONFIGURE_DEPENDS "../../Userland/Shell/*.cpp")
file(GLOB SHELL_TESTS CONFIGURE_DEPENDS "../../Userland/Shell/Tests/*.sh")
Lagom: Don't include Shell/main.cpp This caused some confusion: Apparently, clang has no trouble overriding Shell's main, and this issue only surfaced when I tried to build the fuzzers with wrong configuration (i.e., without the clang-injected 'main'). The diff is suggested by, and work of, @alimpfard.
2021-01-29 19:40:09 +00:00
list(FILTER SHELL_SOURCES EXCLUDE REGEX ".*main.cpp$")
Lagom: Add sql utility and LibSQL unit tests
2021-04-19 14:05:25 +00:00
file(GLOB LIBSQL_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibSQL/*.cpp")
LibSQL: Add a syntax highlighter
2021-05-09 01:30:18 +00:00
list(REMOVE_ITEM LIBSQL_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibSQL/SyntaxHighlighter.cpp")
Meta + Lagom: Fix paths after movement of tests to Tests/ Not sure how this didn't cause a build break when I originally moved them in #6891. Better fix them now.
2021-05-07 11:02:12 +00:00
file(GLOB LIBSQL_TEST_SOURCES CONFIGURE_DEPENDS "../../Tests/LibSQL/*.cpp")
Lagom: Import the beginnings of a "port" of Serenity libs for the outside. The C++ facilities of Serenity are getting pretty comfortable, and I'd like to take them with me to projects outside the system. Let's make it a bit easier to do that by bundling AK and LibCore (for now) into a portable library called "Lagom". :^)
2019-07-25 09:56:08 +00:00
AK+Userland: Move AK/TestSuite.h into LibTest and rework Tests' CMake As many macros as possible are moved to Macros.h, while the macros to create a test case are moved to TestCase.h. TestCase is now the only user-facing header for creating a test case. TestSuite and its helpers have moved into a .cpp file. Instead of requiring a TEST_MAIN macro to be instantiated into the test file, a TestMain.cpp file is provided instead that will be linked against each test. This has the side effect that, if we wanted to have test cases split across multiple files, it's as simple as adding them all to the same executable. The test main should be portable to kernel mode as well, so if there's a set of tests that should be run in self-test mode in kernel space, we can accomodate that. A new serenity_test CMake function streamlines adding a new test with arguments for the test source file, subdirectory under /usr/Tests to install the test application and an optional list of libraries to link against the test application. To accomodate future test where the provided TestMain.cpp is not suitable (e.g. test-js), a CUSTOM_MAIN parameter can be passed to the function to not link against the boilerplate main function.
2021-04-25 05:53:23 +00:00
file(GLOB LIBTEST_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibTest/*.cpp")
list(FILTER LIBTEST_SOURCES EXCLUDE REGEX ".*Main.cpp$")
file(GLOB LIBTEST_MAIN CONFIGURE_DEPENDS "../../Userland/Libraries/LibTest/TestMain.cpp")
LibRegex: Add a regular expression library This commit is a mix of several commits, squashed into one because the commits before 'Move regex to own Library and fix all the broken stuff' were not fixable in any elegant way. The commits are listed below for "historical" purposes: - AK: Add options/flags and Errors for regular expressions Flags can be provided for any possible flavour by adding a new scoped enum. Handling of flags is done by templated Options class and the overloaded '|' and '&' operators. - AK: Add Lexer for regular expressions The lexer parses the input and extracts tokens needed to parse a regular expression. - AK: Add regex Parser and PosixExtendedParser This patchset adds a abstract parser class that can be derived to implement different parsers. A parser produces bytecode to be executed within the regex matcher. - AK: Add regex matcher This patchset adds an regex matcher based on the principles of the T-REX VM. The bytecode pruduced by the respective Parser is put into the matcher and the VM will recursively execute the bytecode according to the available OpCodes. Possible improvement: the recursion could be replaced by multi threading capabilities. To match a Regular expression, e.g. for the Posix standard regular expression matcher use the following API: ``` Pattern<PosixExtendedParser> pattern("^.*$"); auto result = pattern.match("Well, hello friends!\nHello World!"); // Match whole needle EXPECT(result.count == 1); EXPECT(result.matches.at(0).view.starts_with("Well")); EXPECT(result.matches.at(0).view.end() == "!"); result = pattern.match("Well, hello friends!\nHello World!", PosixFlags::Multiline); // Match line by line EXPECT(result.count == 2); EXPECT(result.matches.at(0).view == "Well, hello friends!"); EXPECT(result.matches.at(1).view == "Hello World!"); EXPECT(pattern.has_match("Well,....")); // Just check if match without a result, which saves some resources. ``` - AK: Rework regex to work with opcodes objects This patchsets reworks the matcher to work on a more structured base. For that an abstract OpCode class and derived classes for the specific OpCodes have been added. The respective opcode logic is contained in each respective execute() method. - AK: Add benchmark for regex - AK: Some optimization in regex for runtime and memory - LibRegex: Move regex to own Library and fix all the broken stuff Now regex works again and grep utility is also in place for testing. This commit also fixes the use of regex.h in C by making `regex_t` an opaque (-ish) type, which makes its behaviour consistent between C and C++ compilers. Previously, <regex.h> would've blown C compilers up, and even if it didn't, would've caused a leak in C code, and not in C++ code (due to the existence of `OwnPtr` inside the struct). To make this whole ordeal easier to deal with (for now), this pulls the definitions of `reg*()` into LibRegex. pros: - The circular dependency between LibC and LibRegex is broken - Eaiser to test (without accidentally pulling in the host's libc!) cons: - Using any of the regex.h functions will require the user to link -lregex - The symbols will be missing from libc, which will be a big surprise down the line (especially with shared libs). Co-Authored-By: Ali Mohammad Pur <ali.mpfard@gmail.com>
2020-04-26 12:45:10 +00:00
set(LAGOM_REGEX_SOURCES ${LIBREGEX_LIBC_SOURCES} ${LIBREGEX_SOURCES})
Build: Switch to CMake :^) Closes https://github.com/SerenityOS/serenity/issues/2080
2020-05-06 15:40:06 +00:00
set(LAGOM_CORE_SOURCES ${AK_SOURCES} ${LIBCORE_SOURCES})
LibCrypto: Split BigInteger operations into an Algorithms class Since the operations are already complicated and will become even more so soon, let's split them into their own files. We can also integrate the NumberTheory operations that would better fit there into this class as well. This commit doesn't change behaviors, but moves the allocation of some variables into caller classes.
2021-05-10 18:55:25 +00:00
set(LAGOM_MORE_SOURCES ${LIBARCHIVE_SOURCES} ${LIBAUDIO_SOURCES} ${LIBELF_SOURCES} ${LIBIPC_SOURCES} ${LIBLINE_SOURCES} ${LIBJS_SOURCES} ${LIBJS_SUBDIR_SOURCES} ${LIBX86_SOURCES} ${LIBCRYPTO_SOURCES} ${LIBCOMPRESS_SOURCES} ${LIBCRYPTO_SUBDIR_SOURCES} ${LIBCRYPTO_SUBSUBDIR_SOURCES} ${LIBTLS_SOURCES} ${LIBTTF_SOURCES} ${LIBTEXTCODEC_SOURCES} ${LIBMARKDOWN_SOURCES} ${LIBGEMINI_SOURCES} ${LIBGFX_SOURCES} ${LIBGUI_GML_SOURCES} ${LIBHTTP_SOURCES} ${LAGOM_REGEX_SOURCES} ${SHELL_SOURCES} ${LIBSQL_SOURCES})
AK+Userland: Move AK/TestSuite.h into LibTest and rework Tests' CMake As many macros as possible are moved to Macros.h, while the macros to create a test case are moved to TestCase.h. TestCase is now the only user-facing header for creating a test case. TestSuite and its helpers have moved into a .cpp file. Instead of requiring a TEST_MAIN macro to be instantiated into the test file, a TestMain.cpp file is provided instead that will be linked against each test. This has the side effect that, if we wanted to have test cases split across multiple files, it's as simple as adding them all to the same executable. The test main should be portable to kernel mode as well, so if there's a set of tests that should be run in self-test mode in kernel space, we can accomodate that. A new serenity_test CMake function streamlines adding a new test with arguments for the test source file, subdirectory under /usr/Tests to install the test application and an optional list of libraries to link against the test application. To accomodate future test where the provided TestMain.cpp is not suitable (e.g. test-js), a CUSTOM_MAIN parameter can be passed to the function to not link against the boilerplate main function.
2021-04-25 05:53:23 +00:00
set(LAGOM_TEST_SOURCES ${LIBTEST_SOURCES})
Lagom: Import the beginnings of a "port" of Serenity libs for the outside. The C++ facilities of Serenity are getting pretty comfortable, and I'd like to take them with me to projects outside the system. Let's make it a bit easier to do that by bundling AK and LibCore (for now) into a portable library called "Lagom". :^)
2019-07-25 09:56:08 +00:00
Everywhere: Use CMake to generate AK/Debug.h. This was done with the help of several scripts, I dump them here to easily find them later: awk '/#ifdef/ { print "#cmakedefine01 "$2 }' AK/Debug.h.in for debug_macro in $(awk '/#ifdef/ { print $2 }' AK/Debug.h.in) do find . \( -name '*.cpp' -o -name '*.h' -o -name '*.in' \) -not -path './Toolchain/*' -not -path './Build/*' -exec sed -i -E 's/#ifdef '$debug_macro'/#if '$debug_macro'/' {} \; done # Remember to remove WRAPPER_GERNERATOR_DEBUG from the list. awk '/#cmake/ { print "set("$2" ON)" }' AK/Debug.h.in
2021-01-23 22:29:11 +00:00
# FIXME: This is a hack, because the lagom stuff can be build individually or
# in combination with the system, we generate two Debug.h files. One in
# Build/AK/Debug.h and the other in Build/Meta/Lagom/AK/Debug.h.
configure_file(../../AK/Debug.h.in AK/Debug.h @ONLY)
Meta: Split debug defines into multiple headers. The following script was used to make these changes: #!/bin/bash set -e tmp=$(mktemp -d) echo "tmp=$tmp" find Kernel \( -name '*.cpp' -o -name '*.h' \) | sort > $tmp/Kernel.files find . \( -path ./Toolchain -prune -o -path ./Build -prune -o -path ./Kernel -prune \) -o \( -name '*.cpp' -o -name '*.h' \) -print | sort > $tmp/EverythingExceptKernel.files cat $tmp/Kernel.files | xargs grep -Eho '[A-Z0-9_]+_DEBUG' | sort | uniq > $tmp/Kernel.macros cat $tmp/EverythingExceptKernel.files | xargs grep -Eho '[A-Z0-9_]+_DEBUG' | sort | uniq > $tmp/EverythingExceptKernel.macros comm -23 $tmp/Kernel.macros $tmp/EverythingExceptKernel.macros > $tmp/Kernel.unique comm -1 $tmp/Kernel.macros $tmp/EverythingExceptKernel.macros > $tmp/EverythingExceptKernel.unique cat $tmp/Kernel.unique | awk '{ print "#cmakedefine01 "$1 }' > $tmp/Kernel.header cat $tmp/EverythingExceptKernel.unique | awk '{ print "#cmakedefine01 "$1 }' > $tmp/EverythingExceptKernel.header for macro in $(cat $tmp/Kernel.unique) do cat $tmp/Kernel.files | xargs grep -l $macro >> $tmp/Kernel.new-includes ||: done cat $tmp/Kernel.new-includes | sort > $tmp/Kernel.new-includes.sorted for macro in $(cat $tmp/EverythingExceptKernel.unique) do cat $tmp/Kernel.files | xargs grep -l $macro >> $tmp/Kernel.old-includes ||: done cat $tmp/Kernel.old-includes | sort > $tmp/Kernel.old-includes.sorted comm -23 $tmp/Kernel.new-includes.sorted $tmp/Kernel.old-includes.sorted > $tmp/Kernel.includes.new comm -13 $tmp/Kernel.new-includes.sorted $tmp/Kernel.old-includes.sorted > $tmp/Kernel.includes.old comm -12 $tmp/Kernel.new-includes.sorted $tmp/Kernel.old-includes.sorted > $tmp/Kernel.includes.mixed for file in $(cat $tmp/Kernel.includes.new) do sed -i -E 's/#include <AK\/Debug\.h>/#include <Kernel\/Debug\.h>/' $file done for file in $(cat $tmp/Kernel.includes.mixed) do echo "mixed include in $file, requires manual editing." done
2021-01-25 15:07:10 +00:00
configure_file(../../Kernel/Debug.h.in Kernel/Debug.h @ONLY)
Everywhere: Use CMake to generate AK/Debug.h. This was done with the help of several scripts, I dump them here to easily find them later: awk '/#ifdef/ { print "#cmakedefine01 "$2 }' AK/Debug.h.in for debug_macro in $(awk '/#ifdef/ { print $2 }' AK/Debug.h.in) do find . \( -name '*.cpp' -o -name '*.h' -o -name '*.in' \) -not -path './Toolchain/*' -not -path './Build/*' -exec sed -i -E 's/#ifdef '$debug_macro'/#if '$debug_macro'/' {} \; done # Remember to remove WRAPPER_GERNERATOR_DEBUG from the list. awk '/#cmake/ { print "set("$2" ON)" }' AK/Debug.h.in
2021-01-23 22:29:11 +00:00
include_directories(../../)
include_directories(../../Userland/)
include_directories(../../Userland/Libraries/)
include_directories(${CMAKE_BINARY_DIR})
Build: Switch to CMake :^) Closes https://github.com/SerenityOS/serenity/issues/2080
2020-05-06 15:40:06 +00:00
add_library(LagomCore ${LAGOM_CORE_SOURCES})
Lagom: Import the beginnings of a "port" of Serenity libs for the outside. The C++ facilities of Serenity are getting pretty comfortable, and I'd like to take them with me to projects outside the system. Let's make it a bit easier to do that by bundling AK and LibCore (for now) into a portable library called "Lagom". :^)
2019-07-25 09:56:08 +00:00
Build: Switch to CMake :^) Closes https://github.com/SerenityOS/serenity/issues/2080
2020-05-06 15:40:06 +00:00
if (BUILD_LAGOM)
add_library(Lagom $<TARGET_OBJECTS:LagomCore> ${LAGOM_MORE_SOURCES})
Lagom: Add a Shell parser fuzzer
2020-11-29 12:49:13 +00:00
Meta: Add GitHub Actions workflow for Lagom with Fuzzers There are cases where Lagom will build with GCC but not Clang. This often goes unnoticed for a while as we don't often build with Clang. However, this is now important to test in CI because of the OSS-Fuzz integration. Note that this only tests the build, it does not run any tests. Note that it also only builds LagomCore, Lagom and the fuzzers. It does not build the other programs that use Lagom.
2020-11-29 19:01:40 +00:00
if (NOT ENABLE_OSS_FUZZ AND NOT ENABLE_FUZZER_SANITIZER)
Meta: Build AK and LibRegex tests in Lagom and for Serenity These tests were never built for the serenity target. Move their Lagom build steps to the Lagom CMakeLists.txt, and add serenity build steps for them. Also, fix the build errors when building them with the serenity cross-compiler :^)
2021-01-17 21:25:12 +00:00
enable_testing()
AK+Userland: Move AK/TestSuite.h into LibTest and rework Tests' CMake As many macros as possible are moved to Macros.h, while the macros to create a test case are moved to TestCase.h. TestCase is now the only user-facing header for creating a test case. TestSuite and its helpers have moved into a .cpp file. Instead of requiring a TEST_MAIN macro to be instantiated into the test file, a TestMain.cpp file is provided instead that will be linked against each test. This has the side effect that, if we wanted to have test cases split across multiple files, it's as simple as adding them all to the same executable. The test main should be portable to kernel mode as well, so if there's a set of tests that should be run in self-test mode in kernel space, we can accomodate that. A new serenity_test CMake function streamlines adding a new test with arguments for the test source file, subdirectory under /usr/Tests to install the test application and an optional list of libraries to link against the test application. To accomodate future test where the provided TestMain.cpp is not suitable (e.g. test-js), a CUSTOM_MAIN parameter can be passed to the function to not link against the boilerplate main function.
2021-04-25 05:53:23 +00:00
add_library(LagomTest $<TARGET_OBJECTS:LagomCore> ${LAGOM_TEST_SOURCES})
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
add_executable(TestApp TestApp.cpp)
target_link_libraries(TestApp Lagom)
target_link_libraries(TestApp stdc++)
add_executable(TestJson TestJson.cpp)
target_link_libraries(TestJson Lagom)
target_link_libraries(TestJson stdc++)
Userland: Move command-line utilities to Userland/Utilities/
2021-01-12 10:57:58 +00:00
add_executable(adjtime_lagom ../../Userland/Utilities/adjtime.cpp)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
set_target_properties(adjtime_lagom PROPERTIES OUTPUT_NAME adjtime)
target_link_libraries(adjtime_lagom Lagom)
Userland: Move command-line utilities to Userland/Utilities/
2021-01-12 10:57:58 +00:00
add_executable(js_lagom ../../Userland/Utilities/js.cpp)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
set_target_properties(js_lagom PROPERTIES OUTPUT_NAME js)
target_link_libraries(js_lagom Lagom)
target_link_libraries(js_lagom stdc++)
target_link_libraries(js_lagom pthread)
Userland: Move command-line utilities to Userland/Utilities/
2021-01-12 10:57:58 +00:00
add_executable(ntpquery_lagom ../../Userland/Utilities/ntpquery.cpp)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
set_target_properties(ntpquery_lagom PROPERTIES OUTPUT_NAME ntpquery)
target_link_libraries(ntpquery_lagom Lagom)
Tests: Move Userland/Utilities/test-js to Tests/LibJS
2021-05-07 10:24:48 +00:00
add_executable(test-js_lagom ../../Tests/LibJS/test-js.cpp)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
set_target_properties(test-js_lagom PROPERTIES OUTPUT_NAME test-js)
target_link_libraries(test-js_lagom Lagom)
target_link_libraries(test-js_lagom stdc++)
target_link_libraries(test-js_lagom pthread)
Meta: Run test-js and test-compress as CTest executables Reduces the number of steps in the Actions workflow this way :^)
2021-02-28 22:06:42 +00:00
add_test(
NAME JS
COMMAND test-js_lagom --show-progress=false
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
Userland: Move command-line utilities to Userland/Utilities/
2021-01-12 10:57:58 +00:00
add_executable(test-crypto_lagom ../../Userland/Utilities/test-crypto.cpp)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
set_target_properties(test-crypto_lagom PROPERTIES OUTPUT_NAME test-crypto)
target_link_libraries(test-crypto_lagom Lagom)
target_link_libraries(test-crypto_lagom stdc++)
Shell: Build as part of Lagom as well Bringing the Serenity Shell to your very own host system :^)
2020-06-25 12:45:23 +00:00
add_test(
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
NAME Crypto
COMMAND test-crypto_lagom test -t -s google.com --ca-certs-file ../../Base/etc/ca_certs.ini
Shell: Build as part of Lagom as well Bringing the Serenity Shell to your very own host system :^)
2020-06-25 12:45:23 +00:00
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
Userland: Move command-line utilities to Userland/Utilities/
2021-01-12 10:57:58 +00:00
add_executable(disasm_lagom ../../Userland/Utilities/disasm.cpp)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
set_target_properties(disasm_lagom PROPERTIES OUTPUT_NAME disasm)
target_link_libraries(disasm_lagom Lagom)
target_link_libraries(disasm_lagom stdc++)
Shell: Move to Userland/Shell/
2021-01-12 10:53:14 +00:00
add_executable(shell_lagom ../../Userland/Shell/main.cpp)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
set_target_properties(shell_lagom PROPERTIES OUTPUT_NAME shell)
target_link_libraries(shell_lagom Lagom)
target_link_libraries(shell_lagom stdc++)
target_link_libraries(shell_lagom pthread)
Lagom: Build gml-format
2021-01-03 18:18:24 +00:00
Userland: Move command-line utilities to Userland/Utilities/
2021-01-12 10:57:58 +00:00
add_executable(gml-format_lagom ../../Userland/Utilities/gml-format.cpp)
Lagom: Build gml-format
2021-01-03 18:18:24 +00:00
set_target_properties(gml-format_lagom PROPERTIES OUTPUT_NAME gml-format)
target_link_libraries(gml-format_lagom Lagom)
target_link_libraries(gml-format_lagom stdc++)
Lagom: Add sql utility and LibSQL unit tests
2021-04-19 14:05:25 +00:00
add_executable(sql_lagom ../../Userland/Utilities/sql.cpp)
set_target_properties(sql_lagom PROPERTIES OUTPUT_NAME sql)
target_link_libraries(sql_lagom Lagom)
target_link_libraries(sql_lagom stdc++)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
foreach(TEST_PATH ${SHELL_TESTS})
get_filename_component(TEST_NAME ${TEST_PATH} NAME_WE)
add_test(
NAME "Shell-${TEST_NAME}"
Shell: Make tests use PASS/FAIL instead of exit codes There's no guarantee that the last executed command will have a zero exit code, and so the shell exit code may or may not be zero, even if all the tests pass. Also changes the `test || echo fail && exit` to `if not test { echo fail && exit }`, since that's nicer-looking.
2021-01-18 06:38:30 +00:00
COMMAND shell_lagom --skip-shellrc "${TEST_PATH}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Shell/Tests
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
)
Shell: Make tests use PASS/FAIL instead of exit codes There's no guarantee that the last executed command will have a zero exit code, and so the shell exit code may or may not be zero, even if all the tests pass. Also changes the `test || echo fail && exit` to `if not test { echo fail && exit }`, since that's nicer-looking.
2021-01-18 06:38:30 +00:00
set_tests_properties("Shell-${TEST_NAME}" PROPERTIES
TIMEOUT 10
FAIL_REGULAR_EXPRESSION "FAIL"
Lagom: CMakeLists.txt housekeeping - Remove unused LIBM_SOURCES - Some cosmetic and whitespace changes
2021-02-27 11:36:11 +00:00
PASS_REGULAR_EXPRESSION "PASS"
)
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
endforeach()
Meta: Build AK and LibRegex tests in Lagom and for Serenity These tests were never built for the serenity target. Move their Lagom build steps to the Lagom CMakeLists.txt, and add serenity build steps for them. Also, fix the build errors when building them with the serenity cross-compiler :^)
2021-01-17 21:25:12 +00:00
foreach(source ${AK_TEST_SOURCES})
get_filename_component(name ${source} NAME_WE)
AK+Userland: Move AK/TestSuite.h into LibTest and rework Tests' CMake As many macros as possible are moved to Macros.h, while the macros to create a test case are moved to TestCase.h. TestCase is now the only user-facing header for creating a test case. TestSuite and its helpers have moved into a .cpp file. Instead of requiring a TEST_MAIN macro to be instantiated into the test file, a TestMain.cpp file is provided instead that will be linked against each test. This has the side effect that, if we wanted to have test cases split across multiple files, it's as simple as adding them all to the same executable. The test main should be portable to kernel mode as well, so if there's a set of tests that should be run in self-test mode in kernel space, we can accomodate that. A new serenity_test CMake function streamlines adding a new test with arguments for the test source file, subdirectory under /usr/Tests to install the test application and an optional list of libraries to link against the test application. To accomodate future test where the provided TestMain.cpp is not suitable (e.g. test-js), a CUSTOM_MAIN parameter can be passed to the function to not link against the boilerplate main function.
2021-04-25 05:53:23 +00:00
add_executable(${name}_lagom ${source} ${LIBTEST_MAIN})
target_link_libraries(${name}_lagom LagomTest)
Meta: Build AK and LibRegex tests in Lagom and for Serenity These tests were never built for the serenity target. Move their Lagom build steps to the Lagom CMakeLists.txt, and add serenity build steps for them. Also, fix the build errors when building them with the serenity cross-compiler :^)
2021-01-17 21:25:12 +00:00
add_test(
NAME ${name}_lagom
COMMAND ${name}_lagom
# FIXME: Only TestJSON needs this property
Meta + Lagom: Fix paths after movement of tests to Tests/ Not sure how this didn't cause a build break when I originally moved them in #6891. Better fix them now.
2021-05-07 11:02:12 +00:00
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../Tests/AK
Meta: Build AK and LibRegex tests in Lagom and for Serenity These tests were never built for the serenity target. Move their Lagom build steps to the Lagom CMakeLists.txt, and add serenity build steps for them. Also, fix the build errors when building them with the serenity cross-compiler :^)
2021-01-17 21:25:12 +00:00
)
endforeach()
foreach(source ${LIBREGEX_TESTS})
get_filename_component(name ${source} NAME_WE)
AK+Userland: Move AK/TestSuite.h into LibTest and rework Tests' CMake As many macros as possible are moved to Macros.h, while the macros to create a test case are moved to TestCase.h. TestCase is now the only user-facing header for creating a test case. TestSuite and its helpers have moved into a .cpp file. Instead of requiring a TEST_MAIN macro to be instantiated into the test file, a TestMain.cpp file is provided instead that will be linked against each test. This has the side effect that, if we wanted to have test cases split across multiple files, it's as simple as adding them all to the same executable. The test main should be portable to kernel mode as well, so if there's a set of tests that should be run in self-test mode in kernel space, we can accomodate that. A new serenity_test CMake function streamlines adding a new test with arguments for the test source file, subdirectory under /usr/Tests to install the test application and an optional list of libraries to link against the test application. To accomodate future test where the provided TestMain.cpp is not suitable (e.g. test-js), a CUSTOM_MAIN parameter can be passed to the function to not link against the boilerplate main function.
2021-04-25 05:53:23 +00:00
add_executable(${name}_lagom ${source} ${LAGOM_REGEX_SOURCES} ${LIBTEST_MAIN})
target_link_libraries(${name}_lagom LagomTest)
Meta: Build AK and LibRegex tests in Lagom and for Serenity These tests were never built for the serenity target. Move their Lagom build steps to the Lagom CMakeLists.txt, and add serenity build steps for them. Also, fix the build errors when building them with the serenity cross-compiler :^)
2021-01-17 21:25:12 +00:00
add_test(
NAME ${name}_lagom
COMMAND ${name}_lagom
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
endforeach()
Lagom: Add sql utility and LibSQL unit tests
2021-04-19 14:05:25 +00:00
Tests: Reorganize LibCompress unit tests Move LibCompress unit tests to LibCompress/Tests directory and register them with CMake's add_test. This allows us to run these tests with ninja test instead of running a separate executable. Also split the existing tests in 3 test files that better follow the source code structure (inspired by AK tests).
2021-04-18 02:20:56 +00:00
foreach(source ${LIBCOMPRESS_TESTS})
get_filename_component(name ${source} NAME_WE)
AK+Userland: Move AK/TestSuite.h into LibTest and rework Tests' CMake As many macros as possible are moved to Macros.h, while the macros to create a test case are moved to TestCase.h. TestCase is now the only user-facing header for creating a test case. TestSuite and its helpers have moved into a .cpp file. Instead of requiring a TEST_MAIN macro to be instantiated into the test file, a TestMain.cpp file is provided instead that will be linked against each test. This has the side effect that, if we wanted to have test cases split across multiple files, it's as simple as adding them all to the same executable. The test main should be portable to kernel mode as well, so if there's a set of tests that should be run in self-test mode in kernel space, we can accomodate that. A new serenity_test CMake function streamlines adding a new test with arguments for the test source file, subdirectory under /usr/Tests to install the test application and an optional list of libraries to link against the test application. To accomodate future test where the provided TestMain.cpp is not suitable (e.g. test-js), a CUSTOM_MAIN parameter can be passed to the function to not link against the boilerplate main function.
2021-04-25 05:53:23 +00:00
add_executable(${name}_lagom ${source} ${LIBCOMPRESS_SOURCES} ${LIBTEST_MAIN})
target_link_libraries(${name}_lagom Lagom LagomTest)
Tests: Reorganize LibCompress unit tests Move LibCompress unit tests to LibCompress/Tests directory and register them with CMake's add_test. This allows us to run these tests with ninja test instead of running a separate executable. Also split the existing tests in 3 test files that better follow the source code structure (inspired by AK tests).
2021-04-18 02:20:56 +00:00
add_test(
NAME ${name}_lagom
COMMAND ${name}_lagom
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
endforeach()
Lagom: Add sql utility and LibSQL unit tests
2021-04-19 14:05:25 +00:00
foreach(source ${LIBSQL_TEST_SOURCES})
get_filename_component(name ${source} NAME_WE)
AK+Userland: Move AK/TestSuite.h into LibTest and rework Tests' CMake As many macros as possible are moved to Macros.h, while the macros to create a test case are moved to TestCase.h. TestCase is now the only user-facing header for creating a test case. TestSuite and its helpers have moved into a .cpp file. Instead of requiring a TEST_MAIN macro to be instantiated into the test file, a TestMain.cpp file is provided instead that will be linked against each test. This has the side effect that, if we wanted to have test cases split across multiple files, it's as simple as adding them all to the same executable. The test main should be portable to kernel mode as well, so if there's a set of tests that should be run in self-test mode in kernel space, we can accomodate that. A new serenity_test CMake function streamlines adding a new test with arguments for the test source file, subdirectory under /usr/Tests to install the test application and an optional list of libraries to link against the test application. To accomodate future test where the provided TestMain.cpp is not suitable (e.g. test-js), a CUSTOM_MAIN parameter can be passed to the function to not link against the boilerplate main function.
2021-04-25 05:53:23 +00:00
add_executable(${name}_lagom ${source} ${LIBSQL_SOURCES} ${LIBTEST_MAIN})
target_link_libraries(${name}_lagom LagomTest)
Lagom: Add sql utility and LibSQL unit tests
2021-04-19 14:05:25 +00:00
add_test(
NAME ${name}_lagom
COMMAND ${name}_lagom
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
endforeach()
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
endif()
Build: Switch to CMake :^) Closes https://github.com/SerenityOS/serenity/issues/2080
2020-05-06 15:40:06 +00:00
endif()
LibX86: Add an X86 instruction decoder library + basic disassembler This will be very useful for developer tools like ProfileView, and also for future tools like debuggers and such. :^)
2020-04-11 11:16:17 +00:00
Lagom: Various fixes to make Lagom run on OSS-Fuzz (#4176)
2020-11-27 22:57:02 +00:00
if (ENABLE_FUZZER_SANITIZER OR ENABLE_OSS_FUZZ)
Lagom: Add fuzz testing for LibJS using libFuzzer (#1692) Note: clang only (see https://llvm.org/docs/LibFuzzer.html) - add FuzzJs which will run the LibJS parser on random javascript inputs - added a basic dictionary of javascript tokens To use fuzzer: CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -DENABLE_FUZZER_SANITIZER=1 .. Fuzzers/FuzzJs -dict=../Fuzzers/FuzzJs.dict
2020-04-08 08:40:02 +00:00
add_subdirectory(Fuzzers)
endif()
Reference in a new issue Copy permalink