From 665a25f57ff6b21be3f6a87755ab784d6c18f9e5 Mon Sep 17 00:00:00 2001
From: "bradnelson@google.com"
 <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 7 Apr 2009 05:31:48 +0000
Subject: Moving activex shim to gyp.

Review URL: http://codereview.chromium.org/62089

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13229 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/all.gyp                                   |   2 +
 webkit/activex_shim/activex_shim.gyp            |  82 +++++-----
 webkit/activex_shim/activex_shim.vcproj         | 204 ------------------------
 webkit/activex_shim_dll/activex_shim_dll.gyp    |  54 ++++---
 webkit/activex_shim_dll/activex_shim_dll.vcproj | 162 -------------------
 5 files changed, 81 insertions(+), 423 deletions(-)
 delete mode 100644 webkit/activex_shim/activex_shim.vcproj
 delete mode 100644 webkit/activex_shim_dll/activex_shim_dll.vcproj

diff --git a/build/all.gyp b/build/all.gyp
index 758a49f..995e690 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -50,6 +50,8 @@
         ['OS=="win"', {
           'dependencies': [
             '../sandbox/sandbox.gyp:*',
+            '../webkit/activex_shim/activex_shim.gyp:*',
+            '../webkit/activex_shim_dll/activex_shim_dll.gyp:*',
             'temp_gyp/breakpad.gyp:*',
           ],
         }, {
diff --git a/webkit/activex_shim/activex_shim.gyp b/webkit/activex_shim/activex_shim.gyp
index 69b20e6..8addf20 100644
--- a/webkit/activex_shim/activex_shim.gyp
+++ b/webkit/activex_shim/activex_shim.gyp
@@ -9,42 +9,52 @@
   'includes': [
     '../../build/common.gypi',
   ],
-  'targets': [
-    {
-      'target_name': 'activex_shim',
-      'type': 'static_library',
-      'msvs_guid': 'F4F4BCAA-EA59-445C-A119-3E6C29647A51',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../third_party/npapi/npapi.gyp:npapi',
-        '../../build/temp_gyp/googleurl.gyp:googleurl',
+  'conditions': [
+    [ 'OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'activex_shim',
+          'type': 'static_library',
+          'msvs_guid': 'F4F4BCAA-EA59-445C-A119-3E6C29647A51',
+          'dependencies': [
+            '../../base/base.gyp:base',
+            '../../third_party/npapi/npapi.gyp:npapi',
+            '../../build/temp_gyp/googleurl.gyp:googleurl',
+          ],
+          'sources': [
+            'activex_plugin.cc',
+            'activex_plugin.h',
+            'activex_shared.cc',
+            'activex_shared.h',
+            'activex_util.cc',
+            'activex_util.h',
+            'dispatch_object.cc',
+            'dispatch_object.h',
+            'ihtmldocument_impl.h',
+            'iwebbrowser_impl.h',
+            'npn_scripting.cc',
+            'npn_scripting.h',
+            'npp_impl.cc',
+            'npp_impl.h',
+            'README',
+            'web_activex_container.cc',
+            'web_activex_container.h',
+            'web_activex_site.cc',
+            'web_activex_site.h',
+          ],
+          # TODO(bradnelson): Add direct support for this kind of thing to gyp.
+          'msvs_settings': {
+            'VCLibrarianTool': {
+              'AdditionalDependencies': 'urlmon.lib',
+            },
+          },
+          'link_settings': {
+            'libraries': [
+              '-lurlmon.lib',
+            ],
+          },
+        },
       ],
-      'sources': [
-        'activex_plugin.cc',
-        'activex_plugin.h',
-        'activex_shared.cc',
-        'activex_shared.h',
-        'activex_util.cc',
-        'activex_util.h',
-        'dispatch_object.cc',
-        'dispatch_object.h',
-        'ihtmldocument_impl.h',
-        'iwebbrowser_impl.h',
-        'npn_scripting.cc',
-        'npn_scripting.h',
-        'npp_impl.cc',
-        'npp_impl.h',
-        'README',
-        'web_activex_container.cc',
-        'web_activex_container.h',
-        'web_activex_site.cc',
-        'web_activex_site.h',
-      ],
-      'link_settings': {
-        'libraries': [
-          '-lurlmon.lib',
-        ],
-      },
-    },
+    }],
   ],
 }
diff --git a/webkit/activex_shim/activex_shim.vcproj b/webkit/activex_shim/activex_shim.vcproj
deleted file mode 100644
index 26d4adc..0000000
--- a/webkit/activex_shim/activex_shim.vcproj
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="activex_shim"
-	ProjectGUID="{F4F4BCAA-EA59-445C-A119-3E6C29647A51}"
-	RootNamespace="activex_shim"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\activex_shim.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="TRACK_INTERFACE"
-			/>
-			<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;.\activex_shim.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>
-		<File
-			RelativePath=".\activex_plugin.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\activex_plugin.h"
-			>
-		</File>
-		<File
-			RelativePath=".\activex_shared.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\activex_shared.h"
-			>
-		</File>
-		<File
-			RelativePath=".\activex_util.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\activex_util.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dispatch_object.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\dispatch_object.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ihtmldocument_impl.h"
-			>
-		</File>
-		<File
-			RelativePath=".\iwebbrowser_impl.h"
-			>
-		</File>
-		<File
-			RelativePath=".\npn_scripting.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\npn_scripting.h"
-			>
-		</File>
-		<File
-			RelativePath=".\npp_impl.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\npp_impl.h"
-			>
-		</File>
-		<File
-			RelativePath=".\README"
-			>
-		</File>
-		<File
-			RelativePath=".\web_activex_container.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\web_activex_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\web_activex_site.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\web_activex_site.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/webkit/activex_shim_dll/activex_shim_dll.gyp b/webkit/activex_shim_dll/activex_shim_dll.gyp
index 2a6731d..2b70f84 100644
--- a/webkit/activex_shim_dll/activex_shim_dll.gyp
+++ b/webkit/activex_shim_dll/activex_shim_dll.gyp
@@ -9,27 +9,39 @@
   'includes': [
     '../../build/common.gypi',
   ],
-  'targets': [
-    {
-      'target_name': 'activex_shim_dll',
-      'type': 'shared_library',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../third_party/npapi/npapi.gyp:npapi',
-        '../activex_shim/activex_shim.gyp:activex_shim',
+  'conditions': [
+    [ 'OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'activex_shim_dll',
+          'type': 'shared_library',
+          'dependencies': [
+            '../../base/base.gyp:base',
+            '../../third_party/npapi/npapi.gyp:npapi',
+            '../activex_shim/activex_shim.gyp:activex_shim',
+          ],
+          'msvs_guid': '494E414B-1655-48CE-996D-6413ECFB7829',
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'RegisterOutput': 'false',
+              'IgnoreImportLibrary': 'true',
+              'OutputFile': '$(OutDir)/npaxshim.dll',
+              'ModuleDefinitionFile': 'activex_shim_dll.def',
+            },
+          },
+          'sources': [
+            'activex_shim_dll.cc',
+            'activex_shim_dll.def',
+            'activex_shim_dll.rc',
+            'resource.h',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lurlmon.lib',
+            ],
+          },
+        },
       ],
-      'msvs_guid': '494E414B-1655-48CE-996D-6413ECFB7829',
-      'sources': [
-        'activex_shim_dll.cc',
-        'activex_shim_dll.def',
-        'activex_shim_dll.rc',
-        'resource.h',
-      ],
-      'link_settings': {
-        'libraries': [
-          '-lurlmon.lib',
-        ],
-      },
-    },
+    }],
   ],
 }
diff --git a/webkit/activex_shim_dll/activex_shim_dll.vcproj b/webkit/activex_shim_dll/activex_shim_dll.vcproj
deleted file mode 100644
index 7ac5c2f..0000000
--- a/webkit/activex_shim_dll/activex_shim_dll.vcproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="activex_shim_dll"
-	ProjectGUID="{494E414B-1655-48CE-996D-6413ECFB7829}"
-	RootNamespace="activex_shim_dll"
-	Keyword="AtlProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\activex_shim_dll.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="TRACK_INTERFACE"
-			/>
-			<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="2"
-			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\activex_shim_dll.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>
-		<File
-			RelativePath=".\activex_shim_dll.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\activex_shim_dll.def"
-			>
-		</File>
-		<File
-			RelativePath=".\activex_shim_dll.rc"
-			>
-		</File>
-		<File
-			RelativePath=".\resource.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
-- 
cgit v1.1