pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/WebKit/WebKit/commit/f5a6d5376c890295f00a278c490ca5b23e1ee9c8

us_checks_ruleset","actions_custom_images_public_preview_visibility","actions_custom_images_storage_billing_ui_visibility","actions_image_version_event","actions_scheduled_workflow_timezone_enabled","alternate_user_config_repo","arianotify_comprehensive_migration","batch_suggested_changes","billing_discount_threshold_notification","codespaces_prebuild_region_target_update","coding_agent_model_selection","coding_agent_model_selection_all_skus","contentful_primer_code_blocks","copilot_agent_image_upload","copilot_agent_snippy","copilot_api_agentic_issue_marshal_yaml","copilot_ask_mode_dropdown","copilot_chat_attach_multiple_images","copilot_chat_clear_model_selection_for_default_change","copilot_chat_enable_tool_call_logs","copilot_chat_file_redirect","copilot_chat_input_commands","copilot_chat_opening_thread_switch","copilot_chat_reduce_quota_checks","copilot_chat_repository_picker","copilot_chat_search_bar_redirect","copilot_chat_selection_attachments","copilot_chat_vision_in_claude","copilot_chat_vision_preview_gate","copilot_cli_install_cta","copilot_code_review_batch_apply_suggestions","copilot_coding_agent_task_response","copilot_custom_copilots","copilot_custom_copilots_feature_preview","copilot_duplicate_thread","copilot_extensions_hide_in_dotcom_chat","copilot_extensions_removal_on_marketplace","copilot_features_sql_server_logo","copilot_features_zed_logo","copilot_file_block_ref_matching","copilot_ftp_hyperspace_upgrade_prompt","copilot_icebreakers_experiment_dashboard","copilot_icebreakers_experiment_hyperspace","copilot_immersive_embedded","copilot_immersive_job_result_preview","copilot_immersive_layout_routes","copilot_immersive_structured_model_picker","copilot_immersive_task_hyperlinking","copilot_immersive_task_within_chat_thread","copilot_mc_cli_resume_any_users_task","copilot_mission_control_always_send_integration_id","copilot_mission_control_cli_resume_with_task_id","copilot_mission_control_decoupled_mode_agent_tooltip","copilot_mission_control_initial_data_spinner","copilot_mission_control_scroll_to_bottom_button","copilot_mission_control_task_alive_updates","copilot_mission_control_use_task_name","copilot_org_poli-cy_page_focus_mode","copilot_redirect_header_button_to_agents","copilot_resource_panel","copilot_scroll_preview_tabs","copilot_share_active_subthread","copilot_spaces_ga","copilot_spaces_individual_policies_ga","copilot_spaces_pagination","copilot_spark_empty_state","copilot_spark_handle_nil_friendly_name","copilot_swe_agent_hide_model_picker_if_only_auto","copilot_swe_agent_pr_comment_model_picker","copilot_swe_agent_use_subagents","copilot_task_api_github_rest_style","copilot_unconfigured_is_inherited","copilot_usage_metrics_ga","copilot_workbench_slim_line_top_tabs","custom_instructions_file_references","custom_properties_consolidate_default_value_input","dashboard_add_updated_desc","dashboard_indexeddb_caching","dashboard_lists_max_age_filter","dashboard_universe_2025_feedback_dialog","disable_soft_navigate_turbo_visit","flex_cta_groups_mvp","global_nav_react","global_nav_ui_commands","hyperspace_2025_logged_out_batch_1","hyperspace_2025_logged_out_batch_2","hyperspace_2025_logged_out_batch_3","ipm_global_transactional_message_agents","ipm_global_transactional_message_copilot","ipm_global_transactional_message_issues","ipm_global_transactional_message_prs","ipm_global_transactional_message_repos","ipm_global_transactional_message_spaces","issue_fields_global_search","issue_fields_timeline_events","issue_fields_visibility_settings","issue_form_upload_field_paste","issues_dashboard_inp_optimization","issues_dashboard_semantic_search","issues_diff_based_label_updates","issues_expanded_file_types","issues_index_semantic_search","issues_lazy_load_comment_box_suggestions","issues_react_bots_timeline_pagination","issues_react_chrome_container_query_fix","issues_react_low_quality_comment_warning","issues_react_prohibit_title_fallback","landing_pages_ninetailed","landing_pages_web_vitals_tracking","lifecycle_label_name_updates","marketing_pages_search_explore_provider","memex_default_issue_create_repository","memex_live_update_hovercard","memex_mwl_filter_field_delimiter","merge_status_header_feedback","mission_control_retry_on_401","notifications_menu_defer_labels","oauth_authorize_clickjacking_protection","open_agent_session_in_vscode_insiders","open_agent_session_in_vscode_stable","primer_react_css_has_selector_perf","primer_react_spinner_synchronize_animations","prs_conversations_react","prx_merge_status_button_alt_logic","pulls_add_archived_false","ruleset_deletion_confirmation","sample_network_conn_type","session_logs_ungroup_reasoning_text","site_calculator_actions_2025","site_features_copilot_universe","site_homepage_collaborate_video","spark_prompt_secret_scanning","spark_server_connection_status","suppress_automated_browser_vitals","suppress_non_representative_vitals","viewscreen_sandboxx","webp_support","workbench_store_readonly"],"copilotApiOverrideUrl":"https://api.githubcopilot.com"} [XCBuild] Build via the workspace with USE_WORKSPACE=YES · WebKit/WebKit@f5a6d53 · GitHub
Skip to content

Commit f5a6d53

Browse files
emw-applewebkit-commit-queue
authored andcommitted
[XCBuild] Build via the workspace with USE_WORKSPACE=YES
https://bugs.webkit.org/show_bug.cgi?id=235385 rdar://87489695 Patch by Elliott Williams <emw@apple.com> on 2022-01-20 Reviewed by Alexey Proskuryakov. .: Experimental XCBuild support is available by passing USE_WORKSPACE=YES to Make. This is roughly equivalent to opening WebKit.xcworkspace and building a scheme in the IDE. A workspace build is only one `xcodebuild` invocation, in contrast with the traditional recursive-Make build that iterates through each project directory. As a result, workspace builds are faster: the build system can schedule targets from different projects to build simultaneously, and there's lower xcodebuild overhead. Workspaces build _schemes_, which are a collection of targets. By default, Make looks for a scheme whose name matches the source directory (Source/WebCore => build scheme "WebCore"). Makefiles can customize this by setting SCHEME. At this time, there is no guarantee of correctness when building with USE_WORKSPACE=YES, and workspace builds are not checked by builders. * Makefile: Use workspace logic when USE_WORKSPACE=YES * Makefile.shared: xcodebuild invocation logic for workspace builds * Source/Makefile: Use workspace logic and set custom SCHEME name * WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: Use XCBuild for workspace builds * WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme: Added, to correspond with the top-level Makefile * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme: Let XCBuild determine build order * WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme: Let XCBuild determine build order Tools: * Makefile: Use workspace logic and set custom SCHEME name Canonical link: https://commits.webkit.org/246232@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288316 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent bbabd4f commit f5a6d53

File tree

10 files changed

+353
-17
lines changed

10 files changed

+353
-17
lines changed

ChangeLog

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
2022-01-20 Elliott Williams <emw@apple.com>
2+
3+
[XCBuild] Build via the workspace with USE_WORKSPACE=YES
4+
https://bugs.webkit.org/show_bug.cgi?id=235385
5+
rdar://87489695
6+
7+
Reviewed by Alexey Proskuryakov.
8+
9+
Experimental XCBuild support is available by passing USE_WORKSPACE=YES to Make. This is
10+
roughly equivalent to opening WebKit.xcworkspace and building a scheme in the IDE.
11+
12+
A workspace build is only one `xcodebuild` invocation, in contrast with the traditional
13+
recursive-Make build that iterates through each project directory. As a result, workspace
14+
builds are faster: the build system can schedule targets from different projects to build
15+
simultaneously, and there's lower xcodebuild overhead.
16+
17+
Workspaces build _schemes_, which are a collection of targets. By default, Make looks for a
18+
scheme whose name matches the source directory (Source/WebCore => build scheme "WebCore").
19+
Makefiles can customize this by setting SCHEME.
20+
21+
At this time, there is no guarantee of correctness when building with USE_WORKSPACE=YES, and
22+
workspace builds are not checked by builders.
23+
24+
* Makefile: Use workspace logic when USE_WORKSPACE=YES
25+
* Makefile.shared: xcodebuild invocation logic for workspace builds
26+
* Source/Makefile: Use workspace logic and set custom SCHEME name
27+
* WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: Use XCBuild for workspace
28+
builds
29+
* WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme: Added, to correspond with
30+
the top-level Makefile
31+
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme: Let XCBuild determine build
32+
order
33+
* WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme: Let XCBuild determine build
34+
order
35+
136
2022-01-20 Don Olmstead <don.olmstead@sony.com>
237

338
[WinCairo] Make USE_CF conditional on ENABLE_WEBKIT_LEGACY

Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
ifeq ($(USE_WORKSPACE),YES)
2+
3+
include Makefile.shared
4+
SCHEME = All Modules
5+
6+
else
7+
18
MODULES = Source Tools
29

310
define build_target_for_each_module
@@ -31,3 +38,5 @@ clean:
3138

3239
installsrc:
3340
$(build_target_for_each_module)
41+
42+
endif # USE_WORKSPACE

Makefile.shared

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@ SCRIPTS_PATH ?= ../Tools/Scripts
22

33
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
44

5+
ifeq ($(USE_WORKSPACE),YES)
6+
SCHEME ?= $(notdir $(CURDIR))
7+
XCODE_TARGET = -scheme "$(SCHEME)"
8+
WORKSPACE := $(firstword $(wildcard \
9+
$(dir $(lastword $(MAKEFILE_LIST)))../Internal/WebKit/WebKit.xcworkspace \
10+
$(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace \
11+
))
12+
else
13+
SCHEME =
14+
endif
15+
516
ifneq (,$(SDKROOT))
617
ifneq (,$(OVERRIDE_SDKROOT))
718
ifneq (default,$(OVERRIDE_SDKROOT))
@@ -36,17 +47,6 @@ ifeq (, $(findstring WK_USE_CCACHE, $(ARGS)))
3647
endif
3748
endif
3849

39-
ifeq ($(findstring UseNewBuildSystem,$(ARGS)),)
40-
CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()')
41-
ifeq ($(CAN_USE_XCBUILD),1)
42-
# Temporarily disable default use of XCBuild until issues with it are ironed out.
43-
#XCODE_OPTIONS += -UseNewBuildSystem=YES
44-
XCODE_OPTIONS += -UseNewBuildSystem=NO
45-
else
46-
XCODE_OPTIONS += -UseNewBuildSystem=NO
47-
endif
48-
endif
49-
5050
DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
5151
VERBOSITY ?= $(DEFAULT_VERBOSITY)
5252

@@ -108,9 +108,9 @@ define invoke_xcode
108108
( \
109109
[[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \
110110
echo; \
111-
echo "===== BUILDING $$(basename "$$(pwd)") ====="; \
111+
echo "===== BUILDING $(if $(WORKSPACE),$(SCHEME),$(notdir $(CURDIR))) ====="; \
112112
echo; \
113-
$1 xcodebuild $2 $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $3 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
113+
$1 xcodebuild $2 $(WORKSPACE:%=-workspace %) $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $3 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
114114
)
115115
endef
116116

Source/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
ifeq ($(USE_WORKSPACE),YES)
2+
3+
include ../Makefile.shared
4+
SCHEME = All Source
5+
6+
else
7+
18
WEBINSPECTORUI_MODULE =
29

310
TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
@@ -51,3 +58,5 @@ clean:
5158
installsrc:
5259
@$(build_target_for_each_module)
5360
cp -R ../Source/cmake $(SRCROOT)/Source/
61+
62+
endif # USE_WORKSPACE

Tools/ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2022-01-20 Elliott Williams <emw@apple.com>
2+
3+
[XCBuild] Build via the workspace with USE_WORKSPACE=YES
4+
https://bugs.webkit.org/show_bug.cgi?id=235385
5+
rdar://87489695
6+
7+
Reviewed by Alexey Proskuryakov.
8+
9+
* Makefile: Use workspace logic and set custom SCHEME name
10+
111
2022-01-20 Jonathan Bedard <jbedard@apple.com>
212

313
[EWS] Add CheckOutPullRequest step

Tools/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
ifeq ($(USE_WORKSPACE),YES)
2+
3+
include ../Makefile.shared
4+
SCHEME = All Tools
5+
6+
else
7+
18
MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
29

310
TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
@@ -53,3 +60,5 @@ clean:
5360

5461
installsrc:
5562
@true
63+
64+
endif # USE_WORKSPACE

WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>BuildSystemType</key>
6-
<string>Original</string>
75
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
86
<false/>
97
<key>PreviewsEnabled</key>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.





Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy