git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7b50c6d)
[Win] proj files copying over too many resources..
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Dec 2014 01:09:33 +0000 (01:09 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Dec 2014 01:09:33 +0000 (01:09 +0000)
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.
* JavaScriptCore.vcxproj/JavaScriptCore.proj: Only copy resource folders and JavaScriptCore.dll.
* WTF.vcxproj/WTF.proj: Only copy WTF.dll.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176896 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog patch | blob | history
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj patch | blob | history
Source/WTF/ChangeLog patch | blob | history
Source/WTF/WTF.vcxproj/WTF.proj patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/WebCore.vcxproj/WebCore.proj patch | blob | history
Source/WebKit/ChangeLog patch | blob | history
Source/WebKit/WebKit.vcxproj/WebKit.proj patch | blob | history

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 3b35041..c7fbc05 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-05  Roger Fong  <roger_fong@apple.com>
+
+        [Win] proj files copying over too many resources..
+        https://bugs.webkit.org/show_bug.cgi?id=139315.
+        <rdar://problem/19148278>
+
+        Reviewed by Brent Fulgham.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.proj: Only copy resource folders and JavaScriptCore.dll.
+
 2014-12-05  Juergen Ributzka  <juergen@apple.com>
 
         [JSC][FTL] Add the data layout to the module and fix the pass order.
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
index d985d59..677e427 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
@@ -83,6 +83,18 @@
     <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">\r
       <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />\r
     </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore.dll">\r
+      <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\JavaScriptCore.dll">\r
+      <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">\r
+      <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">\r
+      <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />\r
+    </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore.resources\**\*.*">\r
       <Output TaskParameter="Include" ItemName="Bin32Resources" />\r
     </CreateItem>\r
@@ -106,11 +118,13 @@
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
     <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 436de32..79b6a01 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-05  Roger Fong  <roger_fong@apple.com>
+
+        [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  <akling@apple.com>
 
         PassRef should deref on destruction if pointee was not moved.
diff --git a/Source/WTF/WTF.vcxproj/WTF.proj b/Source/WTF/WTF.vcxproj/WTF.proj
index f2c14f1..e96a708 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTF.proj
+++ b/Source/WTF/WTF.vcxproj/WTF.proj
@@ -68,6 +68,12 @@
     <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
        <Output TaskParameter="Include" ItemName="Bin64Files" />\r
     </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF.dll">\r
+      <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF.dll">\r
+      <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
+    </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">\r
        <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />\r
     </CreateItem>\r
@@ -85,10 +91,10 @@
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
   </Target>\r
 \r
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 41ec831..0e5a410 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-05  Roger Fong  <roger_fong@apple.com>
+
+        [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  <timothy_horton@apple.com>
 
         Use the system string for telephone number menu
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.proj b/Source/WebCore/WebCore.vcxproj/WebCore.proj
index 28910a1..eea3f6c 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCore.proj
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.proj
@@ -106,11 +106,9 @@
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
     <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index d2b6a72..ca1d851 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-05  Roger Fong  <roger_fong@apple.com>
+
+        [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  <sam@webkit.org>
 
         Remove empty directories
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.proj b/Source/WebKit/WebKit.vcxproj/WebKit.proj
index b9e10d7..30b3056 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit.proj
+++ b/Source/WebKit/WebKit.vcxproj/WebKit.proj
@@ -77,6 +77,18 @@
     <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
       <Output TaskParameter="Include" ItemName="Bin64Files" />\r
     </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.dll">\r
+      <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.dll">\r
+      <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">\r
+      <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">\r
+      <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />\r
+    </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">\r
       <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />\r
     </CreateItem>\r
@@ -106,11 +118,13 @@
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
     <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />\r
Mirror of the WebKit open source project from svn.webkit.org.