[Win] Convert some NMake files to MSBuild project files

https://bugs.webkit.org/show_bug.cgi?id=127579

Reviewed by Tim Horton.

../JavaScriptCore:

* JavaScriptCore.vcxproj/JavaScriptCore.make: Removed.
* JavaScriptCore.vcxproj/JavaScriptCore.proj: Added.

../WebCore:

* WebCore.vcxproj/WebCore.make: Removed.
* WebCore.vcxproj/WebCore.proj: Added.

../WTF:

* WTF.vcxproj/WTF.make: Removed.
* WTF.vcxproj/WTF.proj: Added.

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 8c404fb8a3ef337fd0b23f29ba7e9eb29383bd80..7330ec6e1a22438ac684cd52f55414647233f59b 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-24  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Convert some NMake files to MSBuild project files
+        https://bugs.webkit.org/show_bug.cgi?id=127579
+
+        Reviewed by Tim Horton.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.make: Removed.
+        * JavaScriptCore.vcxproj/JavaScriptCore.proj: Added.
+
 2014-01-24  Mark Lam  <mark.lam@apple.com>
 
         Fixed a bad assertion in CodeBlock::removeBreakpoint().

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
deleted file mode 100644 (file)
index 9fa90da..0000000
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
+++ /dev/null
@@ -1,55 +0,0 @@
-!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG"
-BUILDSTYLE=DebugSuffix
-!ELSE
-BUILDSTYLE=Production
-!ENDIF
-
-install:
-    set OFFICIAL_BUILD=1
-       set WebKit_Libraries=$(SRCROOT)\AppleInternal
-       set WebKit_OutputDir=$(OBJROOT)
-    set OriginalPath = %PATH%
-
-    set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32
-    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS%
-       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    -mkdir "%ConfigurationBuildDir%\include\private"
-    xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
-    devenv "JavaScriptCore.submit.sln" /clean "%ArchitectureBuildStyle%"
-    devenv "JavaScriptCore.submit.sln" /build "%ArchitectureBuildStyle%"
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\jsc.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\jsc.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-    xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y    
-    xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y    
-    xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\JavaScriptCore.resources" /e/v/i/h/y
-    -mkdir "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore"
-    xcopy "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore" /e/v/i/h/y
-
-    set ArchitectureBuildStyle=$(BUILDSTYLE)|x64
-    set ProgramFilesAAS=Program Files\Common Files\Apple\Apple Application Support
-    set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS%
-       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    -mkdir "%ConfigurationBuildDir%\include\private"
-    xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
-    devenv "JavaScriptCore.submit.sln" /clean "%ArchitectureBuildStyle%"
-    devenv "JavaScriptCore.submit.sln" /build "%ArchitectureBuildStyle%"
-    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore_debug.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore_debug.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin64\jsc.exe" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin64\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin64\jsc.pdb" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin64\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
-    xcopy "%ConfigurationBuildDir%\lib64\*" "$(DSTROOT)\AppleInternal\lib64\" /e/v/i/h/y    
-    xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\JavaScriptCore.resources" /e/v/i/h/y
-    -mkdir "$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore"
-    xcopy "%ConfigurationBuildDir%\obj64\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore" /e/v/i/h/y
-    
\ No newline at end of file

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
new file mode 100644 (file)
index 0000000..1207b01
--- /dev/null
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project InitialTargets="PreBuild" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+\r
+  <!-- normalize configuration case -->\r
+  <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
+       <CONFIG>Production</CONFIG>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
+       <CONFIG>DebugSuffix</CONFIG>\r
+  </PropertyGroup>\r
+\r
+  <!-- Wrapper to build JavaScriptCore for both win32 and x64. -->\r
+  <PropertyGroup>\r
+    <OFFICIAL_BUILD>1</OFFICIAL_BUILD>\r
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>\r
+    <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>\r
+    <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>\r
+    <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>\r
+    <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>\r
+    <AppleInternalBin32>$(AppleInternal)\bin32</AppleInternalBin32>\r
+    <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>\r
+    <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>\r
+    <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>\r
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>\r
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>\r
+    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
+    <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
+  </PropertyGroup>\r
+\r
+  <ItemGroup>\r
+    <JavaScriptCore Include="JavaScriptCore.submit.sln">\r
+      <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
+    </JavaScriptCore>\r
+    <JavaScriptCore Include="JavaScriptCore.submit.sln">\r
+      <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
+    </JavaScriptCore>\r
+  </ItemGroup>\r
+ \r
+  <!-- Prepare for build -->\r
+  <Target Name="PreBuild" BeforeTargets="Build">\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />\r
+    <Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />\r
+    <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />\r
+ \r
+    <CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="PrivateIncFiles" />\r
+    </CreateItem>\r
+\r
+    <Copy SourceFiles="@(PrivateIncFiles)" DestinationFiles="@(PrivateIncFiles->'$(ConfigurationBuildDir)\include\private\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Message Text="Build output -> $(OBJROOT)" />\r
+    <Message Text="Final output -> $(DSTROOT)" />\r
+    <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\JavaScriptCore.resources;$(DSTROOT)\$(ProgramFilesAAS64)\JavaScriptCore.resources" />\r
+    <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore;$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore" />\r
+  </Target>\r
+\r
+  <!-- Build JavaScriptCore Software -->\r
+  <Target Name="Build" AfterTargets="PreBuild">\r
+    <Message Text="Building $(CONFIGURATION) Solution" />\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Message Text="Output=$(WebKit_OutputDir)" />\r
+    <MSBuild Projects="@(JavaScriptCore)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />\r
+  </Target>\r
+\r
+  <Target Name="PostBuild" AfterTargets="Build">\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />\r
+\r
+    <!-- Identify the files to copy over -->\r
+    <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="IncFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">\r
+      <Output TaskParameter="Include" ItemName="Bin32Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
+      <Output TaskParameter="Include" ItemName="Bin64Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">\r
+      <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">\r
+      <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore.resources\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="Bin32Resources" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\JavaScriptCore.resources\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="Bin64Resources" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">\r
+      <Output TaskParameter="Include" ItemName="Lib32Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">\r
+      <Output TaskParameter="Include" ItemName="Lib64Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\obj32\JavaScriptCore\DerivedSources\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="Derived32Sources" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\obj64\JavaScriptCore\DerivedSources\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="Derived64Sources" />\r
+    </CreateItem>\r
+\r
+    <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
+    <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
+    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
+    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
+    <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
+    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
+    <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+  </Target>\r
+\r
+</Project>\r
+\r

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index e95efe2475c57a7703acdba3bc953d070489ca39..cb6ff22b8642b3f99b1e8b56e1080918866219e4 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-24  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Convert some NMake files to MSBuild project files
+        https://bugs.webkit.org/show_bug.cgi?id=127579
+
+        Reviewed by Tim Horton.
+
+        * WTF.vcxproj/WTF.make: Removed.
+        * WTF.vcxproj/WTF.proj: Added.
+
 2014-01-24  Anders Carlsson  <andersca@apple.com>
 
         Get rid of monotonicallyIncreasingTimeMS and start using std::chrono instead

diff --git a/Source/WTF/WTF.vcxproj/WTF.make b/Source/WTF/WTF.vcxproj/WTF.make
deleted file mode 100644 (file)
index 66e9324..0000000
--- a/Source/WTF/WTF.vcxproj/WTF.make
+++ /dev/null
@@ -1,31 +0,0 @@
-!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG"
-BUILDSTYLE=DebugSuffix
-!ELSE
-BUILDSTYLE=Production
-!ENDIF
-
-install:
-    set OFFICIAL_BUILD=1
-       set WebKit_Libraries=$(SRCROOT)\AppleInternal
-       set WebKit_OutputDir=$(OBJROOT)
-    set OriginalPath = %PATH%
-    
-    set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32
-    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS%
-       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    devenv "WTF.submit.sln" /clean "%ArchitectureBuildStyle%"
-    devenv "WTF.submit.sln" /build "%ArchitectureBuildStyle%"
-    echo "%ConfigurationBuildDir%\include\*"
-    xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
-    xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
-    xcopy "%ConfigurationBuildDir%\bin32\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
-
-    set ArchitectureBuildStyle=$(BUILDSTYLE)|x64
-    set ProgramFilesAAS=Program Files\Common Files\Apple\Apple Application Support
-    set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS%
-       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    devenv "WTF.submit.sln" /clean "%ArchitectureBuildStyle%"
-    devenv "WTF.submit.sln" /build "%ArchitectureBuildStyle%"
-    xcopy "%ConfigurationBuildDir%\lib64\*" "$(DSTROOT)\AppleInternal\lib64\" /e/v/i/h/y
-    xcopy "%ConfigurationBuildDir%\bin64\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
\ No newline at end of file

diff --git a/Source/WTF/WTF.vcxproj/WTF.proj b/Source/WTF/WTF.vcxproj/WTF.proj
new file mode 100644 (file)
index 0000000..3df7918
--- /dev/null
+++ b/Source/WTF/WTF.vcxproj/WTF.proj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project InitialTargets="PreBuild" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+\r
+  <!-- normalize configuration case -->\r
+  <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
+       <CONFIG>Production</CONFIG>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
+       <CONFIG>DebugSuffix</CONFIG>\r
+  </PropertyGroup>\r
+\r
+  <!-- Wrapper to build WTF for both win32 and x64. -->\r
+  <PropertyGroup>\r
+    <OFFICIAL_BUILD>1</OFFICIAL_BUILD>\r
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>\r
+    <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>\r
+    <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>\r
+    <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>\r
+    <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>\r
+    <AppleInternalBin32>$(AppleInternal)\bin32</AppleInternalBin32>\r
+    <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>\r
+    <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>\r
+    <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>\r
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>\r
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>\r
+    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
+    <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
+  </PropertyGroup>\r
+\r
+  <ItemGroup>\r
+    <WTF Include="WTF.submit.sln">\r
+      <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
+    </WTF>\r
+    <WTF Include="WTF.submit.sln">\r
+      <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
+    </WTF>\r
+  </ItemGroup>\r
+\r
+  <!-- Prepare for build -->\r
+  <Target Name="PreBuild" BeforeTargets="Build">\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />\r
+    <MakeDir Directories="$(DSTROOT);$(OBJROOT)" />\r
+    <Message Text="Build output -> $(OBJROOT)" />\r
+    <Message Text="Final output -> $(DSTROOT)" />\r
+    <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+  </Target>\r
+\r
+  <!-- Build WTF Software -->\r
+  <Target Name="Build" AfterTargets="PreBuild">\r
+    <Message Text="Building $(CONFIGURATION) Solution" />\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Message Text="Output=$(WebKit_OutputDir)" />\r
+    <MSBuild Projects="@(WTF)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />\r
+  </Target>\r
+\r
+  <Target Name="PostBuild" AfterTargets="Build">\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />\r
+ \r
+    <!-- Identify the files to copy over -->\r
+    <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="IncFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">\r
+       <Output TaskParameter="Include" ItemName="Bin32Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
+       <Output TaskParameter="Include" ItemName="Bin64Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">\r
+       <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">\r
+       <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">\r
+       <Output TaskParameter="Include" ItemName="Lib32Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">\r
+       <Output TaskParameter="Include" ItemName="Lib64Files" />\r
+    </CreateItem>\r
+ \r
+    <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
+    <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
+    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
+    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
+    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
+    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
+  </Target>\r
+\r
+</Project>\r
+\r

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 315ed61f978d96a956465fc5e42d4f287dc9dba3..c1352eeb19de4fe98c548b2f7fe487b8f8761213 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-24  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Convert some NMake files to MSBuild project files
+        https://bugs.webkit.org/show_bug.cgi?id=127579
+
+        Reviewed by Tim Horton.
+
+        * WebCore.vcxproj/WebCore.make: Removed.
+        * WebCore.vcxproj/WebCore.proj: Added.
+
 2014-01-24  Joseph Pecoraro  <pecoraro@apple.com>
 
         fast/profiler tests ASSERTing after moving recompileAllJSFunctions off a timer

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.make b/Source/WebCore/WebCore.vcxproj/WebCore.make
deleted file mode 100644 (file)
index dc7fbb2..0000000
--- a/Source/WebCore/WebCore.vcxproj/WebCore.make
+++ /dev/null
@@ -1,24 +0,0 @@
-!IF "$(BUILDSTYLE)"=="DEBUG"
-BUILDSTYLE=DebugSuffix
-!ELSE
-BUILDSTYLE=Production
-!ENDIF
-
-install:
-    set OFFICIAL_BUILD=1
-       set WebKit_Libraries=$(SRCROOT)\AppleInternal
-       set WebKit_OutputDir=$(OBJROOT)
-    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
-       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-       -mkdir 2>NUL "%ConfigurationBuildDir%\include\private"
-       xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
-       devenv "WebCore.submit.sln" /rebuild $(BUILDSTYLE)
-       xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y        
-       xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y    
-       xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
-    xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-    xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
-       xcopy "%ConfigurationBuildDir%\obj32\WebCore\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
-       -mkdir "$(DSTROOT)\AppleInternal\Sources32\WebCore"
-       xcopy "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\WebCore" /e/v/i/h/y

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.proj b/Source/WebCore/WebCore.vcxproj/WebCore.proj
new file mode 100644 (file)
index 0000000..1291004
--- /dev/null
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.proj
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project InitialTargets="PreBuild" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+\r
+  <!-- normalize configuration case -->\r
+  <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
+       <CONFIG>Production</CONFIG>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
+       <CONFIG>DebugSuffix</CONFIG>\r
+  </PropertyGroup>\r
+\r
+  <!-- Wrapper to build WebCore for both win32 and x64. -->\r
+  <PropertyGroup>\r
+    <OFFICIAL_BUILD>1</OFFICIAL_BUILD>\r
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>\r
+    <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>\r
+    <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>\r
+    <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>\r
+    <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>\r
+    <AppleInternalBin32>$(AppleInternal)\bin32</AppleInternalBin32>\r
+    <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>\r
+    <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>\r
+    <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>\r
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>\r
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>\r
+    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
+    <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
+  </PropertyGroup>\r
+\r
+  <ItemGroup>\r
+    <WebCore Include="WebCore.submit.sln">\r
+      <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
+    </WebCore>\r
+    <WebCore Include="WebCore.submit.sln">\r
+      <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
+    </WebCore>\r
+  </ItemGroup>\r
+ \r
+  <!-- Prepare for build -->\r
+  <Target Name="PreBuild" BeforeTargets="Build">\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />\r
+    <Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />\r
+    <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />\r
+ \r
+    <CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="PrivateIncFiles" />\r
+    </CreateItem>\r
+\r
+    <Copy SourceFiles="@(PrivateIncFiles)" DestinationFiles="@(PrivateIncFiles->'$(ConfigurationBuildDir)\include\private\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Message Text="Build output -> $(OBJROOT)" />\r
+    <Message Text="Final output -> $(DSTROOT)" />\r
+    <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\WebCore;$(DSTROOT)\AppleInternal\Sources64\WebCore" />\r
+  </Target>\r
+\r
+  <!-- Build WebCore Software -->\r
+  <Target Name="Build" AfterTargets="PreBuild">\r
+    <Message Text="Building $(CONFIGURATION) Solution" />\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Message Text="Output=$(WebKit_OutputDir)" />\r
+    <MSBuild Projects="@(WebCore)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />\r
+  </Target>\r
+\r
+  <Target Name="PostBuild" AfterTargets="Build">\r
+    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
+    <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />\r
+\r
+    <!-- Identify the files to copy over -->\r
+    <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="IncFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">\r
+      <Output TaskParameter="Include" ItemName="Bin32Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
+      <Output TaskParameter="Include" ItemName="Bin64Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">\r
+      <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">\r
+      <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">\r
+      <Output TaskParameter="Include" ItemName="Lib32Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">\r
+      <Output TaskParameter="Include" ItemName="Lib64Files" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="Derived32Sources" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\obj64\WebCore\DerivedSources\**\*.*">\r
+      <Output TaskParameter="Include" ItemName="Derived64Sources" />\r
+    </CreateItem>\r
+\r
+    <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
+    <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
+    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
+    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
+    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
+    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
+    <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+  </Target>\r
+\r
+</Project>\r
+\r