Skip to content
Permalink
Browse files
Give MiniBrowser our standard set of configurations (minus the *_Cair…
…o variants)

MiniBrowser already had a configuration called "Release", but it was
using mostly the same settings as Debug. And its Debug configuration
was using the settings that Debug_Internal should be using.

Fixes <http://webkit.org/b/42746> MiniBrowser's build configurations
are screwy

Reviewed by Darin Adler.

* MiniBrowser/MiniBrowser.vcproj: Removed debug_internal.vsprops from
the Debug configuration. Remove debug.vsprops and
debug_internal.vsprops from the Release configuration and replace them
with release.vsprops. Added Debug_Internal and Debug_All
configurations.

Canonical link: https://commits.webkit.org/54663@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63826 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aroben committed Jul 21, 2010
1 parent 4c7afd9 commit 00921887cebe85cb3f657480c45ef89eed399d9f
Showing with 174 additions and 2 deletions.
  1. +20 −0 WebKitTools/ChangeLog
  2. +154 −2 WebKitTools/MiniBrowser/MiniBrowser.vcproj
@@ -1,3 +1,23 @@
2010-07-21 Adam Roben <aroben@apple.com>

Give MiniBrowser our standard set of configurations (minus the *_Cairo
variants)

MiniBrowser already had a configuration called "Release", but it was
using mostly the same settings as Debug. And its Debug configuration
was using the settings that Debug_Internal should be using.

Fixes <http://webkit.org/b/42746> MiniBrowser's build configurations
are screwy

Reviewed by Darin Adler.

* MiniBrowser/MiniBrowser.vcproj: Removed debug_internal.vsprops from
the Debug configuration. Remove debug.vsprops and
debug_internal.vsprops from the Release configuration and replace them
with release.vsprops. Added Debug_Internal and Debug_All
configurations.

2010-07-21 Adam Roben <aroben@apple.com>

Move MiniBrowser's settings to a vsprops file
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\Configurations\MiniBrowserCommon.vsprops"
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\Configurations\MiniBrowserCommon.vsprops"
UseOfATL="1"
CharacterSet="1"
>
@@ -86,7 +86,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\Configurations\MiniBrowserCommon.vsprops"
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\Configurations\MiniBrowserCommon.vsprops"
UseOfATL="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -150,6 +150,142 @@
CommandLine=""
/>
</Configuration>
<Configuration
Name="Debug_Internal|Win32"
ConfigurationType="1"
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\Configurations\MiniBrowserCommon.vsprops"
UseOfATL="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
TypeLibraryFile=""
ComponentFileName=""
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Debug_All|Win32"
ConfigurationType="1"
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;.\Configurations\MiniBrowserCommon.vsprops"
UseOfATL="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
TypeLibraryFile=""
ComponentFileName=""
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
</Configurations>
<References>
</References>
@@ -194,6 +330,22 @@
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Internal|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
</File>
</Filter>
<Filter

0 comments on commit 0092188

Please sign in to comment.