git://git.webkit.org / WebKit-https.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix internal Windows build
[WebKit-https.git] / Source / WebKit / WebKit.vcxproj / WebKit.proj
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.proj b/Source/WebKit/WebKit.vcxproj/WebKit.proj
index e830f80..ac80d16 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit.proj
+++ b/Source/WebKit/WebKit.vcxproj/WebKit.proj
@@ -3,19 +3,20 @@
 \r
   <!-- normalize configuration case -->\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
-       <CONFIG>Production</CONFIG>\r
+       <CONFIG>Release</CONFIG>\r
     <DebugSuffix></DebugSuffix>\r
+    <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
-       <CONFIG>DebugSuffix</CONFIG>\r
+       <CONFIG>Debug</CONFIG>\r
     <DebugSuffix>_debug</DebugSuffix>\r
+    <DebugSuffixDefinition>-DDEBUG_SUFFIX=_debug</DebugSuffixDefinition>\r
   </PropertyGroup>\r
 \r
   <!-- Wrapper to build WebKit 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
@@ -27,24 +28,17 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>\r
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
     <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
+       <CMakeCommandCommon>cmake $(SRCROOT) -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('\','/'))</CMakeCommandCommon>\r
   </PropertyGroup>\r
-\r
-  <ItemGroup>\r
-    <WebKit Include="WebKit.submit.sln">\r
-      <AdditionalProperties>Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
-    </WebKit>\r
-    <WebKit Include="WebKit.submit.sln">\r
-      <AdditionalProperties>Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD)</AdditionalProperties>\r
-    </WebKit>\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
+    <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />\r
     <Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />\r
-    <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(ConfigurationBuildDir)\include\private" />\r
- \r
+    <MakeDir Directories="$(DSTROOT);$(OBJROOT);$(OBJROOT)/$(CONFIG);$(ConfigurationBuildDir)\include\private;$(OBJROOT)/$(CONFIG)/build32;$(OBJROOT)/$(CONFIG)/build64" />\r
+\r
     <CreateItem Include="$(WebKit_Libraries)\include\private\**\*.*">\r
       <Output TaskParameter="Include" ItemName="PrivateIncFiles" />\r
     </CreateItem>\r
@@ -54,15 +48,16 @@
     <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)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />\r
-    <MakeDir Directories="$(DSTROOT)\AppleInternal\Sources32\WebKit;$(DSTROOT)\AppleInternal\Sources64\WebKit" />\r
   </Target>\r
 \r
   <!-- Build WebKit 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="@(WebKit)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />\r
+       <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>\r
+       <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>\r
+       <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>\r
+       <Exec Command="msbuild Project.sln" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>\r
   </Target>\r
 \r
   <Target Name="PostBuild" AfterTargets="Build">\r
@@ -70,53 +65,53 @@
     <Message Text="Moving $(CONFIG) build results to $(DSTROOT)" />\r
 \r
     <!-- Identify the files to copy over -->\r
-    <CreateItem Include="$(ConfigurationBuildDir)\include\**\*.*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebKit\**\*.*">\r
       <Output TaskParameter="Include" ItemName="IncFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">\r
       <Output TaskParameter="Include" ItemName="Bin32Files" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*">\r
       <Output TaskParameter="Include" ItemName="Bin64Files" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit$(DebugSuffix).dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit$(DebugSuffix).dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin32\*.resources">\r
       <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.resources">\r
       <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*.pdb">\r
       <Output TaskParameter="Include" ItemName="Bin32SymbolFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\*.pdb">\r
       <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.resources\**\*.*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\WebKit.resources\**\*.*">\r
       <Output TaskParameter="Include" ItemName="Bin32Resources" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.resources\**\*.*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\bin64\WebKit.resources\**\*.*">\r
       <Output TaskParameter="Include" ItemName="Bin64Resources" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\lib32\*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\lib32\*">\r
       <Output TaskParameter="Include" ItemName="Lib32Files" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\lib64\*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\lib64\*">\r
       <Output TaskParameter="Include" ItemName="Lib64Files" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\obj32\WebKit\DerivedSources\**\*.*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build64\obj32\WebKit\DerivedSources\**\*.*">\r
       <Output TaskParameter="Include" ItemName="Derived32Sources" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\obj64\WebKit\DerivedSources\**\*.*">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\obj64\WebKit\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="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
@@ -129,8 +124,6 @@
     <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
-    <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />\r
-    <Copy SourceFiles="@(Derived64Sources)" DestinationFiles="@(Derived64Sources->'$(DSTROOT)\AppleInternal\Sources64\WebKit\%(RecursiveDir)%(Filename)%(Extension)')" />\r
   </Target>\r
 \r
 </Project>\r
Mirror of the WebKit open source project from svn.webkit.org.