⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 280597 in webkit


Ignore:
Timestamp:
Aug 3, 2021, 9:50:38 AM (5 years ago)
Author:
Russell Epstein
Message:

Speculative build fix. rdar://79147214.

Location:
branches/safari-612.1.15.4-branch/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-612.1.15.4-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj

    r254681 r280597  
    2929    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir> 
    3030    <OutputDirectory>$(DSTROOT)</OutputDirectory>
    31         <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
     31    <SourceSubdirectory>\Source\JavaScriptCore</SourceSubdirectory>
     32        <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
    3233  </PropertyGroup>
    3334 
    … …  
    7576      <Output TaskParameter="Include" ItemName="InspectorFiles" />
    7677    </CreateItem>
    77     <CreateItem Include="$(SRCROOT)\API\*.h">
     78    <CreateItem Include="$(SRCROOT)$(SourceSubdirectory)\API\*.h">
    7879      <Output TaskParameter="Include" ItemName="APIFiles" />
    7980    </CreateItem>

  • branches/safari-612.1.15.4-branch/Source/Makefile

    r272929 r280597  
     1SAFARITOOLS_MODULE =
    12WEBINSPECTORUI_MODULE =
    23
    … …  
    1112        endif
    1213else
     14        ifeq ($(MAKECMDGOALS),installsrc)
     15                SAFARITOOLS_MODULE = cmake
     16        endif
    1317        WEBINSPECTORUI_MODULE = WebInspectorUI
    1418endif
    … …  
    1822endif
    1923
    20 MODULES = bmalloc WTF JavaScriptCore ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
     24MODULES = $(SAFARITOOLS_MODULE) bmalloc WTF JavaScriptCore ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit $(SAFARITOOLS_MODULE)
    2125
    2226define build_target_for_each_module

  • branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj

    r254681 r280597  
    2929    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
    3030    <OutputDirectory>$(DSTROOT)</OutputDirectory>
    31         <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
     31    <SourceSubdirectory>\Source\WTF</SourceSubdirectory>
     32        <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
    3233  </PropertyGroup>
    3334

  • branches/safari-612.1.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj

    r254681 r280597  
    2929    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir> 
    3030    <OutputDirectory>$(DSTROOT)</OutputDirectory>
    31         <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))/PAL</CMakeCommandCommon>
     31    <SourceSubdirectory>\Source\WebCore</SourceSubdirectory>
     32        <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))/PAL</CMakeCommandCommon>
    3233  </PropertyGroup>
    3334 

  • branches/safari-612.1.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj

    r254681 r280597  
    2929    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir> 
    3030    <OutputDirectory>$(DSTROOT)</OutputDirectory>
    31         <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
     31    <SourceSubdirectory>\Source\WebKitLegacy</SourceSubdirectory>
     32        <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
    3233  </PropertyGroup>
    3334 

  • branches/safari-612.1.15.4-branch/Source/cmake/WinTools.make

    r195498 r280597  
    11install:
    2     xcopy "$(SRCROOT)\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
    3     xcopy "$(SRCROOT)\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
    4     xcopy "$(SRCROOT)\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
     2    xcopy "$(SRCROOT)\Source\cmake\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
     3    xcopy "$(SRCROOT)\Source\cmake\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
     4    xcopy "$(SRCROOT)\Source\cmake\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
Note: See TracChangeset for help on using the changeset viewer.