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

Changeset 281725 in webkit


Ignore:
Timestamp:
Aug 27, 2021, 2:50:04 PM (5 years ago)
Author:
Russell Epstein
Message:

.:
Land Windows build fixes from safari-612.1.29.14-branch.
​https://bugs.webkit.org/show_bug.cgi?id=229627

Reviewed by Per Arne Vollan.

  • Source/Makefile:
  • Source/cmake/WinTools.make:

Source/JavaScriptCore:
Land Windows build fixes from safari-612.1.29.14-branch.
​https://bugs.webkit.org/show_bug.cgi?id=229627.

Reviewed by Per Arne Vollan.

Source/WebCore:
Land Windows build fixes from safari-612.1.29.14-branch.
​https://bugs.webkit.org/show_bug.cgi?id=229627.

Reviewed by Per Arne Vollan.

  • WebCore.vcxproj/WebCore.proj:

Source/WebInspectorUI:
Land Windows build fixes from safari-612.1.29.14-branch.
​https://bugs.webkit.org/show_bug.cgi?id=229627

Reviewed by Per Arne Vollan.

  • WebInspectorUI.vcxproj/WebInspectorUI.make:
  • WebInspectorUI.vcxproj/WebInspectorUI.proj:

Source/WebKitLegacy:
Land Windows build fixes from safari-612.1.29.14-branch.
​https://bugs.webkit.org/show_bug.cgi?id=229627.

Reviewed by Per Arne Vollan.

  • WebKitLegacy.vcxproj/WebKitLegacy.proj:

Source/WTF:
Land Windows build fixes from safari-612.1.29.14-branch
​https://bugs.webkit.org/show_bug.cgi?id=229627

Reviewed by Per Arne Vollan.

  • WTF.vcxproj/WTF.proj:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r281708 r281725  
     12021-08-27  Russell Epstein  <repstein@apple.com>
     2
     3        Land Windows build fixes from safari-612.1.29.14-branch.
     4        https://bugs.webkit.org/show_bug.cgi?id=229627
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        * Source/Makefile:
     9        * Source/cmake/WinTools.make:
     10
    1112021-08-27  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    212

  • trunk/Source/JavaScriptCore/ChangeLog

    r281720 r281725  
     12021-08-27  Russell Epstein  <repstein@apple.com>
     2
     3        Land Windows build fixes from safari-612.1.29.14-branch.
     4        https://bugs.webkit.org/show_bug.cgi?id=229627.
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        * JavaScriptCore.vcxproj/JavaScriptCore.proj:
     9
    1102021-08-27  Mark Lam  <mark.lam@apple.com>
    211

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj

    r254681 r281725  
    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>

  • trunk/Source/Makefile

    r272929 r281725  
    5151installsrc:
    5252        @$(build_target_for_each_module)
     53        cp -R ../Source/cmake $(SRCROOT)/Source/

  • trunk/Source/WTF/ChangeLog

    r281701 r281725  
     12021-08-27  Russell Epstein  <repstein@apple.com>
     2
     3        Land Windows build fixes from safari-612.1.29.14-branch
     4        https://bugs.webkit.org/show_bug.cgi?id=229627
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        * WTF.vcxproj/WTF.proj:
     9
    1102021-08-27  Antti Koivisto  <antti@apple.com>
    211

  • trunk/Source/WTF/WTF.vcxproj/WTF.proj

    r254681 r281725  
    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

  • trunk/Source/WebCore/ChangeLog

    r281724 r281725  
     12021-08-27  Russell Epstein  <repstein@apple.com>
     2
     3        Land Windows build fixes from safari-612.1.29.14-branch.
     4        https://bugs.webkit.org/show_bug.cgi?id=229627.
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        * WebCore.vcxproj/WebCore.proj:
     9
    1102021-08-27  Simon Fraser  <simon.fraser@apple.com>
    211

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj

    r254681 r281725  
    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 

  • trunk/Source/WebInspectorUI/ChangeLog

    r281663 r281725  
     12021-08-27  Russell Epstein  <repstein@apple.com>
     2
     3        Land Windows build fixes from safari-612.1.29.14-branch.
     4        https://bugs.webkit.org/show_bug.cgi?id=229627
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        * WebInspectorUI.vcxproj/WebInspectorUI.make:
     9        * WebInspectorUI.vcxproj/WebInspectorUI.proj:
     10
    1112021-08-26  Patrick Angle  <pangle@apple.com>
    212

  • trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make

    r280574 r281725  
    1010        if errorlevel 1 exit 1
    1111
    12         @xcopy /y /e "%JAVASCRIPTCORE_PRIVATE_HEADERS_DIR%\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
    13         if errorlevel 1 exit 1
    14 
    1512        if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
    1613

  • trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj

    r205192 r281725  
    6666      <Output TaskParameter="Include" ItemName="Bin64Resources" />
    6767    </CreateItem>
     68    <CreateItem Include="$(WebKit_Libraries)\include\private\JavaScriptCore\inspector\InspectorBackendCommands.js">
     69      <Output TaskParameter="Include" ItemName="InspectorBackendCommandsFile" />
     70    </CreateItem>
    6871
    6972    <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
    7073    <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
     74
     75    <Message Text="Copying @(InspectorBackendCommandsFile) to $(DSTROOT)" />
     76    <Copy SourceFiles="@(InspectorBackendCommandsFile)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\WebInspectorUI\Protocol" />
     77    <Copy SourceFiles="@(InspectorBackendCommandsFile)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\WebInspectorUI\Protocol" />
    7178  </Target>
    7279

  • trunk/Source/WebKitLegacy/ChangeLog

    r280758 r281725  
     12021-08-27  Russell Epstein  <repstein@apple.com>
     2
     3        Land Windows build fixes from safari-612.1.29.14-branch.
     4        https://bugs.webkit.org/show_bug.cgi?id=229627.
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        * WebKitLegacy.vcxproj/WebKitLegacy.proj:
     9
    1102021-08-07  Myles C. Maxfield  <mmaxfield@apple.com>
    211

  • trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj

    r254681 r281725  
    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 

  • trunk/Source/cmake/WinTools.make

    r195498 r281725  
    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.