From 567f23965887abeee2901ba3f6014ee53d0ae6eb Mon Sep 17 00:00:00 2001
From: "bradnelson@google.com"
<bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 30 Mar 2009 20:14:38 +0000
Subject: [PATCH] Switching printing to gyp on windows.
Review URL: http://codereview.chromium.org/58002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12801 0039d316-1c4b-4281-b951-d872f2087c98
---
build/all.gyp | 4 +-
printing/printing.gyp | 1 +
printing/printing.vcproj | 147 -------------------------
printing/printing_unittests.vcproj | 165 -----------------------------
4 files changed, 3 insertions(+), 314 deletions(-)
delete mode 100644 printing/printing.vcproj
delete mode 100644 printing/printing_unittests.vcproj
diff --git a/build/all.gyp b/build/all.gyp
index 7c3f54bc2af71..3142a6b131440 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -22,8 +22,9 @@
'type': 'none',
'dependencies': [
'../base/base.gyp:*',
- '../net/net.gyp:*',
'../media/media.gyp:*',
+ '../net/net.gyp:*',
+ '../printing/printing.gyp:*',
],
'conditions': [
['OS=="linux"', {
@@ -39,7 +40,6 @@
['all_gyps', {
'dependencies': [
'../chrome/chrome.gyp:*',
- '../printing/printing.gyp:*',
'../sdch/sdch.gyp:*',
'../skia/skia.gyp:*',
'../testing/gtest.gyp:*',
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 9643c94becbfe..11fea0c59a2d1 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -42,6 +42,7 @@
{
'target_name': 'printing_unittests',
'type': 'executable',
+ 'msvs_guid': '8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E',
'dependencies': [
'printing',
'../testing/gtest.gyp:gtest',
diff --git a/printing/printing.vcproj b/printing/printing.vcproj
deleted file mode 100644
index bfc7f95033c46..0000000000000
--- a/printing/printing.vcproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="printing"
- ProjectGUID="{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}"
- RootNamespace="printing"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\printing.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\printing.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\units.cc"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\units.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/printing/printing_unittests.vcproj b/printing/printing_unittests.vcproj
deleted file mode 100644
index 9abeb90f3d6af..0000000000000
--- a/printing/printing_unittests.vcproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="printing_unittests"
- ProjectGUID="{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}"
- RootNamespace="printing_unittests"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\printing.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\printing.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="support"
- >
- <File
- RelativePath=".\run_all_unittests.cc"
- >
- </File>
- <File
- RelativePath="..\base\test_suite.h"
- >
- </File>
- </Filter>
- <Filter
- Name="tests"
- >
- <File
- RelativePath=".\units_unittest.cc"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
--
GitLab