<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190253] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190253">190253</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-09-25 14:50:48 -0700 (Fri, 25 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCore.proj:
Source/WebCore:
* WebCore.vcxproj/WebCore.proj:
Source/WebKit:
* WebKit.vcxproj/WebKit.proj:
Source/WTF:
* WTF.vcxproj/WTF.proj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFproj">trunk/Source/WTF/WTF.vcxproj/WTF.proj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeWinToolsmake">trunk/Source/cmake/WinTools.make</a></li>
<li>trunk/Source/cmake/tools/</li>
<li>trunk/Source/cmake/tools/scripts/</li>
<li><a href="#trunkSourcecmaketoolsscriptsautoversionpl">trunk/Source/cmake/tools/scripts/auto-version.pl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcecmaketoolsscriptsautoversionpl">trunk/Source/cmake/tools/scripts/auto-version.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-09-25 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ [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 <achristensen@webkit.org>
+
</ins><span class="cx"> Prepare internal AppleWin build for CMake
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149570
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-25 Alex Christensen <achristensen@webkit.org>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.proj:
+
</ins><span class="cx"> 2015-09-24 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the use of "Immediate" in JIT function names.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj 2015-09-25 21:35:11 UTC (rev 190252)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj 2015-09-25 21:50:48 UTC (rev 190253)
</span><span class="lines">@@ -3,19 +3,20 @@
</span><span class="cx">
</span><span class="cx"> <!-- normalize configuration case -->
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
</span><del>- <CONFIG>Production</CONFIG>
</del><ins>+ <CONFIG>Release</CONFIG>
</ins><span class="cx"> <DebugSuffix></DebugSuffix>
</span><ins>+ <DebugSuffixDefinition></DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
</span><del>- <CONFIG>DebugSuffix</CONFIG>
</del><ins>+ <CONFIG>Debug</CONFIG>
</ins><span class="cx"> <DebugSuffix>_debug</DebugSuffix>
</span><ins>+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx">
</span><span class="cx"> <!-- Wrapper to build JavaScriptCore for both win32 and x64. -->
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</span><span class="cx"> <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</span><del>- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</del><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><span class="cx"> <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
</span><span class="cx"> <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
</span><span class="lines">@@ -27,23 +28,16 @@
</span><span class="cx"> <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx"> <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="cx"> <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><ins>+ <CMakeCommandCommon>cmake $(SRCROOT)/JavaScriptCore -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('\','/'))/JavaScriptCore</CMakeCommandCommon>
</ins><span class="cx"> </PropertyGroup>
</span><del>-
- <ItemGroup>
- <JavaScriptCore Include="JavaScriptCore.submit.sln">
- <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </JavaScriptCore>
- <JavaScriptCore Include="JavaScriptCore.submit.sln">
- <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>
- </JavaScriptCore>
- </ItemGroup>
</del><span class="cx">
</span><span class="cx"> <!-- Prepare for build -->
</span><span class="cx"> <Target Name="PreBuild" BeforeTargets="Build">
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><span class="cx"> <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
</span><ins>+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
</ins><span class="cx"> <Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
</span><del>- <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />
</del><ins>+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(ConfigurationBuildDir)\include\private;$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
</ins><span class="cx">
</span><span class="cx"> <CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">
</span><span class="cx"> <Output TaskParameter="Include" ItemName="PrivateIncFiles" />
</span><span class="lines">@@ -54,15 +48,16 @@
</span><span class="cx"> <Message Text="Final output -> $(DSTROOT)" />
</span><span class="cx"> <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
</span><span class="cx"> <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\JavaScriptCore.resources;$(DSTROOT)\$(ProgramFilesAAS64)\JavaScriptCore.resources" />
</span><del>- <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore;$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore" />
</del><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <!-- Build JavaScriptCore Software -->
</span><span class="cx"> <Target Name="Build" AfterTargets="PreBuild">
</span><span class="cx"> <Message Text="Building $(CONFIGURATION) Solution" />
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><del>- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(JavaScriptCore)" Properties="Configuration=$(CONFIG)" Targets="Build" />
</del><ins>+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</ins><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <Target Name="PostBuild" AfterTargets="Build">
</span><span class="lines">@@ -70,53 +65,47 @@
</span><span class="cx"> <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
</span><span class="cx">
</span><span class="cx"> <!-- Identify the files to copy over -->
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\JavaScriptCore\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="IncFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore$(DebugSuffix).dll">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\JavaScriptCore$(DebugSuffix).dll">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\JavaScriptCore$(DebugSuffix).dll">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\JavaScriptCore$(DebugSuffix).dll">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.resources">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.resources">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore.resources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\JavaScriptCore.resources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Resources" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\JavaScriptCore.resources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\JavaScriptCore.resources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64Resources" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib64Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\obj32\JavaScriptCore\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived32Sources" />
- </CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj64\JavaScriptCore\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived64Sources" />
- </CreateItem>
</del><span class="cx">
</span><del>- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />
</del><ins>+ <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />
</ins><span class="cx"> <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
</span><span class="cx"> <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
</span><span class="lines">@@ -129,8 +118,6 @@
</span><span class="cx"> <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
</span><del>- <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />
- <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />
</del><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> </Project>
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-25 Alex Christensen <achristensen@webkit.org>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * WTF.vcxproj/WTF.proj:
+
</ins><span class="cx"> 2015-09-25 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify Stopwatch::elapsedTime
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,19 +3,20 @@
</span><span class="cx">
</span><span class="cx"> <!-- normalize configuration case -->
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
</span><del>- <CONFIG>Production</CONFIG>
</del><ins>+ <CONFIG>Release</CONFIG>
</ins><span class="cx"> <DebugSuffix></DebugSuffix>
</span><ins>+ <DebugSuffixDefinition></DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
</span><del>- <CONFIG>DebugSuffix</CONFIG>
</del><ins>+ <CONFIG>Debug</CONFIG>
</ins><span class="cx"> <DebugSuffix>_debug</DebugSuffix>
</span><ins>+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx">
</span><span class="cx"> <!-- Wrapper to build WTF for both win32 and x64. -->
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</span><span class="cx"> <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</span><del>- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</del><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><span class="cx"> <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
</span><span class="cx"> <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
</span><span class="lines">@@ -25,24 +26,17 @@
</span><span class="cx"> <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
</span><span class="cx"> <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
</span><span class="cx"> <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><del>- <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</del><ins>+ <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</ins><span class="cx"> <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><ins>+ <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>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx">
</span><del>- <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>
-
</del><span class="cx"> <!-- Prepare for build -->
</span><span class="cx"> <Target Name="PreBuild" BeforeTargets="Build">
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><span class="cx"> <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
</span><del>- <MakeDir Directories="$(DSTROOT);$(OBJROOT)" />
</del><ins>+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
</ins><span class="cx"> <Message Text="Build output -> $(OBJROOT)" />
</span><span class="cx"> <Message Text="Final output -> $(DSTROOT)" />
</span><span class="cx"> <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
</span><span class="lines">@@ -52,8 +46,10 @@
</span><span class="cx"> <Target Name="Build" AfterTargets="PreBuild">
</span><span class="cx"> <Message Text="Building $(CONFIGURATION) Solution" />
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><del>- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(WTF)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
</del><ins>+ <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</ins><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <Target Name="PostBuild" AfterTargets="Build">
</span><span class="lines">@@ -61,35 +57,35 @@
</span><span class="cx"> <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
</span><span class="cx">
</span><span class="cx"> <!-- Identify the files to copy over -->
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WTF\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="IncFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF$(DebugSuffix).dll">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WTF$(DebugSuffix).dll">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF$(DebugSuffix).dll">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WTF$(DebugSuffix).dll">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib64Files" />
</span><span class="cx"> </CreateItem>
</span><span class="cx">
</span><del>- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />
</del><ins>+ <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\wtf\%(RecursiveDir)%(Filename)%(Extension)')" />
</ins><span class="cx"> <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
</span><span class="cx"> <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
</span><span class="lines">@@ -101,4 +97,3 @@
</span><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> </Project>
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-25 Alex Christensen <achristensen@webkit.org>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.proj:
+
</ins><span class="cx"> 2015-09-25 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Clicking on a data detected item inside a form control always pops up a map
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,18 +3,20 @@
</span><span class="cx">
</span><span class="cx"> <!-- normalize configuration case -->
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
</span><del>- <CONFIG>Production</CONFIG>
</del><ins>+ <CONFIG>Release</CONFIG>
+ <DebugSuffix></DebugSuffix>
+ <DebugSuffixDefinition></DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
</span><del>- <CONFIG>DebugSuffix</CONFIG>
</del><ins>+ <CONFIG>Debug</CONFIG>
+ <DebugSuffix>_debug</DebugSuffix>
+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx">
</span><span class="cx"> <!-- Wrapper to build WebCore for both win32 and x64. -->
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</span><del>- <DXSDK_DIR>C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\</DXSDK_DIR>
</del><span class="cx"> <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</span><del>- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</del><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><span class="cx"> <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
</span><span class="cx"> <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
</span><span class="lines">@@ -26,23 +28,16 @@
</span><span class="cx"> <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx"> <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="cx"> <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><ins>+ <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>
</ins><span class="cx"> </PropertyGroup>
</span><del>-
- <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>
</del><span class="cx">
</span><span class="cx"> <!-- Prepare for build -->
</span><span class="cx"> <Target Name="PreBuild" BeforeTargets="Build">
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><span class="cx"> <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
</span><ins>+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
</ins><span class="cx"> <Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
</span><del>- <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />
</del><ins>+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(ConfigurationBuildDir)\include\private;$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
</ins><span class="cx">
</span><span class="cx"> <CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">
</span><span class="cx"> <Output TaskParameter="Include" ItemName="PrivateIncFiles" />
</span><span class="lines">@@ -53,15 +48,16 @@
</span><span class="cx"> <Message Text="Final output -> $(DSTROOT)" />
</span><span class="cx"> <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
</span><span class="cx"> <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
</span><del>- <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\WebCore;$(DSTROOT)\AppleInternal\Sources64\WebCore" />
</del><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <!-- Build WebCore Software -->
</span><span class="cx"> <Target Name="Build" AfterTargets="PreBuild">
</span><span class="cx"> <Message Text="Building $(CONFIGURATION) Solution" />
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><del>- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(WebCore)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
</del><ins>+ <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</ins><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <Target Name="PostBuild" AfterTargets="Build">
</span><span class="lines">@@ -69,41 +65,35 @@
</span><span class="cx"> <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
</span><span class="cx">
</span><span class="cx"> <!-- Identify the files to copy over -->
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebCore\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="IncFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.resources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Resources" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.resources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64Resources" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib64Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived32Sources" />
- </CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\obj64\WebCore\DerivedSources\**\*.*">
- <Output TaskParameter="Include" ItemName="Derived64Sources" />
- </CreateItem>
</del><span class="cx">
</span><del>- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />
</del><ins>+ <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />
</ins><span class="cx"> <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
</span><span class="cx"> <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
</span><span class="lines">@@ -112,8 +102,6 @@
</span><span class="cx"> <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
</span><del>- <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />
- <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />
</del><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> </Project>
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-25 Alex Christensen <achristensen@webkit.org>
+
+ [Win] Switch to CMake
+ https://bugs.webkit.org/show_bug.cgi?id=148111
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/WebKit.proj:
+
</ins><span class="cx"> 2015-09-24 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Ran sort-Xcode-project-file.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj (190252 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,19 +3,20 @@
</span><span class="cx">
</span><span class="cx"> <!-- normalize configuration case -->
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
</span><del>- <CONFIG>Production</CONFIG>
</del><ins>+ <CONFIG>Release</CONFIG>
</ins><span class="cx"> <DebugSuffix></DebugSuffix>
</span><ins>+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
</span><del>- <CONFIG>DebugSuffix</CONFIG>
</del><ins>+ <CONFIG>Debug</CONFIG>
</ins><span class="cx"> <DebugSuffix>_debug</DebugSuffix>
</span><ins>+ <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx">
</span><span class="cx"> <!-- Wrapper to build WebKit for both win32 and x64. -->
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</span><span class="cx"> <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</span><del>- <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</del><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><span class="cx"> <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
</span><span class="cx"> <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
</span><span class="lines">@@ -27,24 +28,17 @@
</span><span class="cx"> <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx"> <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="cx"> <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><ins>+ <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>
</ins><span class="cx"> </PropertyGroup>
</span><del>-
- <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>
</del><span class="cx">
</span><span class="cx"> <!-- Prepare for build -->
</span><span class="cx"> <Target Name="PreBuild" BeforeTargets="Build">
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><span class="cx"> <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
</span><ins>+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
</ins><span class="cx"> <Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
</span><del>- <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />
-
</del><ins>+ <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(ConfigurationBuildDir)\include\private;$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />
+
</ins><span class="cx"> <CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">
</span><span class="cx"> <Output TaskParameter="Include" ItemName="PrivateIncFiles" />
</span><span class="cx"> </CreateItem>
</span><span class="lines">@@ -54,15 +48,16 @@
</span><span class="cx"> <Message Text="Final output -> $(DSTROOT)" />
</span><span class="cx"> <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
</span><span class="cx"> <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
</span><del>- <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\WebKit;$(DSTROOT)\AppleInternal\Sources64\WebKit" />
</del><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <!-- Build WebKit Software -->
</span><span class="cx"> <Target Name="Build" AfterTargets="PreBuild">
</span><span class="cx"> <Message Text="Building $(CONFIGURATION) Solution" />
</span><span class="cx"> <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
</span><del>- <Message Text="Output=$(WebKit_OutputDir)" />
- <MSBuild Projects="@(WebKit)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />
</del><ins>+ <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</ins><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> <Target Name="PostBuild" AfterTargets="Build">
</span><span class="lines">@@ -70,53 +65,53 @@
</span><span class="cx"> <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />
</span><span class="cx">
</span><span class="cx"> <!-- Identify the files to copy over -->
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKit\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="IncFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit$(DebugSuffix).dll">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit$(DebugSuffix).dll">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit$(DebugSuffix).dll">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit$(DebugSuffix).dll">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin32\*.resources">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.resources">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.resources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin32Resources" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.resources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Bin64Resources" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib32Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Lib64Files" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\obj32\WebKit\DerivedSources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKit\DerivedSources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Derived32Sources" />
</span><span class="cx"> </CreateItem>
</span><del>- <CreateItem Include="$(ConfigurationBuildDir)\obj64\WebKit\DerivedSources\**\*.*">
</del><ins>+ <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKit\DerivedSources\**\*.*">
</ins><span class="cx"> <Output TaskParameter="Include" ItemName="Derived64Sources" />
</span><span class="cx"> </CreateItem>
</span><span class="cx">
</span><del>- <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />
</del><ins>+ <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
</ins><span class="cx"> <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
</span><span class="cx"> <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
</span><span class="lines">@@ -129,8 +124,6 @@
</span><span class="cx"> <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />
</span><span class="cx"> <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
</span><del>- <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
- <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />
</del><span class="cx"> </Target>
</span><span class="cx">
</span><span class="cx"> </Project>
</span></span></pre></div>
<a id="trunkSourcecmakeWinToolsmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/WinTools.make (0 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WinTools.make (rev 0)
+++ trunk/Source/cmake/WinTools.make 2015-09-25 21:50:48 UTC (rev 190253)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+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
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourcecmaketoolsscriptsautoversionpl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/cmake/tools/scripts/auto-version.pl (190248 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,170 +0,0 @@
</span><del>-#!/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);
-}
</del></span></pre></div>
<a id="trunkSourcecmaketoolsscriptsautoversionplfromrev190251trunkWebKitLibrarieswintoolsscriptsautoversionpl"></a>
<div class="copfile"><h4>Copied: trunk/Source/cmake/tools/scripts/auto-version.pl (from rev 190251, trunk/WebKitLibraries/win/tools/scripts/auto-version.pl) (0 => 190253)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,176 @@
</span><ins>+#!/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);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>