Add build rules for Pepper 3D demos on the Mac.

BUG=none
TEST=cd gpu.demos; open demos.xcodeproj; select any of the "Run *" targets, then use cmd-b (build).

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

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

2 files changed, 83 insertions, 14 deletions

diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index 40fd7dc..bd2c5f7 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -69,13 +69,26 @@
           'framework/main_pepper.cc',
         ],
         'run_as': {
-          'action': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
-            '--no-sandbox',
-            '--internal-pepper',
-            '--enable-gpu-plugin',
-            '--load-plugin=$(TargetPath)',
-            'file://$(ProjectDir)pepper_gpu_demo.html',
+          'conditions': [
+            ['OS=="mac"', {
+              'action': [
+                '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium',
+                '--no-sandbox',
+                '--internal-pepper',
+                '--enable-gpu-plugin',
+                '--load-plugin=<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin',
+                'file://$(SOURCE_ROOT)/pepper_gpu_demo.html',
+              ],
+             }, { # OS != "mac"
+              'action': [
+                '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
+                '--no-sandbox',
+                '--internal-pepper',
+                '--enable-gpu-plugin',
+                '--load-plugin=$(TargetPath)',
+                'file://$(ProjectDir)pepper_gpu_demo.html',
+              ],
+            }],
           ],
         },
         'conditions': [
@@ -89,6 +102,16 @@
             # -gstabs, used in the official builds, causes an ICE. Remove it.
             'cflags!': ['-gstabs'],
           }],
+          ['OS=="mac"', {
+            'sources': [
+              'framework/Plugin_Info.plist',
+            ],
+            'xcode_settings': {
+              'INFOPLIST_FILE': 'framework/Plugin_Info.plist',
+            },
+            'mac_bundle': 1,
+            'product_extension': 'plugin',
+          }],
         ],
       },
     },
@@ -182,7 +205,7 @@
       'targets': [
         {
           'target_name': 'hello_triangle_pepper',
-          'type': 'shared_library',
+          'type': 'loadable_module',
           'dependencies': [
             'gpu_demo_framework_pepper',
             '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
@@ -194,7 +217,7 @@
         },
         {
           'target_name': 'mip_map_2d_pepper',
-          'type': 'shared_library',
+          'type': 'loadable_module',
           'dependencies': [
             'gpu_demo_framework_pepper',
             '../../third_party/gles2_book/gles2_book.gyp:mip_map_2d',
@@ -206,7 +229,7 @@
         },
         {
           'target_name': 'simple_texture_2d_pepper',
-          'type': 'shared_library',
+          'type': 'loadable_module',
           'dependencies': [
             'gpu_demo_framework_pepper',
             '../../third_party/gles2_book/gles2_book.gyp:simple_texture_2d',
@@ -218,7 +241,7 @@
         },
         {
           'target_name': 'simple_texture_cubemap_pepper',
-          'type': 'shared_library',
+          'type': 'loadable_module',
           'dependencies': [
             'gpu_demo_framework_pepper',
             '../../third_party/gles2_book/gles2_book.gyp:simple_texture_cubemap',
@@ -230,7 +253,7 @@
         },
         {
           'target_name': 'simple_vertex_shader_pepper',
-          'type': 'shared_library',
+          'type': 'loadable_module',
           'dependencies': [
             'gpu_demo_framework_pepper',
             '../../third_party/gles2_book/gles2_book.gyp:simple_vertex_shader',
@@ -242,7 +265,7 @@
         },
         {
           'target_name': 'stencil_test_pepper',
-          'type': 'shared_library',
+          'type': 'loadable_module',
           'dependencies': [
             'gpu_demo_framework_pepper',
             '../../third_party/gles2_book/gles2_book.gyp:stencil_test',
@@ -254,7 +277,7 @@
         },
         {
           'target_name': 'texture_wrap_pepper',
-          'type': 'shared_library',
+          'type': 'loadable_module',
           'dependencies': [
             'gpu_demo_framework_pepper',
             '../../third_party/gles2_book/gles2_book.gyp:texture_wrap',
diff --git a/gpu/demos/framework/Plugin_Info.plist b/gpu/demos/framework/Plugin_Info.plist
new file mode 100644
index 0000000..4a4e455
--- /dev/null
+++ b/gpu/demos/framework/Plugin_Info.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Copyright 2010 Google, Inc.</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.google.peppergpudemoplugin</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>BRPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CFPlugInDynamicRegisterFunction</key>
+	<string></string>
+	<key>CFPlugInDynamicRegistration</key>
+	<string>NO</string>
+	<key>WebPluginDescription</key>
+	<string>Simple Pepper plug-in that demonstrates 3D rendering.</string>
+	<key>WebPluginMIMETypes</key>
+	<dict>
+		<key>pepper-application/x-gpu-demo</key>
+		<dict>
+			<key>WebPluginExtensions</key>
+			<array>
+				<string>peppergpudemo</string>
+			</array>
+			<key>WebPluginTypeDescription</key>
+			<string>Pepper GPU Demo</string>
+		</dict>
+	</dict>
+	<key>WebPluginName</key>
+	<string>Pepper GPU Demo</string>
+</dict>
+</plist>