Diff
Modified: trunk/ChangeLog (190252 => 190253)
--- trunk/ChangeLog 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
@@ -1,5 +1,17 @@
2015-09-25 Alex Christensen <[email protected]>
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/WinTools.make: Added.
+ * Source/cmake/tools: Added.
+ * Source/cmake/tools/scripts: Copied from WebKitLibraries/win/tools/scripts.
+ * Source/cmake/tools/scripts/auto-version.pl: Copied from WebKitLibraries/win/tools/scripts/auto-version.pl.
+
+2015-09-25 Alex Christensen <[email protected]>
+
Prepare internal AppleWin build for CMake
https://bugs.webkit.org/show_bug.cgi?id=149570
Modified: trunk/Source/_javascript_Core/ChangeLog (190252 => 190253)
--- trunk/Source/_javascript_Core/ChangeLog 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
@@ -1,3 +1,12 @@
+2015-09-25 Alex Christensen <[email protected]>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
2015-09-24 Mark Lam <[email protected]>
Remove the use of "Immediate" in JIT function names.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (190252 => 190253)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2015-09-25 21:50:48 UTC (rev 190253)
@@ -3,19 +3,20 @@
<!-- normalize configuration case -->
<PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
- <CONFIG>Production</CONFIG>
+ <CONFIG>Release</CONFIG>
<DebugSuffix></DebugSuffix>
+ <DebugSuffixDefinition></DebugSuffixDefinition>
</PropertyGroup>
<PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
- <CONFIG>DebugSuffix</CONFIG>
+ <CONFIG>Debug</CONFIG>
<DebugSuffix>_debug</DebugSuffix>
+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</PropertyGroup>
<!-- Wrapper to build _javascript_Core for both win32 and x64. -->
<PropertyGroup>
<OFFICIAL_BUILD>1</OFFICIAL_BUILD>
<WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
<AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
<AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
<AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
@@ -27,23 +28,16 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)/_javascript_Core -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))/_javascript_Core</CMakeCommandCommon>
</PropertyGroup>
-
- <ItemGroup>
- <_javascript_Core Include="_javascript_Core.submit.sln">
- <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </_javascript_Core>
- <_javascript_Core Include="_javascript_Core.submit.sln">
- <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </_javascript_Core>
- </ItemGroup>
<!-- Prepare for build -->
<Target Name="PreBuild" BeforeTargets="Build">
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
<Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
<Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
- <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />
+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(ConfigurationBuildDir)\include\private;$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
<CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">
<Output TaskParameter="Include" ItemName="PrivateIncFiles" />
@@ -54,15 +48,16 @@
<Message Text="Final output -> $(DSTROOT)" />
<MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
<MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\_javascript_Core.resources;$(DSTROOT)\$(ProgramFilesAAS64)\_javascript_Core.resources" />
- <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\_javascript_Core;$(DSTROOT)\AppleInternal\Sources64\_javascript_Core" />
</Target>
<!-- Build _javascript_Core Software -->
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(_javascript_Core)" Properties="Configuration=$(CONFIG)" Targets="Build" />
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
<Target Name="PostBuild" AfterTargets="Build">
@@ -70,53 +65,47 @@
<Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
<!-- Identify the files to copy over -->
- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\_javascript_Core\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
<Output TaskParameter="Include" ItemName="Bin32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
<Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
<Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\_javascript_Core$(DebugSuffix).dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\_javascript_Core$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\_javascript_Core$(DebugSuffix).dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\_javascript_Core$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.resources">
<Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.resources">
<Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\_javascript_Core.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\_javascript_Core.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin32Resources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\_javascript_Core.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\_javascript_Core.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin64Resources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
<Output TaskParameter="Include" ItemName="Lib32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
<Output TaskParameter="Include" ItemName="Lib64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj32\_javascript_Core\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived32Sources" />
- </CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj64\_javascript_Core\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived64Sources" />
- </CreateItem>
- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\_javascript_Core\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
@@ -129,8 +118,6 @@
<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)')" />
- <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\_javascript_Core\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project>
Modified: trunk/Source/WTF/ChangeLog (190252 => 190253)
--- trunk/Source/WTF/ChangeLog 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/WTF/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
@@ -1,3 +1,12 @@
+2015-09-25 Alex Christensen <[email protected]>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * WTF.vcxproj/WTF.proj:
+
2015-09-25 Joseph Pecoraro <[email protected]>
Simplify Stopwatch::elapsedTime
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (190252 => 190253)
--- trunk/Source/WTF/WTF.vcxproj/WTF.proj 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj 2015-09-25 21:50:48 UTC (rev 190253)
@@ -3,19 +3,20 @@
<!-- normalize configuration case -->
<PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
- <CONFIG>Production</CONFIG>
+ <CONFIG>Release</CONFIG>
<DebugSuffix></DebugSuffix>
+ <DebugSuffixDefinition></DebugSuffixDefinition>
</PropertyGroup>
<PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
- <CONFIG>DebugSuffix</CONFIG>
+ <CONFIG>Debug</CONFIG>
<DebugSuffix>_debug</DebugSuffix>
+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</PropertyGroup>
<!-- Wrapper to build WTF for both win32 and x64. -->
<PropertyGroup>
<OFFICIAL_BUILD>1</OFFICIAL_BUILD>
<WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
<AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
<AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
<AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
@@ -25,24 +26,17 @@
<AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
<ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
- <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
+ <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)/WTF -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DWTF_DIR=$(SRCROOT.Replace('\','/'))/WTF</CMakeCommandCommon>
</PropertyGroup>
- <ItemGroup>
- <WTF Include="WTF.submit.sln">
- <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </WTF>
- <WTF Include="WTF.submit.sln">
- <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </WTF>
- </ItemGroup>
-
<!-- Prepare for build -->
<Target Name="PreBuild" BeforeTargets="Build">
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
<Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
- <MakeDir Directories="$(DSTROOT);$(OBJROOT)" />
+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
<Message Text="Build output -> $(OBJROOT)" />
<Message Text="Final output -> $(DSTROOT)" />
<MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
@@ -52,8 +46,10 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(WTF)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
+ <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
<Target Name="PostBuild" AfterTargets="Build">
@@ -61,35 +57,35 @@
<Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
<!-- Identify the files to copy over -->
- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WTF\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
<Output TaskParameter="Include" ItemName="Bin32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF$(DebugSuffix).dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WTF$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF$(DebugSuffix).dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WTF$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
<Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
<Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
<Output TaskParameter="Include" ItemName="Lib32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
<Output TaskParameter="Include" ItemName="Lib64Files" />
</CreateItem>
- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <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)" />
@@ -101,4 +97,3 @@
</Target>
</Project>
-
Modified: trunk/Source/WebCore/ChangeLog (190252 => 190253)
--- trunk/Source/WebCore/ChangeLog 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/WebCore/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
@@ -1,3 +1,12 @@
+2015-09-25 Alex Christensen <[email protected]>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.proj:
+
2015-09-25 Beth Dakin <[email protected]>
Clicking on a data detected item inside a form control always pops up a map
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (190252 => 190253)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2015-09-25 21:50:48 UTC (rev 190253)
@@ -3,18 +3,20 @@
<!-- normalize configuration case -->
<PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
- <CONFIG>Production</CONFIG>
+ <CONFIG>Release</CONFIG>
+ <DebugSuffix></DebugSuffix>
+ <DebugSuffixDefinition></DebugSuffixDefinition>
</PropertyGroup>
<PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
- <CONFIG>DebugSuffix</CONFIG>
+ <CONFIG>Debug</CONFIG>
+ <DebugSuffix>_debug</DebugSuffix>
+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</PropertyGroup>
<!-- Wrapper to build WebCore for both win32 and x64. -->
<PropertyGroup>
<OFFICIAL_BUILD>1</OFFICIAL_BUILD>
- <DXSDK_DIR>C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\</DXSDK_DIR>
<WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
<AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
<AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
<AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
@@ -26,23 +28,16 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)/WebCore -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/'))/WebCore</CMakeCommandCommon>
</PropertyGroup>
-
- <ItemGroup>
- <WebCore Include="WebCore.submit.sln">
- <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD);DXSDK_DIR=$(DXSDK_DIR)</AdditionalProperties>
- </WebCore>
- <WebCore Include="WebCore.submit.sln">
- <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD);DXSDK_DIR=$(DXSDK_DIR)</AdditionalProperties>
- </WebCore>
- </ItemGroup>
<!-- Prepare for build -->
<Target Name="PreBuild" BeforeTargets="Build">
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
<Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
<Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
- <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />
+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(ConfigurationBuildDir)\include\private;$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
<CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">
<Output TaskParameter="Include" ItemName="PrivateIncFiles" />
@@ -53,15 +48,16 @@
<Message Text="Final output -> $(DSTROOT)" />
<MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
<MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
- <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\WebCore;$(DSTROOT)\AppleInternal\Sources64\WebCore" />
</Target>
<!-- Build WebCore Software -->
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(WebCore)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
+ <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
<Target Name="PostBuild" AfterTargets="Build">
@@ -69,41 +65,35 @@
<Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
<!-- Identify the files to copy over -->
- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebCore\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
<Output TaskParameter="Include" ItemName="Bin32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
<Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
<Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin32Resources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin64Resources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
<Output TaskParameter="Include" ItemName="Lib32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
<Output TaskParameter="Include" ItemName="Lib64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived32Sources" />
- </CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj64\WebCore\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived64Sources" />
- </CreateItem>
- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
@@ -112,8 +102,6 @@
<Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
<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)')" />
- <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project>
Modified: trunk/Source/WebKit/ChangeLog (190252 => 190253)
--- trunk/Source/WebKit/ChangeLog 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/WebKit/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
@@ -1,3 +1,12 @@
+2015-09-25 Alex Christensen <[email protected]>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/WebKit.proj:
+
2015-09-24 Ryosuke Niwa <[email protected]>
Ran sort-Xcode-project-file.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj (190252 => 190253)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj 2015-09-25 21:50:48 UTC (rev 190253)
@@ -3,19 +3,20 @@
<!-- normalize configuration case -->
<PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
- <CONFIG>Production</CONFIG>
+ <CONFIG>Release</CONFIG>
<DebugSuffix></DebugSuffix>
+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</PropertyGroup>
<PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
- <CONFIG>DebugSuffix</CONFIG>
+ <CONFIG>Debug</CONFIG>
<DebugSuffix>_debug</DebugSuffix>
+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</PropertyGroup>
<!-- Wrapper to build WebKit for both win32 and x64. -->
<PropertyGroup>
<OFFICIAL_BUILD>1</OFFICIAL_BUILD>
<WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
<AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
<AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
<AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
@@ -27,24 +28,17 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)/WebKit -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))/WebKit</CMakeCommandCommon>
</PropertyGroup>
-
- <ItemGroup>
- <WebKit Include="WebKit.submit.sln">
- <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </WebKit>
- <WebKit Include="WebKit.submit.sln">
- <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </WebKit>
- </ItemGroup>
<!-- Prepare for build -->
<Target Name="PreBuild" BeforeTargets="Build">
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
<Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
<Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
- <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />
-
+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(ConfigurationBuildDir)\include\private;$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
+
<CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">
<Output TaskParameter="Include" ItemName="PrivateIncFiles" />
</CreateItem>
@@ -54,15 +48,16 @@
<Message Text="Final output -> $(DSTROOT)" />
<MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
<MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
- <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\WebKit;$(DSTROOT)\AppleInternal\Sources64\WebKit" />
</Target>
<!-- Build WebKit Software -->
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(WebKit)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
+ <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
<Target Name="PostBuild" AfterTargets="Build">
@@ -70,53 +65,53 @@
<Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
<!-- Identify the files to copy over -->
- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKit\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
<Output TaskParameter="Include" ItemName="Bin32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit$(DebugSuffix).dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit$(DebugSuffix).dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin32\*.resources">
<Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.resources">
<Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
<Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
<Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin32Resources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.resources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin64Resources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
<Output TaskParameter="Include" ItemName="Lib32Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
<Output TaskParameter="Include" ItemName="Lib64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj32\WebKit\DerivedSources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKit\DerivedSources\**\*.*">
<Output TaskParameter="Include" ItemName="Derived32Sources" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj64\WebKit\DerivedSources\**\*.*">
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKit\DerivedSources\**\*.*">
<Output TaskParameter="Include" ItemName="Derived64Sources" />
</CreateItem>
- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(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)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
@@ -129,8 +124,6 @@
<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)')" />
- <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project>
Added: trunk/Source/cmake/WinTools.make (0 => 190253)
--- trunk/Source/cmake/WinTools.make (rev 0)
+++ trunk/Source/cmake/WinTools.make 2015-09-25 21:50:48 UTC (rev 190253)
@@ -0,0 +1,3 @@
+install:
+ xcopy "$(SRCROOT)\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
+ xcopy "$(SRCROOT)\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
\ No newline at end of file
Deleted: trunk/Source/cmake/tools/scripts/auto-version.pl (190248 => 190253)
--- trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2015-09-25 17:52:08 UTC (rev 190248)
+++ trunk/Source/cmake/tools/scripts/auto-version.pl 2015-09-25 21:50:48 UTC (rev 190253)
@@ -1,170 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Path qw(make_path);
-use File::Spec;
-use File::Basename;
-use Cwd 'abs_path';
-use Win32;
-
-# Copyright (C) 2007, 2009, 2014 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-sub splitVersion($);
-
-die "You must supply an output path as the argument.\n" if ($#ARGV < 0);
-
-my $thisDirectory = dirname(abs_path($0));
-
-my $FALLBACK_VERSION_PATH = File::Spec->catfile($thisDirectory, 'VERSION');
-open(FALLBACK_VERSION_FILE, '<', $FALLBACK_VERSION_PATH) or die "Unable to open $FALLBACK_VERSION_PATH: $!";
-my $FALLBACK_VERSION = <FALLBACK_VERSION_FILE>;
-close FALLBACK_VERSION_FILE;
-chomp($FALLBACK_VERSION);
-
-my $COPYRIGHT_END_YEAR_PATH = File::Spec->catfile($thisDirectory, 'COPYRIGHT-END-YEAR');
-open(COPYRIGHT_END_YEAR_FILE, '<', $COPYRIGHT_END_YEAR_PATH) or die "Unable to open $COPYRIGHT_END_YEAR_PATH: $!";
-my $COPYRIGHT_END_YEAR = <COPYRIGHT_END_YEAR_FILE>;
-close COPYRIGHT_END_YEAR_FILE;
-chomp($COPYRIGHT_END_YEAR);
-
-# Make sure we don't have any leading or trailing quote
-$ARGV[0] =~ s/^\"//;
-$ARGV[0] =~ s/\"$//;
-
-my $OUTPUT_DIR = File::Spec->catdir(File::Spec->canonpath($ARGV[0]), 'include');
-unless (-d $OUTPUT_DIR) {
- make_path($OUTPUT_DIR) or die "Couldn't create $OUTPUT_DIR: $!";
-}
-
-my $OUTPUT_FILE = File::Spec->catfile($OUTPUT_DIR, 'autoversion.h');
-
-# Take the initial version number from RC_ProjectSourceVersion if it
-# exists, otherwise fall back to the version number stored in the source.
-my $ENVIRONMENT_VERSION = $ENV{'RC_ProjectSourceVersion'} || $ENV{'RC_PROJECTSOURCEVERSION'};
-my $PROPOSED_VERSION = $ENVIRONMENT_VERSION || $FALLBACK_VERSION;
-chomp($PROPOSED_VERSION);
-
-my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION) = splitVersion($PROPOSED_VERSION);
-
-my $TINY_VERSION = $BUILD_TINY_VERSION;
-my $VERSION_TEXT = $ADJUSTED_PROPOSED_VERSION;
-my $VERSION_TEXT_SHORT = $VERSION_TEXT;
-
-my $SVN_REVISION = '';
-if (!$ENVIRONMENT_VERSION) {
- # If we didn't pull the version number from the environment then we're doing
- # an engineering build and we'll stamp the build with some more information.
-
- my $BUILD_DATE = localtime(time);
- my $SVN_REVISION = `svn info`;
- $SVN_REVISION =~ m/Revision: (\d+)/;
- $SVN_REVISION= $1;
-
- chomp($BUILD_DATE);
- chomp($SVN_REVISION);
-
- $VERSION_TEXT_SHORT .= "+";
- my $USER = Win32::LoginName;
- $VERSION_TEXT = "$VERSION_TEXT_SHORT $USER - $BUILD_DATE - r$SVN_REVISION";
-}
-
-open(OUTPUT_FILE, '>', $OUTPUT_FILE) or die "Couldn't open $OUTPUT_FILE: $!";
-print OUTPUT_FILE <<EOF;
-#define __VERSION_TEXT__ "$VERSION_TEXT"
-#define __BUILD_NUMBER__ "$VERSION_TEXT"
-#define __BUILD_NUMBER_SHORT__ "$VERSION_TEXT_SHORT"
-#define __VERSION_MAJOR__ $BUILD_MAJOR_VERSION
-#define __VERSION_MINOR__ $BUILD_MINOR_VERSION
-#define __VERSION_TINY__ $BUILD_TINY_VERSION
-#define __VERSION_BUILD__ $BUILD_VARIANT_VERSION
-#define __BUILD_NUMBER_MAJOR__ $BUILD_MAJOR_VERSION
-#define __BUILD_NUMBER_MINOR__ $BUILD_MINOR_VERSION
-#define __BUILD_NUMBER_VARIANT__ $BUILD_TINY_VERSION
-#define __SVN_REVISION__ $SVN_REVISION
-#define __FULL_BUILD_MAJOR_VERSION__ $FULL_BUILD_MAJOR_VERSION
-EOF
-
-if (defined $COPYRIGHT_END_YEAR) {
- print OUTPUT_FILE "#define __COPYRIGHT_YEAR_END_TEXT__ \"$COPYRIGHT_END_YEAR\"\n";
-}
-close(OUTPUT_FILE);
-
-sub packTwoValues($$)
-{
- my $first = shift;
- my $second = shift;
-
- die "First version component ($first) is too large. Must be between 0 and 99" if ($first > 99);
- die "Second version component ($second) is too large. Must be between 0 and 999" if ($second > 999);
-
- return $first * 1000 + $second;
-}
-
-sub splitVersion($)
-{
- my $PROPOSED_VERSION = shift;
-
- $PROPOSED_VERSION =~ s/^\s+//g; # Get rid of any leading whitespace
- $PROPOSED_VERSION =~ s/\s+$//g; # Get rid of any trailing whitespace
-
- # Split out the components of the dotted version number.
- my @components = split(/\./, $PROPOSED_VERSION) or die "Couldn't parse $PROPOSED_VERSION";
- my $componentCount = scalar(@components);
-
- my $BUILD_MAJOR_VERSION = $components[0];
-
- # Have the minor and tiny components default to zero if not present.
- my $BUILD_MINOR_VERSION = 0;
- my $BUILD_TINY_VERSION = 0;
- my $BUILD_MICRO_VERSION = 0;
- my $BUILD_NANO_VERSION = 0;
- if ($componentCount > 1) {
- $BUILD_MINOR_VERSION = $components[1];
- }
- if ($componentCount > 2) {
- $BUILD_TINY_VERSION = $components[2];
- }
- if ($componentCount > 3) {
- $BUILD_MICRO_VERSION = $components[3];
- }
-
- my $RETURN_NANO_VERSION = $ENV{'RC_ProjectBuildVersion'} || $ENV{'RC_PROJECTBUILDVERSION'} || $BUILD_MICRO_VERSION;
- if ($componentCount > 4) {
- $BUILD_NANO_VERSION = $components[4];
- $RETURN_NANO_VERSION = $BUILD_NANO_VERSION;
- }
-
- # Cut the major component down to three characters by dropping any
- # extra leading digits, then adjust the major version portion of the
- # version string to match.
- my $originalLength = length($BUILD_MAJOR_VERSION);
- my $FULL_BUILD_MAJOR_VERSION = $BUILD_MAJOR_VERSION;
- $BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
-
- my $charactersToRemove = $originalLength - length($BUILD_MAJOR_VERSION);
-
- $PROPOSED_VERSION = substr($PROPOSED_VERSION, $charactersToRemove);
-
- return ($BUILD_MAJOR_VERSION, packTwoValues($BUILD_MINOR_VERSION, $BUILD_TINY_VERSION), packTwoValues($BUILD_MICRO_VERSION, $BUILD_NANO_VERSION), $RETURN_NANO_VERSION, $PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION);
-}
Copied: trunk/Source/cmake/tools/scripts/auto-version.pl (from rev 190251, trunk/WebKitLibraries/win/tools/scripts/auto-version.pl) (0 => 190253)
--- trunk/Source/cmake/tools/scripts/auto-version.pl (rev 0)
+++ trunk/Source/cmake/tools/scripts/auto-version.pl 2015-09-25 21:50:48 UTC (rev 190253)
@@ -0,0 +1,176 @@
+#!/usr/bin/perl -w
+
+use strict;
+use File::Path qw(make_path);
+use File::Spec;
+use File::Basename;
+use Cwd 'abs_path';
+use Win32;
+
+# Copyright (C) 2007, 2009, 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+sub splitVersion($);
+
+die "You must supply an output path as the argument.\n" if ($#ARGV < 0);
+
+my $thisDirectory;
+my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
+if (defined $WEBKIT_LIBRARIES) {
+ $thisDirectory = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'scripts');
+} else {
+ $thisDirectory = dirname(abs_path($0));
+}
+
+my $FALLBACK_VERSION_PATH = File::Spec->catfile($thisDirectory, 'VERSION');
+open(FALLBACK_VERSION_FILE, '<', $FALLBACK_VERSION_PATH) or die "Unable to open $FALLBACK_VERSION_PATH: $!";
+my $FALLBACK_VERSION = <FALLBACK_VERSION_FILE>;
+close FALLBACK_VERSION_FILE;
+chomp($FALLBACK_VERSION);
+
+my $COPYRIGHT_END_YEAR_PATH = File::Spec->catfile($thisDirectory, 'COPYRIGHT-END-YEAR');
+open(COPYRIGHT_END_YEAR_FILE, '<', $COPYRIGHT_END_YEAR_PATH) or die "Unable to open $COPYRIGHT_END_YEAR_PATH: $!";
+my $COPYRIGHT_END_YEAR = <COPYRIGHT_END_YEAR_FILE>;
+close COPYRIGHT_END_YEAR_FILE;
+chomp($COPYRIGHT_END_YEAR);
+
+# Make sure we don't have any leading or trailing quote
+$ARGV[0] =~ s/^\"//;
+$ARGV[0] =~ s/\"$//;
+
+my $OUTPUT_DIR = File::Spec->catdir(File::Spec->canonpath($ARGV[0]), 'include');
+unless (-d $OUTPUT_DIR) {
+ make_path($OUTPUT_DIR) or die "Couldn't create $OUTPUT_DIR: $!";
+}
+
+my $OUTPUT_FILE = File::Spec->catfile($OUTPUT_DIR, 'autoversion.h');
+
+# Take the initial version number from RC_ProjectSourceVersion if it
+# exists, otherwise fall back to the version number stored in the source.
+my $ENVIRONMENT_VERSION = $ENV{'RC_ProjectSourceVersion'} || $ENV{'RC_PROJECTSOURCEVERSION'};
+my $PROPOSED_VERSION = $ENVIRONMENT_VERSION || $FALLBACK_VERSION;
+chomp($PROPOSED_VERSION);
+
+my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION) = splitVersion($PROPOSED_VERSION);
+
+my $TINY_VERSION = $BUILD_TINY_VERSION;
+my $VERSION_TEXT = $ADJUSTED_PROPOSED_VERSION;
+my $VERSION_TEXT_SHORT = $VERSION_TEXT;
+
+my $SVN_REVISION = '';
+if (!$ENVIRONMENT_VERSION) {
+ # If we didn't pull the version number from the environment then we're doing
+ # an engineering build and we'll stamp the build with some more information.
+
+ my $BUILD_DATE = localtime(time);
+ my $SVN_REVISION = `svn info`;
+ $SVN_REVISION =~ m/Revision: (\d+)/;
+ $SVN_REVISION= $1;
+
+ chomp($BUILD_DATE);
+ chomp($SVN_REVISION);
+
+ $VERSION_TEXT_SHORT .= "+";
+ my $USER = Win32::LoginName;
+ $VERSION_TEXT = "$VERSION_TEXT_SHORT $USER - $BUILD_DATE - r$SVN_REVISION";
+}
+
+open(OUTPUT_FILE, '>', $OUTPUT_FILE) or die "Couldn't open $OUTPUT_FILE: $!";
+print OUTPUT_FILE <<EOF;
+#define __VERSION_TEXT__ "$VERSION_TEXT"
+#define __BUILD_NUMBER__ "$VERSION_TEXT"
+#define __BUILD_NUMBER_SHORT__ "$VERSION_TEXT_SHORT"
+#define __VERSION_MAJOR__ $BUILD_MAJOR_VERSION
+#define __VERSION_MINOR__ $BUILD_MINOR_VERSION
+#define __VERSION_TINY__ $BUILD_TINY_VERSION
+#define __VERSION_BUILD__ $BUILD_VARIANT_VERSION
+#define __BUILD_NUMBER_MAJOR__ $BUILD_MAJOR_VERSION
+#define __BUILD_NUMBER_MINOR__ $BUILD_MINOR_VERSION
+#define __BUILD_NUMBER_VARIANT__ $BUILD_TINY_VERSION
+#define __SVN_REVISION__ $SVN_REVISION
+#define __FULL_BUILD_MAJOR_VERSION__ $FULL_BUILD_MAJOR_VERSION
+EOF
+
+if (defined $COPYRIGHT_END_YEAR) {
+ print OUTPUT_FILE "#define __COPYRIGHT_YEAR_END_TEXT__ \"$COPYRIGHT_END_YEAR\"\n";
+}
+close(OUTPUT_FILE);
+
+sub packTwoValues($$)
+{
+ my $first = shift;
+ my $second = shift;
+
+ die "First version component ($first) is too large. Must be between 0 and 99" if ($first > 99);
+ die "Second version component ($second) is too large. Must be between 0 and 999" if ($second > 999);
+
+ return $first * 1000 + $second;
+}
+
+sub splitVersion($)
+{
+ my $PROPOSED_VERSION = shift;
+
+ $PROPOSED_VERSION =~ s/^\s+//g; # Get rid of any leading whitespace
+ $PROPOSED_VERSION =~ s/\s+$//g; # Get rid of any trailing whitespace
+
+ # Split out the components of the dotted version number.
+ my @components = split(/\./, $PROPOSED_VERSION) or die "Couldn't parse $PROPOSED_VERSION";
+ my $componentCount = scalar(@components);
+
+ my $BUILD_MAJOR_VERSION = $components[0];
+
+ # Have the minor and tiny components default to zero if not present.
+ my $BUILD_MINOR_VERSION = 0;
+ my $BUILD_TINY_VERSION = 0;
+ my $BUILD_MICRO_VERSION = 0;
+ my $BUILD_NANO_VERSION = 0;
+ if ($componentCount > 1) {
+ $BUILD_MINOR_VERSION = $components[1];
+ }
+ if ($componentCount > 2) {
+ $BUILD_TINY_VERSION = $components[2];
+ }
+ if ($componentCount > 3) {
+ $BUILD_MICRO_VERSION = $components[3];
+ }
+
+ my $RETURN_NANO_VERSION = $ENV{'RC_ProjectBuildVersion'} || $ENV{'RC_PROJECTBUILDVERSION'} || $BUILD_MICRO_VERSION;
+ if ($componentCount > 4) {
+ $BUILD_NANO_VERSION = $components[4];
+ $RETURN_NANO_VERSION = $BUILD_NANO_VERSION;
+ }
+
+ # Cut the major component down to three characters by dropping any
+ # extra leading digits, then adjust the major version portion of the
+ # version string to match.
+ my $originalLength = length($BUILD_MAJOR_VERSION);
+ my $FULL_BUILD_MAJOR_VERSION = $BUILD_MAJOR_VERSION;
+ $BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
+
+ my $charactersToRemove = $originalLength - length($BUILD_MAJOR_VERSION);
+
+ $PROPOSED_VERSION = substr($PROPOSED_VERSION, $charactersToRemove);
+
+ return ($BUILD_MAJOR_VERSION, packTwoValues($BUILD_MINOR_VERSION, $BUILD_TINY_VERSION), packTwoValues($BUILD_MICRO_VERSION, $BUILD_NANO_VERSION), $RETURN_NANO_VERSION, $PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION);
+}
