Changeset 230858 in webkit


Ignore:
Timestamp:
Apr 20, 2018 3:14:35 PM (6 years ago)
Author:
jer.noble@apple.com
Message:

Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
https://bugs.webkit.org/show_bug.cgi?id=184762

Reviewed by Dan Bernstein.

Source/bmalloc:

  • Configurations/Base.xcconfig:

Source/JavaScriptCore:

  • Configurations/Base.xcconfig:
  • JavaScriptCore.xcodeproj/project.pbxproj:

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig:

Source/WebCore:

  • Configurations/WebCore.xcconfig:
  • WebCore.xcodeproj/project.pbxproj:

Source/WebCore/PAL:

  • Configurations/CopyPALHeaders.xcconfig:
  • Configurations/PAL.xcconfig:

Source/WebKit:

  • Configurations/BaseTarget.xcconfig:

Source/WebKitLegacy/mac:

  • Configurations/WebKitLegacy.xcconfig:

Source/WTF:

  • Configurations/Base.xcconfig:
Location:
trunk/Source
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r230856 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/Base.xcconfig:
     9        * JavaScriptCore.xcodeproj/project.pbxproj:
     10
    1112018-04-20  Daniel Bates  <dabates@apple.com>
    212
  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r230824 r230858  
    9393WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
    9494
    95 HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include" $(HEADER_SEARCH_PATHS);
     95HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
    9696
    9797TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r230813 r230858  
    99329932                        runOnlyForDeploymentPostprocessing = 0;
    99339933                        shellPath = /bin/sh;
    9934                         shellScript = "set -e\n\ncd $SRCROOT\n\nif [ \"${DEPLOYMENT_LOCATION}\" == \"YES\" ]; then\n    BUILD_SCRIPTS_DIR=\"${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts\"\nelse\n    BUILD_SCRIPTS_DIR=\"${BUILT_PRODUCTS_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts\"\nfi\n\nUnifiedSourceCppFileCount=145\nUnifiedSourceMmFileCount=5\n\n/usr/bin/env ruby \"${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb\" \"--derived-sources-path\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\" \"--source-tree-path\" \"${SRCROOT}\" \"--max-cpp-bundle-count\" \"${UnifiedSourceCppFileCount}\" \"--max-obj-c-bundle-count\" \"${UnifiedSourceMmFileCount}\" \"Sources.txt\" \"SourcesCocoa.txt\" > /dev/null\n";
     9934                        shellScript = "set -e\n\ncd $SRCROOT\n\nif [ \"${DEPLOYMENT_LOCATION}\" == \"YES\" ]; then\n    BUILD_SCRIPTS_DIR=\"${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts\"\nelse\n    BUILD_SCRIPTS_DIR=\"${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts\"\nfi\n\nUnifiedSourceCppFileCount=145\nUnifiedSourceMmFileCount=5\n\n/usr/bin/env ruby \"${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb\" \"--derived-sources-path\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\" \"--source-tree-path\" \"${SRCROOT}\" \"--max-cpp-bundle-count\" \"${UnifiedSourceCppFileCount}\" \"--max-obj-c-bundle-count\" \"${UnifiedSourceMmFileCount}\" \"Sources.txt\" \"SourcesCocoa.txt\" > /dev/null\n";
    99359935                };
    99369936                5D29D8BE0E9860B400C3D2D0 /* Check For Weak VTables and Externals */ = {
  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r230824 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/Base.xcconfig:
     9
    1102018-04-19  David Kilzer  <ddkilzer@apple.com>
    211
  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r230824 r230858  
    7474WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
    7575
    76 ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
    77 ANGLE_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR);
     76ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
     77ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
     78ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
    7879
    7980WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
  • trunk/Source/WTF/ChangeLog

    r230856 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/Base.xcconfig:
     9
    1102018-04-20  Daniel Bates  <dabates@apple.com>
    211
  • trunk/Source/WTF/Configurations/Base.xcconfig

    r230824 r230858  
    137137WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
    138138
    139 WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
    140 WTF_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
     139WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
     140WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
     141WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
    141142
    142143WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
  • trunk/Source/WebCore/ChangeLog

    r230856 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/WebCore.xcconfig:
     9        * WebCore.xcodeproj/project.pbxproj:
     10
    1112018-04-20  Daniel Bates  <dabates@apple.com>
    212
  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r230807 r230858  
    4949LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc/sdk/objc/Framework/Headers $(SDKROOT)/usr/local/include/webrtc/sdk/objc/Framework/Headers;
    5050
    51 HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
     51HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
    5252INFOPLIST_FILE = Info.plist;
    5353INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
  • trunk/Source/WebCore/PAL/ChangeLog

    r230824 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/CopyPALHeaders.xcconfig:
     9        * Configurations/PAL.xcconfig:
     10
    1112018-04-19  David Kilzer  <ddkilzer@apple.com>
    212
  • trunk/Source/WebCore/PAL/Configurations/CopyPALHeaders.xcconfig

    r229883 r230858  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 PRIVATE_HEADERS_FOLDER_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH)usr/local/include/pal;
     24PAL_INSTALL_PATH_PREFIX = $(PAL_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
     25PAL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(PAL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
     26PAL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR);
     27
     28PRIVATE_HEADERS_FOLDER_PATH = $(PAL_INSTALL_PATH_PREFIX)/usr/local/include/pal;
    2529INSTALLHDRS_SCRIPT_PHASE = YES;
  • trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig

    r229883 r230858  
    4343OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    4444
    45 HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include" $(inherited);
     45HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
    4646INSTALL_PATH = /usr/local/lib;
    4747INSTALLHDRS_COPY_PHASE = YES;
  • trunk/Source/WebKit/ChangeLog

    r230857 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/BaseTarget.xcconfig:
     9
    1102018-04-20  Youenn Fablet  <youenn@apple.com>
    211
  • trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

    r229991 r230858  
    4141LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
    4242
    43 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
     43HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
    4444
    4545OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r230843 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/WebKitLegacy.xcconfig:
     9
    1102018-04-20  Youenn Fablet  <youenn@apple.com>
    211
  • trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

    r229942 r230858  
    5757LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
    5858
    59 HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
     59HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
    6060INFOPLIST_FILE = mac/Info.plist;
    6161INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
  • trunk/Source/bmalloc/ChangeLog

    r230856 r230858  
     12018-04-18  Jer Noble  <jer.noble@apple.com>
     2
     3        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
     4        https://bugs.webkit.org/show_bug.cgi?id=184762
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/Base.xcconfig:
     9
    1102018-04-20  Daniel Bates  <dabates@apple.com>
    211
  • trunk/Source/bmalloc/Configurations/Base.xcconfig

    r230824 r230858  
    131131WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
    132132
    133 BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
    134 BMALLOC_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
     133BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
     134BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
     135BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
    135136
    136137WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
Note: See TracChangeset for help on using the changeset viewer.