Changeset 220508 in webkit
- Timestamp:
- Aug 9, 2017 9:31:39 PM (7 years ago)
- Location:
- branches/safari-604-branch/Source/WebKitLegacy
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/safari-604-branch/Source/WebKitLegacy/ChangeLog
r220133 r220508 1 2017-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 1 18 2017-08-02 Matthew Hanson <matthew_hanson@apple.com> 2 19 -
branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj
r220129 r220508 48 48 <Message Text="Final output -> $(DSTROOT)" /> 49 49 <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" /> 50 <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit Legacy.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKitLegacy.resources" />50 <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" /> 51 51 </Target> 52 52 … … 66 66 67 67 <!-- Identify the files to copy over --> 68 <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKit Legacy\**\*.*">68 <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKit\**\*.*"> 69 69 <Output TaskParameter="Include" ItemName="IncFiles" /> 70 70 </CreateItem> … … 93 93 <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" /> 94 94 </CreateItem> 95 <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit Legacy.resources\**\*.*">95 <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*"> 96 96 <Output TaskParameter="Include" ItemName="Bin32Resources" /> 97 97 </CreateItem> 98 <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit Legacy.resources\**\*.*">98 <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*"> 99 99 <Output TaskParameter="Include" ItemName="Bin64Resources" /> 100 100 </CreateItem> … … 105 105 <Output TaskParameter="Include" ItemName="Lib64Files" /> 106 106 </CreateItem> 107 <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKit Legacy\DerivedSources\**\*.*">107 <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKit\DerivedSources\**\*.*"> 108 108 <Output TaskParameter="Include" ItemName="Derived32Sources" /> 109 109 </CreateItem> 110 <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKit Legacy\DerivedSources\**\*.*">110 <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKit\DerivedSources\**\*.*"> 111 111 <Output TaskParameter="Include" ItemName="Derived64Sources" /> 112 112 </CreateItem> 113 113 114 <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKit Legacy\%(RecursiveDir)%(Filename)%(Extension)')" />114 <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" /> 115 115 <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" /> 116 116 <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" /> … … 118 118 <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" /> 119 119 <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" /> 120 <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit Legacy.resources\%(RecursiveDir)%(Filename)%(Extension)')" />120 <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" /> 121 121 <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" /> 122 122 <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" /> 123 123 <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" /> 124 <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit Legacy.resources\%(RecursiveDir)%(Filename)%(Extension)')" />124 <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" /> 125 125 </Target> 126 126
Note: See TracChangeset
for help on using the changeset viewer.