Skip to content
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.

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

GN fixes and initial work for Windows #1517

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion Meta/gn/build/download_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def main():
try:
with tempfile.NamedTemporaryFile(delete=False, dir=output_file.parent) as out:
out.write(f.read())
os.rename(out.name, output_file)
os.rename(out.name, output_file)
except IOError:
os.unlink(out.name)

Expand Down
3 changes: 3 additions & 0 deletions Meta/gn/secondary/AK/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ write_cmake_config("ak_debug_gen") {
"LEXER_DEBUG=",
"LIBWEB_CSS_ANIMATION_DEBUG=",
"LIBWEB_CSS_DEBUG=",
"LIBWEB_WASM_DEBUG=",
"LINE_EDITOR_DEBUG=",
"LZMA_DEBUG=",
"LZW_DEBUG=",
Expand All @@ -263,6 +264,7 @@ write_cmake_config("ak_debug_gen") {
"RSA_PARSE_DEBUG=",
"SHARED_QUEUE_DEBUG=",
"SPAM_DEBUG=",
"STYLE_INVALIDATION_DEBUG=",
"SYNTAX_HIGHLIGHTING_DEBUG=",
"TEXTEDITOR_DEBUG=",
"TIFF_DEBUG=",
Expand All @@ -280,6 +282,7 @@ write_cmake_config("ak_debug_gen") {
"WEBDRIVER_DEBUG=",
"WEBDRIVER_ROUTE_DEBUG=",
"WEBGL_CONTEXT_DEBUG=",
"WEBVIEW_PROCESS_DEBUG=",
"WEB_FETCH_DEBUG=",
"WEB_WORKER_DEBUG=",
"WEBP_DEBUG=",
Expand Down
25 changes: 2 additions & 23 deletions Meta/gn/secondary/Ladybird/BUILD.gn
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import("//Ladybird/compile_qt_resource_file.gni")
import("//Ladybird/enable_qt.gni")
import("//Ladybird/enable_appkit.gni")
import("//Ladybird/link_qt.gni")
import("//Ladybird/moc_qt_objects.gni")

Expand Down Expand Up @@ -69,7 +70,6 @@ executable("ladybird_executable") {
"//Userland/Libraries/LibImageDecoderClient",
"//Userland/Libraries/LibJS",
"//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWebView",
Expand Down Expand Up @@ -110,7 +110,7 @@ executable("ladybird_executable") {
":compile_resource_file",
":generate_moc",
]
} else {
} else if (enable_appkit) {
sources += [
"AppKit/Application/Application.mm",
"AppKit/Application/ApplicationBridge.cpp",
Expand Down Expand Up @@ -156,7 +156,6 @@ executable("ladybird_executable") {
data_deps += [
":ladybird_copy_cacert",
":ladybird_copy_config_resources",
":ladybird_copy_emoji",
":ladybird_copy_fonts",
":ladybird_copy_icons_16x16",
":ladybird_copy_icons_32x32",
Expand Down Expand Up @@ -185,7 +184,6 @@ executable("headless-browser") {
"//Userland/Libraries/LibImageDecoderClient",
"//Userland/Libraries/LibJS",
"//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb",
Expand All @@ -200,13 +198,6 @@ executable("headless-browser") {
]
}

_emoji = read_file("//Meta/emoji-file-list.txt", "list lines")
emoji = []

foreach(file, _emoji) {
emoji += [ "//Base/res/emoji/" + file ]
}

fonts = [ "//Base/res/fonts/SerenitySans-Regular.ttf" ]

icons_16x16 = [
Expand Down Expand Up @@ -289,11 +280,6 @@ config_resources = [
]

if (current_os != "mac") {
copy("ladybird_copy_emoji") {
sources = emoji
outputs = [ "$root_out_dir/share/Lagom/emoji/{{source_file_part}}" ]
}

copy("ladybird_copy_fonts") {
sources = fonts
outputs = [ "$root_out_dir/share/Lagom/fonts/{{source_file_part}}" ]
Expand Down Expand Up @@ -397,15 +383,13 @@ if (current_os != "mac") {
"//Userland/Libraries/LibJS",
"//Userland/Libraries/LibLine",
"//Userland/Libraries/LibMedia",
"//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibRIFF",
"//Userland/Libraries/LibRegex",
"//Userland/Libraries/LibSyntax",
"//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibTextCodec",
"//Userland/Libraries/LibThreading",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibVideo",
"//Userland/Libraries/LibWasm",
"//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWebSocket",
Expand Down Expand Up @@ -446,11 +430,6 @@ if (current_os != "mac") {
outputs = [ "{{bundle_contents_dir}}/lib/{{source_file_part}}" ]
}

bundle_data("ladybird_emoji") {
sources = emoji
outputs = [ "{{bundle_resources_dir}}/emoji/{{source_file_part}}" ]
}

bundle_data("ladybird_fonts") {
sources = fonts
outputs = [ "{{bundle_resources_dir}}/fonts/{{source_file_part}}" ]
Expand Down
1 change: 0 additions & 1 deletion Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ executable("RequestServer") {
"//Userland/Libraries/LibHTTP",
"//Userland/Libraries/LibIPC",
"//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibThreading",
"//Userland/Libraries/LibURL",
Expand Down
1 change: 0 additions & 1 deletion Meta/gn/secondary/Ladybird/WebContent/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ executable("WebContent") {
"//Userland/Libraries/LibImageDecoderClient",
"//Userland/Libraries/LibJS",
"//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWebSocket",
Expand Down
2 changes: 0 additions & 2 deletions Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ executable("WebWorker") {
"//Userland/Libraries/LibIPC",
"//Userland/Libraries/LibImageDecoderClient",
"//Userland/Libraries/LibJS",
"//Userland/Libraries/LibLocale",
"//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWeb:WebWorkerClientEndpoint",
Expand Down
5 changes: 5 additions & 0 deletions Meta/gn/secondary/Ladybird/enable_appkit.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
declare_args() {
# Build the Ladybird application using the AppKit chrome.
enable_appkit = current_os == "mac"
}

2 changes: 1 addition & 1 deletion Meta/gn/secondary/Ladybird/enable_qt.gni
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
declare_args() {
# Build the Ladybird application using the Qt chrome.
enable_qt = current_os != "mac"
enable_qt = current_os != "mac" && current_os != "win"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ lagom_tool("GenerateDateTimeFormatData") {
sources = [ "GenerateDateTimeFormatData.cpp" ]
deps = [
"//Userland/Libraries/LibMain",
"//Userland/Libraries/LibTimeZone",
]
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
import("//Meta/Lagom/Tools/lagom_tool.gni")

lagom_tool("GenerateUnicodeData") {
sources = [ "GenerateUnicodeData.cpp" ]
deps = [ "//Userland/Libraries/LibMain" ]
}

lagom_tool("GenerateEmojiData") {
sources = [ "GenerateEmojiData.cpp" ]
deps = [ "//Userland/Libraries/LibMain" ]
}

lagom_tool("GenerateIDNAData") {
sources = [ "GenerateIDNAData.cpp" ]
deps = [ "//Userland/Libraries/LibMain" ]
}
1 change: 0 additions & 1 deletion Meta/gn/secondary/Tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ group("Tests") {
deps = [
"//Tests/AK",
"//Tests/LibJS",
"//Tests/LibThreading",
"//Tests/LibURL",
"//Tests/LibWeb",
]
Expand Down
1 change: 0 additions & 1 deletion Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ shared_library("LibCore") {
":sources",
"//Meta/gn/build/libs/crypt",
"//Meta/gn/build/libs/pthread",
"//Userland/Libraries/LibTimeZone",
"//Userland/Libraries/LibURL",
]

Expand Down
8 changes: 0 additions & 8 deletions Meta/gn/secondary/Userland/Libraries/LibCrypt/BUILD.gn

This file was deleted.

31 changes: 12 additions & 19 deletions Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -33,61 +33,54 @@ shared_library("LibGfx") {
"DeprecatedPainter.cpp",
"DeprecatedPath.cpp",
"EdgeFlagPathRasterizer.cpp",
"Filters/ColorBlindnessFilter.cpp",
"Filters/FastBoxBlurFilter.cpp",
"Filters/LumaFilter.cpp",
"Filters/StackBlurFilter.cpp",
"Font/Emoji.cpp",
"Font/Font.cpp",
"Font/FontData.cpp",
"Font/FontDatabase.cpp",
"Font/OpenType/Cmap.cpp",
"Font/OpenType/Font.cpp",
"Font/OpenType/Glyf.cpp",
"Font/OpenType/Hinting/Opcodes.cpp",
"Font/OpenType/Tables.cpp",
"Font/ScaledFont.cpp",
"Font/ScaledFontSkia.cpp",
"Font/Typeface.cpp",
"Font/Typeface.cpp",
"Font/WOFF/Font.cpp",
"Font/WOFF2/Font.cpp",
"Font/WOFF/Loader.cpp",
"Font/WOFF2/Loader.cpp",
"FontCascadeList.cpp",
"GradientPainting.cpp",
"ICC/BinaryWriter.cpp",
"ICC/Enums.cpp",
"ICC/Profile.cpp",
"ICC/TagTypes.cpp",
"ICC/Tags.cpp",
"ICC/TagTypes.cpp",
"ICC/WellKnownProfiles.cpp",
"ImageFormats/AnimationWriter.cpp",
"ImageFormats/BMPLoader.cpp",
"ImageFormats/BMPWriter.cpp",
"ImageFormats/BooleanDecoder.cpp",
"ImageFormats/CCITTDecoder.cpp",
"ImageFormats/GIFLoader.cpp",
"ImageFormats/GIFWriter.cpp",
"ImageFormats/ICOLoader.cpp",
"ImageFormats/ImageDecoder.cpp",
"ImageFormats/JPEGLoader.cpp",
"ImageFormats/JPEGWriter.cpp",
"ImageFormats/JPEGXLLoader.cpp",
"ImageFormats/JPEGWriter.cpp",
"ImageFormats/PNGLoader.cpp",
"ImageFormats/PNGWriter.cpp",
"ImageFormats/TIFFLoader.cpp",
"ImageFormats/TinyVGLoader.cpp",
"ImageFormats/WebPLoader.cpp",
"ImageFormats/WebPLoaderLossless.cpp",
"ImageFormats/WebPLoaderLossy.cpp",
"ImageFormats/WebPSharedLossless.cpp",
"ImageFormats/WebPWriter.cpp",
"ImageFormats/WebPWriterLossless.cpp",
"ImageFormats/AVIFLoader.cpp",
"ImmutableBitmap.cpp",
"MedianCut.cpp",
"Palette.cpp",
"PathClipper.cpp",
"Path.cpp",
"PathSkia.cpp",
"Painter.cpp",
"Point.cpp",
"Rect.cpp",
"ShareableBitmap.cpp",
"Size.cpp",
"SystemTheme.cpp",
"TextDirection.cpp",
"TextLayout.cpp",
"Triangle.cpp",
"VectorGraphic.cpp",
Expand Down
2 changes: 0 additions & 2 deletions Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ shared_library("LibJS") {
"//Userland/Libraries/LibCore",
"//Userland/Libraries/LibCrypto",
"//Userland/Libraries/LibFileSystem",
"//Userland/Libraries/LibLocale",
"//Userland/Libraries/LibRegex",
"//Userland/Libraries/LibSyntax",
"//Userland/Libraries/LibTimeZone",
"//Userland/Libraries/LibUnicode",
]

Expand Down
Loading
Loading