Convert tcmalloc (and its modified libcmt) to building with gyp.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119265

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17828 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 157 insertions, 242 deletions

diff --git a/third_party/tcmalloc/prep_libc.sh b/third_party/tcmalloc/prep_libc.sh
index 4f0eb4d..8b3b95b 100644
--- a/third_party/tcmalloc/prep_libc.sh
+++ b/third_party/tcmalloc/prep_libc.sh
@@ -15,7 +15,7 @@ LIBCMTPDB="${1}\\libcmt.pdb"
 OUTDIR=$2
 OUTCMT="${2}\\libcmt.lib"
 
-mkdir $OUTDIR
+mkdir -p $OUTDIR
 cp "$LIBCMT" "$OUTDIR"
 cp "$LIBCMTPDB" "$OUTDIR"
 
@@ -29,6 +29,6 @@ OBJFILES="malloc.obj free.obj realloc.obj new.obj delete.obj new2.obj delete2.ob
 
 for FILE in $OBJFILES
 do
-  LIB /IGNORE:4006,4221 /REMOVE:${LIBCMTSRCPATHVS2005}${FILE} $OUTCMT
-  LIB /IGNORE:4006,4221 /REMOVE:${LIBCMTSRCPATHVS2008}${FILE} $OUTCMT
+  LIB /IGNORE:4006,4014,4221 /REMOVE:${LIBCMTSRCPATHVS2005}${FILE} $OUTCMT
+  LIB /IGNORE:4006,4014,4221 /REMOVE:${LIBCMTSRCPATHVS2008}${FILE} $OUTCMT
 done
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
new file mode 100644
index 0000000..f7e6168
--- /dev/null
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -0,0 +1,97 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'includes': [
+    '../../build/common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'tcmalloc',
+      'type': '<(library)',
+      'msvs_guid': 'C564F145-9172-42C3-BFCB-60FDEA124321',
+      'dependencies': [
+        'libcmt',
+      ],
+      'include_dirs': [
+        '.',
+        'tcmalloc/src/windows',
+        'tcmalloc/src/base',
+        'tcmalloc/src',
+      ],
+      'direct_dependent_settings': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
+            'AdditionalDependencies': [
+              '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib'
+            ],
+          },
+        },
+      },
+      'sources': [
+        'tcmalloc/src/base/dynamic_annotations.cc',
+        'tcmalloc/src/base/logging.cc',
+        'tcmalloc/src/base/low_level_alloc.cc',
+        'tcmalloc/src/base/spinlock.cc',
+        'tcmalloc/src/base/sysinfo.cc',
+        'tcmalloc/src/central_freelist.cc',
+        'tcmalloc/src/common.cc',
+        'tcmalloc/src/heap-profile-table.cc',
+        'tcmalloc/src/internal_logging.cc',
+        'tcmalloc/src/malloc_extension.cc',
+        'tcmalloc/src/malloc_hook.cc',
+        'tcmalloc/src/page_heap.cc',
+        'tcmalloc/src/sampler.cc',
+        'tcmalloc/src/span.cc',
+        'tcmalloc/src/stack_trace_table.cc',
+        'tcmalloc/src/stacktrace.cc',
+        'tcmalloc/src/static_vars.cc',
+        'tcmalloc/src/thread_cache.cc',
+        'tcmalloc/src/windows/override_functions.cc',
+        'tcmalloc/src/windows/port.cc',
+      ],
+      'msvs_settings': {
+        # TODO(sgk):  merge this with build/common.gypi settings
+        'VCLibrarianTool=': {
+          'AdditionalOptions': '/ignore:4006,4221',
+          'AdditionalLibraryDirectories':
+            '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib',
+        },
+        'VCLinkerTool': {
+          'AdditionalOptions': '/ignore:4006',
+        },
+      },
+      'configurations': {
+        'Debug': {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'RuntimeLibrary': '0',
+            },
+          },
+        },
+      },
+    },
+    {
+      'target_name': 'libcmt',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'libcmt',
+          'inputs': [
+            'prep_libc.sh',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib',
+          ],
+          'action': [
+            './prep_libc.sh',
+            '$(VCInstallDir)lib',
+            '<(SHARED_INTERMEDIATE_DIR)/tcmalloc',
+          ],
+        },
+      ],
+    },
+  ],
+}
diff --git a/third_party/tcmalloc/tcmalloc.vcproj b/third_party/tcmalloc/tcmalloc.vcproj
index 8412803..2aad06d 100644
--- a/third_party/tcmalloc/tcmalloc.vcproj
+++ b/third_party/tcmalloc/tcmalloc.vcproj
@@ -1,240 +1,58 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="tcmalloc"

-	ProjectGUID="{C564F145-9172-42C3-BFCB-60FDEA124321}"

-	RootNamespace="tcmalloc"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)\obj\$(ProjectName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="..\..\build\debug.vsprops;..\..\build\external_code.vsprops"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;tcmalloc\src\windows;tcmalloc\src\base;tcmalloc\src"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="0"

-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/ignore:4221"

-				OutputFile="$(OutDir)\lib\$(ProjectName).lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(ProjectDir)..\..\third_party\cygwin\setup_env.bat &amp;&amp; set INTDIR=$(IntDir) &amp;&amp; set OUTDIR=$(OutDir) &amp;&amp; bash -c &quot;\&quot;./prep_libc.sh\&quot; \&quot;$(VCInstallDir)lib\&quot; \&quot;`cygpath -m \&quot;${INTDIR}\&quot;`\&quot;&quot;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			ConfigurationType="4"

-			InheritedPropertySheets="..\..\build\release.vsprops;..\..\build\external_code.vsprops"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=".;tcmalloc\src\windows;tcmalloc\src\base;tcmalloc\src"

-				MinimalRebuild="false"

-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/ignore:4221"

-				OutputFile="$(OutDir)\lib\$(ProjectName).lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(ProjectDir)..\..\third_party\cygwin\setup_env.bat &amp;&amp; set INTDIR=$(IntDir) &amp;&amp; set OUTDIR=$(OutDir) &amp;&amp; bash -c &quot;\&quot;./prep_libc.sh\&quot; \&quot;$(VCInstallDir)lib\&quot; \&quot;`cygpath -m \&quot;${INTDIR}\&quot;`\&quot;&quot;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="tcmalloc"

-			>

-			<Filter

-				Name="src"

-				>

-				<File

-					RelativePath="tcmalloc\src\central_freelist.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\common.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\heap-profile-table.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\internal_logging.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\malloc_extension.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\malloc_hook.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\page_heap.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\sampler.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\span.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\stack_trace_table.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\stacktrace.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\static_vars.cc"

-					>

-				</File>

-				<File

-					RelativePath="tcmalloc\src\thread_cache.cc"

-					>

-				</File>

-				<Filter

-					Name="windows"

-					>

-					<File

-						RelativePath=".\tcmalloc\src\windows\override_functions.cc"

-						>

-					</File>

-					<File

-						RelativePath="tcmalloc\src\windows\port.cc"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="base"

-					>

-					<File

-						RelativePath="tcmalloc\src\base\dynamic_annotations.cc"

-						>

-					</File>

-					<File

-						RelativePath="tcmalloc\src\base\logging.cc"

-						>

-					</File>

-					<File

-						RelativePath="tcmalloc\src\base\low_level_alloc.cc"

-						>

-					</File>

-					<File

-						RelativePath=".\tcmalloc\src\base\spinlock.cc"

-						>

-					</File>

-					<File

-						RelativePath="tcmalloc\src\base\sysinfo.cc"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject Keyword="Win32Proj" Name="tcmalloc" ProjectGUID="{C564F145-9172-42C3-BFCB-60FDEA124321}" ProjectType="Visual C++" RootNamespace="tcmalloc" Version="8.00">

+  <Platforms>

+    <Platform Name="Win32"/>

+  </Platforms>

+  <ToolFiles/>

+  <Configurations>

+    <Configuration CharacterSet="1" ConfigurationType="4" InheritedPropertySheets="" IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">

+      <Tool AdditionalIncludeDirectories="..\..;..\..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include;.;tcmalloc\src\windows;tcmalloc\src\base;tcmalloc\src" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CHROMIUM_BUILD"/>

+      <Tool AdditionalDependencies="wininet.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib dbghelp.lib" AdditionalLibraryDirectories="..\../third_party/platformsdk_win2008_6_1/files/Lib" AdditionalOptions="/ignore:4006" DelayLoadDLLs="dbghelp.dll,dwmapi.dll,uxtheme.dll" FixedBaseAddress="1" GenerateDebugInformation="true" ImportLibrary="$(OutDir)\lib\$(TargetName).lib" LinkIncremental="2" MapFileName="$(OutDir)\$(TargetName).map" Name="VCLinkerTool" SubSystem="1" TargetMachine="1"/>

+      <Tool AdditionalIncludeDirectories="..\..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include;.;tcmalloc\src\windows;tcmalloc\src\base;tcmalloc\src" BasicRuntimeChecks="3" BufferSecurityCheck="true" DebugInformationFormat="3" Detect64BitPortabilityProblems="false" DisableSpecificWarnings="4396;4503;4819;4800" EnableFunctionLevelLinking="true" ExceptionHandling="0" MinimalRebuild="false" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CHROMIUM_BUILD" ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb" RuntimeLibrary="0" RuntimeTypeInfo="false" WarnAsError="false" WarningLevel="3"/>

+      <Tool AdditionalLibraryDirectories="..\../third_party/platformsdk_win2008_6_1/files/Lib" AdditionalOptions="/ignore:4221" Name="VCLibrarianTool" OutputFile="$(OutDir)\lib\$(ProjectName).lib"/>

+      <Tool DLLDataFileName="dlldata.c" GenerateStublessProxies="true" HeaderFileName="$(InputName).h" InterfaceIdentifierFileName="$(InputName)_i.c" Name="VCMIDLTool" OutputDirectory="$(IntDir)" ProxyFileName="$(InputName)_p.c" TypeLibraryName="$(InputName).tlb"/>

+      <Tool AdditionalLibraryDirectories="..\../third_party/platformsdk_win2008_6_1/files/Lib" AdditionalOptions="/ignore:4006,4221" Name="VCLibrarianTool="/>

+    </Configuration>

+    <Configuration ConfigurationType="4" InheritedPropertySheets="..\..\build\release.vsprops" Name="Release|Win32">

+      <Tool AdditionalIncludeDirectories="..\..;..\..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include;.;tcmalloc\src\windows;tcmalloc\src\base;tcmalloc\src" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CHROMIUM_BUILD;NDEBUG"/>

+      <Tool AdditionalDependencies="wininet.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib dbghelp.lib" AdditionalLibraryDirectories="..\../third_party/platformsdk_win2008_6_1/files/Lib" AdditionalOptions="/ignore:4006" DelayLoadDLLs="dbghelp.dll,dwmapi.dll,uxtheme.dll" FixedBaseAddress="1" GenerateDebugInformation="true" ImportLibrary="$(OutDir)\lib\$(TargetName).lib" LinkIncremental="1" MapFileName="$(OutDir)\$(TargetName).map" Name="VCLinkerTool" SubSystem="1" TargetMachine="1"/>

+      <Tool AdditionalIncludeDirectories="..\..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include;.;tcmalloc\src\windows;tcmalloc\src\base;tcmalloc\src" BufferSecurityCheck="true" DebugInformationFormat="3" Detect64BitPortabilityProblems="false" DisableSpecificWarnings="4396;4503;4819;4800" EnableFunctionLevelLinking="true" ExceptionHandling="0" MinimalRebuild="false" Name="VCCLCompilerTool" PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CHROMIUM_BUILD;NDEBUG" ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb" RuntimeTypeInfo="false" WarnAsError="false" WarningLevel="3"/>

+      <Tool AdditionalLibraryDirectories="..\../third_party/platformsdk_win2008_6_1/files/Lib" AdditionalOptions="/ignore:4221" Name="VCLibrarianTool" OutputFile="$(OutDir)\lib\$(ProjectName).lib"/>

+      <Tool DLLDataFileName="dlldata.c" GenerateStublessProxies="true" HeaderFileName="$(InputName).h" InterfaceIdentifierFileName="$(InputName)_i.c" Name="VCMIDLTool" OutputDirectory="$(IntDir)" ProxyFileName="$(InputName)_p.c" TypeLibraryName="$(InputName).tlb"/>

+      <Tool AdditionalLibraryDirectories="..\../third_party/platformsdk_win2008_6_1/files/Lib" AdditionalOptions="/ignore:4006,4221" Name="VCLibrarianTool="/>

+    </Configuration>

+  </Configurations>

+  <References/>

+  <Files>

+    <File RelativePath="tcmalloc.gyp"/>

+    <Filter Name="tcmalloc">

+      <Filter Name="src">

+        <File RelativePath="tcmalloc\src\page_heap.cc"/>

+        <File RelativePath="tcmalloc\src\sampler.cc"/>

+        <File RelativePath="tcmalloc\src\internal_logging.cc"/>

+        <File RelativePath="tcmalloc\src\common.cc"/>

+        <File RelativePath="tcmalloc\src\span.cc"/>

+        <File RelativePath="tcmalloc\src\stack_trace_table.cc"/>

+        <File RelativePath="tcmalloc\src\thread_cache.cc"/>

+        <File RelativePath="tcmalloc\src\malloc_hook.cc"/>

+        <File RelativePath="tcmalloc\src\malloc_extension.cc"/>

+        <File RelativePath="tcmalloc\src\static_vars.cc"/>

+        <File RelativePath="tcmalloc\src\heap-profile-table.cc"/>

+        <File RelativePath="tcmalloc\src\central_freelist.cc"/>

+        <File RelativePath="tcmalloc\src\stacktrace.cc"/>

+        <Filter Name="windows">

+          <File RelativePath="tcmalloc\src\windows\port.cc"/>

+          <File RelativePath="tcmalloc\src\windows\override_functions.cc"/>

+        </Filter>

+        <Filter Name="base">

+          <File RelativePath="tcmalloc\src\base\sysinfo.cc"/>

+          <File RelativePath="tcmalloc\src\base\dynamic_annotations.cc"/>

+          <File RelativePath="tcmalloc\src\base\logging.cc"/>

+          <File RelativePath="tcmalloc\src\base\low_level_alloc.cc"/>

+          <File RelativePath="tcmalloc\src\base\spinlock.cc"/>

+        </Filter>

+      </Filter>

+    </Filter>

+  </Files>

+  <Globals/>

 </VisualStudioProject>