Title: [176896] trunk/Source
- Revision
- 176896
- Author
- [email protected]
- Date
- 2014-12-05 17:09:33 -0800 (Fri, 05 Dec 2014)
Log Message
[Win] proj files copying over too many resources..
https://bugs.webkit.org/show_bug.cgi?id=139315.
<rdar://problem/19148278>
Reviewed by Brent Fulgham.
* WebCore.vcxproj/WebCore.proj: Don't copy over bin32 build output.
* WebKit.vcxproj/WebKit.proj: Only copy resource folders and WebKit.dll.
* _javascript_Core.vcxproj/_javascript_Core.proj: Only copy resource folders and _javascript_Core.dll.
* WTF.vcxproj/WTF.proj: Only copy WTF.dll.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (176895 => 176896)
--- trunk/Source/_javascript_Core/ChangeLog 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-12-06 01:09:33 UTC (rev 176896)
@@ -1,3 +1,13 @@
+2014-12-05 Roger Fong <[email protected]>
+
+ [Win] proj files copying over too many resources..
+ https://bugs.webkit.org/show_bug.cgi?id=139315.
+ <rdar://problem/19148278>
+
+ Reviewed by Brent Fulgham.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj: Only copy resource folders and _javascript_Core.dll.
+
2014-12-05 Juergen Ributzka <[email protected]>
[JSC][FTL] Add the data layout to the module and fix the pass order.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (176895 => 176896)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-12-06 01:09:33 UTC (rev 176896)
@@ -83,6 +83,18 @@
<CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
<Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\_javascript_Core.dll">
+ <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\_javascript_Core.dll">
+ <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
+ <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">
+ <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />
+ </CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\bin32\_javascript_Core.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin32Resources" />
</CreateItem>
@@ -106,11 +118,13 @@
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
- <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
+ <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
+ <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
<Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
<Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\_javascript_Core.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
- <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
+ <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
+ <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
<Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
<Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\_javascript_Core.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\_javascript_Core\%(RecursiveDir)%(Filename)%(Extension)')" />
Modified: trunk/Source/WTF/ChangeLog (176895 => 176896)
--- trunk/Source/WTF/ChangeLog 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/WTF/ChangeLog 2014-12-06 01:09:33 UTC (rev 176896)
@@ -1,3 +1,13 @@
+2014-12-05 Roger Fong <[email protected]>
+
+ [Win] proj files copying over too many resources..
+ https://bugs.webkit.org/show_bug.cgi?id=139315.
+ <rdar://problem/19148278>
+
+ Reviewed by Brent Fulgham.
+
+ * WTF.vcxproj/WTF.proj: Only copy WTF.dll.
+
2014-12-05 Andreas Kling <[email protected]>
PassRef should deref on destruction if pointee was not moved.
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (176895 => 176896)
--- trunk/Source/WTF/WTF.vcxproj/WTF.proj 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj 2014-12-06 01:09:33 UTC (rev 176896)
@@ -68,6 +68,12 @@
<CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF.dll">
+ <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF.dll">
+ <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
+ </CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
<Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</CreateItem>
@@ -85,10 +91,10 @@
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
- <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
+ <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
<Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
<Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
- <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
+ <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
<Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
</Target>
Modified: trunk/Source/WebCore/ChangeLog (176895 => 176896)
--- trunk/Source/WebCore/ChangeLog 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/WebCore/ChangeLog 2014-12-06 01:09:33 UTC (rev 176896)
@@ -1,3 +1,13 @@
+2014-12-05 Roger Fong <[email protected]>
+
+ [Win] proj files copying over too many resources..
+ https://bugs.webkit.org/show_bug.cgi?id=139315.
+ <rdar://problem/19148278>
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.proj: Don't copy over bin32 build output.
+
2014-12-05 Timothy Horton <[email protected]>
Use the system string for telephone number menu
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (176895 => 176896)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2014-12-06 01:09:33 UTC (rev 176896)
@@ -106,11 +106,9 @@
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
- <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
<Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
<Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
- <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
<Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
<Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />
Modified: trunk/Source/WebKit/ChangeLog (176895 => 176896)
--- trunk/Source/WebKit/ChangeLog 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/WebKit/ChangeLog 2014-12-06 01:09:33 UTC (rev 176896)
@@ -1,3 +1,13 @@
+2014-12-05 Roger Fong <[email protected]>
+
+ [Win] proj files copying over too many resources..
+ https://bugs.webkit.org/show_bug.cgi?id=139315.
+ <rdar://problem/19148278>
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/WebKit.proj: Only copy resource folders and WebKit.dll.
+
2014-12-02 Sam Weinig <[email protected]>
Remove empty directories
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj (176895 => 176896)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj 2014-12-06 01:07:12 UTC (rev 176895)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj 2014-12-06 01:09:33 UTC (rev 176896)
@@ -77,6 +77,18 @@
<CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.dll">
+ <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.dll">
+ <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
+ <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />
+ </CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">
+ <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />
+ </CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
<Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</CreateItem>
@@ -106,11 +118,13 @@
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
- <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
+ <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
+ <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
<Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
<Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
- <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
+ <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
+ <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
<Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
<Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
