bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move generated includes to the gen directory

Browse Source
This commit is contained in:
Marshall Greenblatt
2025-01-09 12:03:07 -05:00
parent f6b02f90aa
commit ee5cec12d2
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BUILD.gn
View File

@ -1128,7 +1128,7 @@ config("libcef_includes_config") {
# CEF generated header files that also need to be discoverable. # CEF generated header files that also need to be discoverable.
# These #includes from client-side code will not be prefixed with cef/. # These #includes from client-side code will not be prefixed with cef/.
# They will be copied to the include/ directory in the binary distribution. # They will be copied to the include/ directory in the binary distribution.
"$root_out_dir/includes/cef", "$root_gen_dir/cef",
] ]
} }
@ -1276,7 +1276,7 @@ template("make_pack_header") {
# Generate cef_pack_resources.h. # Generate cef_pack_resources.h.
make_pack_header("resources") { make_pack_header("resources") {
header = "$root_out_dir/includes/cef/include/cef_pack_resources.h" header = "$root_gen_dir/cef/include/cef_pack_resources.h"
inc = "$root_gen_dir/cef/libcef_dll/cef_pack_resources.inc" inc = "$root_gen_dir/cef/libcef_dll/cef_pack_resources.inc"
inputs = [ inputs = [
"$root_gen_dir/base/tracing/protos/grit/tracing_proto_resources.h", "$root_gen_dir/base/tracing/protos/grit/tracing_proto_resources.h",
@ -1343,7 +1343,7 @@ make_pack_header("resources") {
# Generate cef_pack_strings.h. # Generate cef_pack_strings.h.
make_pack_header("strings") { make_pack_header("strings") {
header = "$root_out_dir/includes/cef/include/cef_pack_strings.h" header = "$root_gen_dir/cef/include/cef_pack_strings.h"
inc = "$root_gen_dir/cef/libcef_dll/cef_pack_strings.inc" inc = "$root_gen_dir/cef/libcef_dll/cef_pack_strings.inc"
inputs = [ inputs = [
"$root_gen_dir/cef/grit/cef_strings.h", "$root_gen_dir/cef/grit/cef_strings.h",
@ -1387,7 +1387,7 @@ make_pack_header("strings") {
# Generate cef_command_ids.h. # Generate cef_command_ids.h.
make_pack_header("command_ids") { make_pack_header("command_ids") {
header = "$root_out_dir/includes/cef/include/cef_command_ids.h" header = "$root_gen_dir/cef/include/cef_command_ids.h"
inc = "$root_gen_dir/cef/libcef_dll/cef_command_ids.inc" inc = "$root_gen_dir/cef/libcef_dll/cef_command_ids.inc"
inputs = [ inputs = [
"//chrome/app/chrome_command_ids.h", "//chrome/app/chrome_command_ids.h",
@ -1403,7 +1403,7 @@ action("make_api_versions_header") {
"cef_api_untracked.json", "cef_api_untracked.json",
] ]
outputs = [ outputs = [
"$root_out_dir/includes/cef/include/cef_api_versions.h", "$root_gen_dir/cef/include/cef_api_versions.h",
"$root_gen_dir/cef/libcef_dll/cef_api_versions.inc", "$root_gen_dir/cef/libcef_dll/cef_api_versions.inc",
] ]
@ -1418,7 +1418,7 @@ action("make_version_header") {
"VERSION.stamp", "VERSION.stamp",
"//chrome/VERSION", "//chrome/VERSION",
] ]
outputs = [ "$root_out_dir/includes/cef/include/cef_version.h" ] outputs = [ "$root_gen_dir/cef/include/cef_version.h" ]
args = rebase_path(outputs, root_build_dir) args = rebase_path(outputs, root_build_dir)
} }
@ -1438,7 +1438,7 @@ action("make_config_header") {
deps = [ ":args_gn_source" ] deps = [ ":args_gn_source" ]
inputs = [ "$root_out_dir/args.gn" ] inputs = [ "$root_out_dir/args.gn" ]
outputs = [ "$root_out_dir/includes/cef/include/cef_config.h" ] outputs = [ "$root_gen_dir/cef/include/cef_config.h" ]
args = rebase_path(outputs + inputs, root_build_dir) args = rebase_path(outputs + inputs, root_build_dir)
} }
@ -1452,7 +1452,7 @@ action("make_colorids_header") {
"//components/color/color_id.h", "//components/color/color_id.h",
"//chrome/browser/ui/color/chrome_color_id.h", "//chrome/browser/ui/color/chrome_color_id.h",
] ]
outputs = [ "$root_out_dir/includes/cef/include/cef_color_ids.h" ] outputs = [ "$root_gen_dir/cef/include/cef_color_ids.h" ]
args = rebase_path(outputs + inputs, root_build_dir) args = rebase_path(outputs + inputs, root_build_dir)
} }

8
libcef/features/BUILD.gn
View File

@ -95,11 +95,9 @@ config("config") {
# cef/include/ directory uses #includes relative to the cef/ directory. # cef/include/ directory uses #includes relative to the cef/ directory.
"//cef", "//cef",
# CEF generated header files that also need to be discoverable. # CEF generated header files that also need to be discoverable relative
# These #includes from library-side code will always be prefixed with cef/. # to the cef/ directory.
"$root_out_dir/includes", "$root_gen_dir/cef",
# These #includes from cef/include/ directory will not be prefixed.
"$root_out_dir/includes/cef",
] ]
defines = [ defines = [
"BUILDING_CEF_SHARED", "BUILDING_CEF_SHARED",

2
tools/make_distrib.py
View File

@ -952,7 +952,7 @@ if mode == 'standard' or mode == 'minimal':
] ]
for include in generated_includes: for include in generated_includes:
# Debug and Release build should be the same so grab whichever exists. # Debug and Release build should be the same so grab whichever exists.
rel_path = os.path.join('includes', 'cef', 'include', include) rel_path = os.path.join('gen', 'cef', 'include', include)
src_path = os.path.join(build_dir_release, rel_path) src_path = os.path.join(build_dir_release, rel_path)
if not os.path.exists(src_path): if not os.path.exists(src_path):
src_path = os.path.join(build_dir_debug, rel_path) src_path = os.path.join(build_dir_debug, rel_path)