The VS generator handles file copies as AdditionalDependencies,

which means it tries to do the copy before the target is built
and we therefore can't attach the copy of npapi_layout_test_plugin.dll
to the target that builds it.  Work around this problem by
attaching the 'copies' setting to 'test_shell_common', which is
the one target that depends on the 'npapi_layout_test_plugin' target.
Review URL: http://codereview.chromium.org/115120

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

2 files changed, 34 insertions, 12 deletions

diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index b5f4a5a..d86f00c 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -1534,6 +1534,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inspector_resources", "..\w
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_common", "..\webkit\tools\test_shell\test_shell_common.vcproj", "{77C32787-1B96-CB84-B905-7F170629F0AC}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
 		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
 		{5330F8EE-00F5-D65C-166E-E3150171055D} = {5330F8EE-00F5-D65C-166E-E3150171055D}
@@ -1541,6 +1542,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_common", "..\web
 		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
 		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index c060f22..ad29b5d 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -141,6 +141,20 @@
             '../../../build/temp_gyp/breakpad.gyp:breakpad_handler',
             '../../default_plugin/default_plugin.gyp:default_plugin',
           ],
+          # TODO(bradnelson):  
+          # This should really be done in the 'npapi_layout_test_plugin'
+          # target, but the current VS generator handles 'copies'
+          # settings as AdditionalDependencies, which means that
+          # when it's over there, it tries to do the copy *before*
+          # the file is built, instead of after.  We work around this
+          # by attaching the copy here, since it depends on that
+          # target.
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/plugins',
+              'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
+            },
+          ],
         }, {  # else: OS!=win
           'sources/': [
             ['exclude', '_win\\.cc$'],
@@ -289,18 +303,24 @@
             '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
             '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
           ],
-        }, { # OS == "win"
-          # The old VS build would explicitly copy the .dll into the
-          # plugins subdirectory like this.  It might be possible to
-          # use the 'product_dir' setting to build directly into
-          # plugins/ (as is done on Linux), but we'd need to verify
-          # that nothing breaks first.
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)/plugins',
-              'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
-            },
-          ],
+        # TODO(bradnelson):
+        # This copy should really live here, as a post-build step,
+        # but it's currently being implemented via
+        # AdditionalDependencies, which tries to do the copy before
+        # the file is built...
+        #
+        #}, { # OS == "win"
+        #  # The old VS build would explicitly copy the .dll into the
+        #  # plugins subdirectory like this.  It might be possible to
+        #  # use the 'product_dir' setting to build directly into
+        #  # plugins/ (as is done on Linux), but we'd need to verify
+        #  # that nothing breaks first.
+        #  'copies': [
+        #    {
+        #      'destination': '<(PRODUCT_DIR)/plugins',
+        #      'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
+        #    },
+        #  ],
         }],
         ['OS=="mac"', {
           'link_settings': {