Changeset 220508 in webkit


Ignore:
Timestamp:
Aug 9, 2017 9:31:39 PM (7 years ago)
Author:
jmarcell@apple.com
Message:

Cherry-pick r220205. rdar://problem/33810980

Location:
branches/safari-604-branch/Source/WebKitLegacy
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/safari-604-branch/Source/WebKitLegacy/ChangeLog

    r220133 r220508  
     12017-08-09  Jason Marcell  <jmarcell@apple.com>
     2
     3        Cherry-pick r220205. rdar://problem/33810980
     4
     5    2017-08-03  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] WebKit COM header file is not placed in the correct location.
     8            https://bugs.webkit.org/show_bug.cgi?id=175101
     9
     10            Reviewed by Brent Fulgham.
     11
     12            After the transition to WebKitLegacy, the generated WebKit header files should still
     13            be placed in the WebKit folder, so WebKit clients will find the header files in the
     14            same place.
     15
     16            * WebKitLegacy.vcxproj/WebKitLegacy.proj:
     17
    1182017-08-02  Matthew Hanson  <matthew_hanson@apple.com>
    219
  • branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj

    r220129 r220508  
    4848    <Message Text="Final output -> $(DSTROOT)" />
    4949    <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
    50     <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKitLegacy.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKitLegacy.resources" />
     50    <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
    5151  </Target>
    5252
     
    6666
    6767    <!-- Identify the files to copy over -->
    68     <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKitLegacy\**\*.*">
     68    <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKit\**\*.*">
    6969      <Output TaskParameter="Include" ItemName="IncFiles" />
    7070    </CreateItem>
     
    9393      <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
    9494    </CreateItem>
    95     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKitLegacy.resources\**\*.*">
     95    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*">
    9696      <Output TaskParameter="Include" ItemName="Bin32Resources" />
    9797    </CreateItem>
    98     <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKitLegacy.resources\**\*.*">
     98    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*">
    9999      <Output TaskParameter="Include" ItemName="Bin64Resources" />
    100100    </CreateItem>
     
    105105      <Output TaskParameter="Include" ItemName="Lib64Files" />
    106106    </CreateItem>
    107     <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKitLegacy\DerivedSources\**\*.*">
     107    <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKit\DerivedSources\**\*.*">
    108108      <Output TaskParameter="Include" ItemName="Derived32Sources" />
    109109    </CreateItem>
    110     <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKitLegacy\DerivedSources\**\*.*">
     110    <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKit\DerivedSources\**\*.*">
    111111      <Output TaskParameter="Include" ItemName="Derived64Sources" />
    112112    </CreateItem>
    113113
    114     <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKitLegacy\%(RecursiveDir)%(Filename)%(Extension)')" />
     114    <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
    115115    <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
    116116    <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
     
    118118    <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    119119    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    120     <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKitLegacy.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
     120    <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
    121121    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    122122    <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    123123    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    124     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKitLegacy.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
     124    <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
    125125  </Target>
    126126
Note: See TracChangeset for help on using the changeset viewer.