Title: [220508] branches/safari-604-branch/Source/WebKitLegacy
- Revision
- 220508
- Author
- jmarc...@apple.com
- Date
- 2017-08-09 21:31:39 -0700 (Wed, 09 Aug 2017)
Log Message
Cherry-pick r220205. rdar://problem/33810980
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebKitLegacy/ChangeLog (220507 => 220508)
--- branches/safari-604-branch/Source/WebKitLegacy/ChangeLog 2017-08-10 04:19:34 UTC (rev 220507)
+++ branches/safari-604-branch/Source/WebKitLegacy/ChangeLog 2017-08-10 04:31:39 UTC (rev 220508)
@@ -1,3 +1,20 @@
+2017-08-09 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r220205. rdar://problem/33810980
+
+ 2017-08-03 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] WebKit COM header file is not placed in the correct location.
+ https://bugs.webkit.org/show_bug.cgi?id=175101
+
+ Reviewed by Brent Fulgham.
+
+ After the transition to WebKitLegacy, the generated WebKit header files should still
+ be placed in the WebKit folder, so WebKit clients will find the header files in the
+ same place.
+
+ * WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
2017-08-02 Matthew Hanson <matthew_han...@apple.com>
Cherry-pick r219602. rdar://problem/33537767
Modified: branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (220507 => 220508)
--- branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2017-08-10 04:19:34 UTC (rev 220507)
+++ branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2017-08-10 04:31:39 UTC (rev 220508)
@@ -47,7 +47,7 @@
<Message Text="Build output -> $(OBJROOT)" />
<Message Text="Final output -> $(DSTROOT)" />
<MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
- <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKitLegacy.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKitLegacy.resources" />
+ <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
</Target>
<!-- Build WebKitLegacy Software -->
@@ -65,7 +65,7 @@
<Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
<!-- Identify the files to copy over -->
- <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKitLegacy\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKit\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
@@ -92,10 +92,10 @@
<CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
<Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKitLegacy.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin32Resources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKitLegacy.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin64Resources" />
</CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
@@ -104,24 +104,24 @@
<CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
<Output TaskParameter="Include" ItemName="Lib64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKitLegacy\DerivedSources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKit\DerivedSources\**\*.*">
<Output TaskParameter="Include" ItemName="Derived32Sources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKitLegacy\DerivedSources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKit\DerivedSources\**\*.*">
<Output TaskParameter="Include" ItemName="Derived64Sources" />
</CreateItem>
- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKitLegacy\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
<Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
<Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
- <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKitLegacy.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
<Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
<Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
- <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKitLegacy.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
