Conditionally added pepper_test_plugin.gyp as all.gyp dependency based on whether enable_pepper variable is set to 1. Defaults to 0.

Added run_as block to automatically launch chrome and load the plugin when the pepper_test_plugin project is run or debugged.
See new instructions in updated README.
TEST=none
BUG=none

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

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

2 files changed, 61 insertions, 42 deletions

diff --git a/webkit/tools/pepper_test_plugin/README b/webkit/tools/pepper_test_plugin/README
index 5af73ad..96c6397 100644
--- a/webkit/tools/pepper_test_plugin/README
+++ b/webkit/tools/pepper_test_plugin/README
@@ -1,12 +1,22 @@
 This is a test plugin for manual testing of the Pepper plugin API. See
   https://wiki.mozilla.org/Plugins:PlatformIndependentNPAPI
 
-To generate a project from the gyp file, use:
-  python ..\..\..\build\gyp_chromium pepper_test_plugin.gyp
-
-You need to enable PEPPER_APIS_ENABLED in src\chrome\renderer\render_view.cc in your Chrome build.
+To generate a project from the gyp file, set the GYP_DEFINES environment
+variable to "enable_pepper=1". From a Windows command prompt:
+  set GYP_DEFINES=enable_pepper=1
+  
+Then rebuild the project files:
+  gclient runhooks --force
+  
+Then open the Chrome all.sln solution and rebuild the pepper_test_plugin and
+chrome projects.
 
 To load this plugin in Chrome, use the command line flags:
   --no-sandbox
   --load-plugin=<<<YOUR CHECKOUT ROOT>>\src\webkit\tools\pepper_test_plugin\Debug\pepper_test_plugin.dll
-  
\ No newline at end of file
+  
+A simple way to launch Chrome with these command line flags is to run the
+generated pepper_test_plugin project.
+
+Note that pepper_test_plugin is not dependent on the chrome project so you
+need to remember to build Chrome separately if necessary.
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
index 8b1faba..f7a65b4 100644
--- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
+++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
@@ -1,37 +1,46 @@
-

-{

-  'targets': [

-    {

-      'target_name': 'pepper_test_plugin',

-      'type': 'shared_library',

-      'dependencies': [

-        '../../../base/base.gyp:base',

-        '../../../skia/skia.gyp:skia',

-        '../../../third_party/npapi/npapi.gyp:npapi',

-      ],

-      'include_dirs': [

-        '../../..',  # Root of Chrome Checkout

-      ],

-      'defines': [

-        'PEPPER_APIS_ENABLED',

-      ],

-      'conditions': [

-        ['OS=="win"', {

-          'product_name': 'pepper_test_plugin',

-          'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A',

-          'sources': [

-            'pepper_test_plugin.def',

-            'pepper_test_plugin.rc',

-          ],

-        }]

-      ],

-      'sources': [

-        'main.cc',

-        'plugin_object.cc',

-        'plugin_object.h',

-        'test_object.cc',

-        'test_object.h',

-      ],

-    }

-  ],

-}

+
+{
+  'targets': [
+    {
+      'target_name': 'pepper_test_plugin',
+      'type': 'shared_library',
+      'dependencies': [
+        '../../../base/base.gyp:base',
+        '../../../skia/skia.gyp:skia',
+        '../../../third_party/npapi/npapi.gyp:npapi',
+      ],
+      'include_dirs': [
+        '../../..',  # Root of Chrome Checkout
+      ],
+      'defines': [
+        'PEPPER_APIS_ENABLED',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'product_name': 'pepper_test_plugin',
+          'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A',
+          'sources': [
+            'pepper_test_plugin.def',
+            'pepper_test_plugin.rc',
+          ],
+        }]
+      ],
+      'sources': [
+        'main.cc',
+        'plugin_object.cc',
+        'plugin_object.h',
+        'test_object.cc',
+        'test_object.h',
+      ],
+      'run_as': {
+        'working_directory': '.',
+        'action': [
+          '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
+          '--no-sandbox',
+          '--load-plugin=$(TargetPath)',
+          'test_page.html',
+        ],
+      },
+    }
+  ],
+}