Title: [208275] trunk/Source
Revision
208275
Author
pvol...@apple.com
Date
2016-11-02 03:59:48 -0700 (Wed, 02 Nov 2016)

Log Message

[Win] Copy build results to AAS 'Program Files' folder.
https://bugs.webkit.org/show_bug.cgi?id=164273

Reviewed by Brent Fulgham.

The preferred location for the binaries is the AAS 'Program Files' folder.

Source/_javascript_Core:

* _javascript_Core.vcxproj/_javascript_Core.proj:

Source/WebKit:

* WebKit.vcxproj/WebKit.proj:

Source/WTF:

* WTF.vcxproj/WTF.proj:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (208274 => 208275)


--- trunk/Source/_javascript_Core/ChangeLog	2016-11-02 10:47:44 UTC (rev 208274)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-11-02 10:59:48 UTC (rev 208275)
@@ -1,3 +1,14 @@
+2016-11-02  Per Arne Vollan  <pvol...@apple.com>
+
+        [Win] Copy build results to AAS 'Program Files' folder.
+        https://bugs.webkit.org/show_bug.cgi?id=164273
+
+        Reviewed by Brent Fulgham.
+
+        The preferred location for the binaries is the AAS 'Program Files' folder.
+
+        * _javascript_Core.vcxproj/_javascript_Core.proj:
+
 2016-11-01  Ryosuke Niwa  <rn...@webkit.org>
 
         Remove CUSTOM_ELEMENTS build flag

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (208274 => 208275)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2016-11-02 10:47:44 UTC (rev 208274)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2016-11-02 10:59:48 UTC (rev 208275)
@@ -80,10 +80,10 @@
     <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
       <Output TaskParameter="Include" ItemName="Bin64Files" />
     </CreateItem>
-    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\_javascript_Core$(DebugSuffix).pdb">
       <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
     </CreateItem>
-    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\_javascript_Core$(DebugSuffix).pdb">
       <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
     </CreateItem>
     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\_javascript_Core$(DebugSuffix).dll">
@@ -116,15 +116,13 @@
     <Copy SourceFiles="@(APIFiles)" DestinationFiles="@(APIFiles->'$(DSTROOT)\AppleInternal\include\_javascript_Core\%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
     <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
     <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
-    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
+    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
     <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\_javascript_Core.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
     <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
     <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
-    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
+    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\_javascript_Core.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 

Modified: trunk/Source/WTF/ChangeLog (208274 => 208275)


--- trunk/Source/WTF/ChangeLog	2016-11-02 10:47:44 UTC (rev 208274)
+++ trunk/Source/WTF/ChangeLog	2016-11-02 10:59:48 UTC (rev 208275)
@@ -1,3 +1,14 @@
+2016-11-02  Per Arne Vollan  <pvol...@apple.com>
+
+        [Win] Copy build results to AAS 'Program Files' folder.
+        https://bugs.webkit.org/show_bug.cgi?id=164273
+
+        Reviewed by Brent Fulgham.
+
+        The preferred location for the binaries is the AAS 'Program Files' folder.
+
+        * WTF.vcxproj/WTF.proj:
+
 2016-10-29  Filip Pizlo  <fpi...@apple.com>
 
         JSC should support SharedArrayBuffer

Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (208274 => 208275)


--- trunk/Source/WTF/WTF.vcxproj/WTF.proj	2016-11-02 10:47:44 UTC (rev 208274)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj	2016-11-02 10:59:48 UTC (rev 208275)
@@ -72,10 +72,10 @@
     <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WTF$(DebugSuffix).dll">
       <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
     </CreateItem>
-    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WTF$(DebugSuffix).pdb">
        <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
     </CreateItem>
-    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WTF$(DebugSuffix).pdb">
        <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
     </CreateItem>
     <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
@@ -88,12 +88,10 @@
     <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\wtf\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
     <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
-    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
+    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
     <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
-    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
+    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
   </Target>
 
 </Project>

Modified: trunk/Source/WebKit/ChangeLog (208274 => 208275)


--- trunk/Source/WebKit/ChangeLog	2016-11-02 10:47:44 UTC (rev 208274)
+++ trunk/Source/WebKit/ChangeLog	2016-11-02 10:59:48 UTC (rev 208275)
@@ -1,3 +1,14 @@
+2016-11-02  Per Arne Vollan  <pvol...@apple.com>
+
+        [Win] Copy build results to AAS 'Program Files' folder.
+        https://bugs.webkit.org/show_bug.cgi?id=164273
+
+        Reviewed by Brent Fulgham.
+
+        The preferred location for the binaries is the AAS 'Program Files' folder.
+
+        * WebKit.vcxproj/WebKit.proj:
+
 2016-10-25  Konstantin Tokarev  <annu...@yandex.ru>
 
         [cmake] Check if jscLib and WebKitGUID targets exist before using them

Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj (208274 => 208275)


--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj	2016-11-02 10:47:44 UTC (rev 208274)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj	2016-11-02 10:59:48 UTC (rev 208275)
@@ -114,15 +114,13 @@
     <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
     <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
     <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
-    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
+    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
     <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
     <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
     <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
-    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
+    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to