Changeset 220205 in webkit

Timestamp:

Aug 3, 2017 7:47:48 AM (7 years ago)

Author:

pvollan@apple.com

Message:

[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:

Location:

trunk/Source/WebKitLegacy

Files:

• ChangeLog (modified) (1 diff)
• WebKitLegacy.vcxproj/WebKitLegacy.proj (modified) (5 diffs)

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+2017-08-03  Per Arne Vollan  <pvollan@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_hanson@apple.com>
 

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

@@ -48 +48 @@
     <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>
 
@@ -66 +66 @@
 
     <!-- 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>
@@ -93 +93 @@
       <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>
@@ -105 +105 @@
       <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)" />
@@ -118 +118 @@
     <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>