Skip to content

Commit

Permalink
Remove installsrc support
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=281706
rdar://138152936

Reviewed by Elliott Williams.

* Makefile:
* Makefile.shared:
* Source/Makefile:
* Source/ThirdParty/Makefile:
* Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig:
* Source/ThirdParty/libwebrtc/Makefile:
* Source/WebCore/Makefile:
* Tools/Makefile:
* Tools/WebKitTestRunner/Configurations/Base.xcconfig:

Canonical link: https://commits.webkit.org/286300@main
  • Loading branch information
aproskuryakov committed Nov 7, 2024
1 parent 08e0c89 commit 819018b
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 58 deletions.
11 changes: 0 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ifeq ($(MAKECMDGOALS),installsrc)
USE_WORKSPACE = NO
endif

ifneq ($(USE_WORKSPACE),NO)

SCHEME = Everything up to WebKit + Tools
Expand Down Expand Up @@ -41,11 +37,4 @@ analyze:
clean:
@$(build_target_for_each_module)

installsrc:
$(build_target_for_each_module)
ditto Configurations "$(SRCROOT)/Configurations"
for sdk in WebKitLibraries/SDKs/*.internal-additions.sdk; do \
ditto -v $$sdk "$(SRCROOT)/WebKitLibraries/SDKs/`basename $$sdk`"; \
done

endif # USE_WORKSPACE
7 changes: 0 additions & 7 deletions Makefile.shared
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
SCRIPTS_PATH ?= ../Tools/Scripts

ifneq ($(MAKECMDGOALS),installsrc)

ifneq ($(USE_WORKSPACE),NO)
SCHEME ?= $(notdir $(CURDIR))
XCODE_TARGET = -scheme "$(SCHEME)"
Expand Down Expand Up @@ -68,8 +66,6 @@ ifneq (,$(EXPORT_COMPILE_COMMANDS))
XCODE_OPTIONS += COMPILER_INDEX_STORE_ENABLE=NO
endif

endif # ifneq ($(MAKECMDGOALS),installsrc)

DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
VERBOSITY ?= $(DEFAULT_VERBOSITY)

Expand Down Expand Up @@ -213,7 +209,4 @@ else
@$(call invoke_xcode,,clean)
endif

installsrc:
xcodebuild installsrc SRCROOT="$(SRCROOT)$(PATH_FROM_ROOT)"

force: ;
11 changes: 0 additions & 11 deletions Source/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ifeq ($(MAKECMDGOALS),installsrc)
USE_WORKSPACE = NO
endif

ifneq ($(USE_WORKSPACE),NO)

include ../Makefile.shared
Expand All @@ -17,9 +13,6 @@ ifneq (,$(SDKROOT))
ifneq (,$(findstring macosx,$(call TO_LOWER,$(notdir $(SDKROOT)))))
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
ifeq ($(MAKECMDGOALS),installsrc)
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
else
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
Expand Down Expand Up @@ -59,8 +52,4 @@ analyze:
clean:
@$(build_target_for_each_module)

installsrc:
@$(build_target_for_each_module)
cp -R ../Source/cmake $(SRCROOT)/Source/

endif # USE_WORKSPACE
3 changes: 0 additions & 3 deletions Source/ThirdParty/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,3 @@ analyze:

clean:
@$(build_target_for_each_module)

installsrc:
@$(build_target_for_each_module)
2 changes: 0 additions & 2 deletions Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ OTHER_LDFLAGS = $(inherited) -fvisibility=default;

GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(inherited) ABSL_ALLOCATOR_NOTHROW WEBRTC_WEBKIT_BUILD;

EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = $(inherited) "$(PROJECT_DIR)/Source/webrtc/examples" "$(PROJECT_DIR)/Source/third_party/boringssl/src/util";

LLVM_LTO = $(WK_USER_LTO_MODE_$(WK_LTO_MODE));

WK_USER_LTO_MODE_full = YES;
Expand Down
3 changes: 0 additions & 3 deletions Source/ThirdParty/libwebrtc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ ifneq (,$(SDKROOT))
ifneq (,$(findstring watch,$(call TO_LOWER,$(notdir $(SDKROOT)))))
XCODE_TARGET = -target boringssl
endif
ifeq ($(MAKECMDGOALS),installsrc)
XCODE_TARGET =
endif
endif

include ../Makefile.shared
7 changes: 0 additions & 7 deletions Source/WebCore/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
include ../Makefile.shared

PDFJS_SRCROOT = $(SRCROOT)$(PATH_FROM_ROOT)/../ThirdParty/pdfjs
$(PDFJS_SRCROOT):
mkdir -p $@
cp -R ../ThirdParty/pdfjs/ $(PDFJS_SRCROOT)

installsrc: $(PDFJS_SRCROOT)
12 changes: 0 additions & 12 deletions Tools/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ifeq ($(MAKECMDGOALS),installsrc)
USE_WORKSPACE = NO
endif

ifneq ($(USE_WORKSPACE),NO)

include ../Makefile.shared
Expand Down Expand Up @@ -62,12 +58,4 @@ analyze:
clean:
@$(build_target_for_each_module)

installsrc:
ifeq ($(FORCE_TOOL_INSTALL),YES)
@$(build_target_for_each_module)
ditto TestRunnerShared "$(SRCROOT)/Tools/TestRunnerShared"
else
@true
endif

endif # USE_WORKSPACE
2 changes: 0 additions & 2 deletions Tools/WebKitTestRunner/Configurations/Base.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,3 @@ HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_TEST_SUP
HEADER_SEARCH_PATHS_cocoatouch = $(SRCROOT)/../../Source/WebKit/Platform/spi/ios $(SRCROOT)/../../Source/WebKit/Platform/spi/watchos $(SRCROOT)/../../Source/WebKit/UIProcess/ios;

LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_INSTALL_PATH) $(inherited);

EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = $(inherited) "$(PROJECT_DIR)/gtk";

0 comments on commit 819018b

Please sign in to comment.