Changeset 208275 in webkit


Ignore:
Timestamp:
Nov 2, 2016 3:59:48 AM (7 years ago)
Author:
pvollan@apple.com
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/JavaScriptCore:

Source/WebKit:

  • WebKit.vcxproj/WebKit.proj:

Source/WTF:

  • WTF.vcxproj/WTF.proj:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r208256 r208275  
     12016-11-02  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] Copy build results to AAS 'Program Files' folder.
     4        https://bugs.webkit.org/show_bug.cgi?id=164273
     5
     6        Reviewed by Brent Fulgham.
     7
     8        The preferred location for the binaries is the AAS 'Program Files' folder.
     9
     10        * JavaScriptCore.vcxproj/JavaScriptCore.proj:
     11
    1122016-11-01  Ryosuke Niwa  <rniwa@webkit.org>
    213

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj

    r207794 r208275  
    8181      <Output TaskParameter="Include" ItemName="Bin64Files" />
    8282    </CreateItem>
    83     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
     83    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\JavaScriptCore$(DebugSuffix).pdb">
    8484      <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
    8585    </CreateItem>
    86     <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
     86    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\JavaScriptCore$(DebugSuffix).pdb">
    8787      <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
    8888    </CreateItem>
    … …  
    117117    <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
    118118    <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
    119     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
    120119    <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    121120    <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    122     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
     121    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    123122    <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
    124     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
    125123    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    126124    <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    127     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
     125    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    128126    <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
    129127  </Target>

  • trunk/Source/WTF/ChangeLog

    r208209 r208275  
     12016-11-02  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] Copy build results to AAS 'Program Files' folder.
     4        https://bugs.webkit.org/show_bug.cgi?id=164273
     5
     6        Reviewed by Brent Fulgham.
     7
     8        The preferred location for the binaries is the AAS 'Program Files' folder.
     9
     10        * WTF.vcxproj/WTF.proj:
     11
    1122016-10-29  Filip Pizlo  <fpizlo@apple.com>
    213

  • trunk/Source/WTF/WTF.vcxproj/WTF.proj

    r207794 r208275  
    7373      <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
    7474    </CreateItem>
    75     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
     75    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WTF$(DebugSuffix).pdb">
    7676       <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
    7777    </CreateItem>
    78     <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
     78    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WTF$(DebugSuffix).pdb">
    7979       <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
    8080    </CreateItem>
    … …  
    8989    <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
    9090    <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
    91     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
    9291    <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    93     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
    94     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
     92    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    9593    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    96     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
     94    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    9795  </Target>
    9896

  • trunk/Source/WebKit/ChangeLog

    r207831 r208275  
     12016-11-02  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] Copy build results to AAS 'Program Files' folder.
     4        https://bugs.webkit.org/show_bug.cgi?id=164273
     5
     6        Reviewed by Brent Fulgham.
     7
     8        The preferred location for the binaries is the AAS 'Program Files' folder.
     9
     10        * WebKit.vcxproj/WebKit.proj:
     11
    1122016-10-25  Konstantin Tokarev  <annulen@yandex.ru>
    213

  • trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj

    r207794 r208275  
    115115    <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
    116116    <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
    117     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
    118117    <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    119118    <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    120     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />
     119    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />
    121120    <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
    122     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
    123121    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    124122    <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    125     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
     123    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
    126124    <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
    127125  </Target>
Note: See TracChangeset for help on using the changeset viewer.