diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 17:27:10 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 17:27:10 +0000 |
| commit | 485392bfbc7a311782c2663b02f28a64f1bcc4be (patch) | |
| tree | a3c656a7bad8cf3b0f6b331743bfce714604f780 /o3d/plugin/plugin.gyp | |
| parent | 3b9b49aec5d9812c9d4884328f6e6c3972a2c416 (diff) | |
| download | chromium_src-485392bfbc7a311782c2663b02f28a64f1bcc4be.zip chromium_src-485392bfbc7a311782c2663b02f28a64f1bcc4be.tar.gz chromium_src-485392bfbc7a311782c2663b02f28a64f1bcc4be.tar.bz2 | |
Mac: Use the plugin_npapi_filename variable to choose the bundle name (rather than the static "O3D" name) so that differently branded versions can co-exist. This also changes the default name from O3D.plugin to npo3dautoplugin.plugin to harmonize it with the other platforms.
TEST=built & tested a rebranded plugin and non-rebranded plugin on Mac
BUG=none
Review URL: http://codereview.chromium.org/1585034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/plugin.gyp')
| -rw-r--r-- | o3d/plugin/plugin.gyp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 4bb27e2..1f162bf 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -138,7 +138,7 @@ { 'mac_bundle': 1, 'product_extension': 'plugin', - 'product_name': 'O3D', + 'product_name': '<(plugin_npapi_filename)', 'dependencies': [ '../../breakpad/breakpad.gyp:breakpad', ], @@ -201,7 +201,7 @@ 'copy_frameworks_path': 'mac/plugin_copy_frameworks.sh', }, 'postbuild_name': 'Copy Frameworks', - 'action': ['<(copy_frameworks_path)'], + 'action': ['<(copy_frameworks_path)', '<(plugin_npapi_filename)'], }, { 'postbuild_name': 'Process Resource File', @@ -217,7 +217,7 @@ 'postbuild_name': 'Compile Resource File', 'action': ['/usr/bin/Rez', '-o', - '${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Resources/O3D.rsrc', + '${BUILT_PRODUCTS_DIR}/<(plugin_npapi_filename).plugin/Contents/Resources/<(plugin_npapi_filename).rsrc', '${BUILT_PRODUCTS_DIR}/O3D.r', ], }, @@ -362,7 +362,7 @@ { 'mac_bundle': 1, 'product_extension': 'plugin', - 'product_name': 'O3D', + 'product_name': '<(plugin_npapi_filename)', 'dependencies': [ '../../breakpad/breakpad.gyp:breakpad', ], @@ -550,6 +550,7 @@ 'action': ['python', 'version_info.py', '--set_name=<(plugin_name)', + '--set_npapi_filename=<(plugin_npapi_filename)', '--set_npapi_mimetype=<(plugin_npapi_mimetype)', 'mac/Info.plist', '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist', |