diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 20:30:00 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 20:30:00 +0000 |
| commit | 7a589151c9dd4e18cade299ec2259743557df629 (patch) | |
| tree | a03cc969bf035a4617477f2a4b7304cf786beb4f /o3d/plugin/plugin.gyp | |
| parent | c15074b5186ea26e2613133f7889b8117b826a40 (diff) | |
| download | chromium_src-7a589151c9dd4e18cade299ec2259743557df629.zip chromium_src-7a589151c9dd4e18cade299ec2259743557df629.tar.gz chromium_src-7a589151c9dd4e18cade299ec2259743557df629.tar.bz2 | |
Mac: Undo the change in r44662 to use npo3dautoplugin for the default Mac bundle name and instead return to using "O3D".
TEST=built with default name and with an overridden name, on Mac
BUG=none
Review URL: http://codereview.chromium.org/2027004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/plugin.gyp')
| -rw-r--r-- | o3d/plugin/plugin.gyp | 93 |
1 files changed, 78 insertions, 15 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index bcc3401..bfab2b0 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -139,7 +139,17 @@ { 'mac_bundle': 1, 'product_extension': 'plugin', - 'product_name': '<(plugin_npapi_filename)', + 'conditions': [ + ['"<(plugin_npapi_filename)" == "npo3dautoplugin"', + { + # The unbranded Mac plugin's name is a special case. + 'product_name': 'O3D', + }, + { + 'product_name': '<(plugin_npapi_filename)', + }, + ], + ], 'dependencies': [ '../../breakpad/breakpad.gyp:breakpad', ], @@ -202,7 +212,18 @@ 'copy_frameworks_path': 'mac/plugin_copy_frameworks.sh', }, 'postbuild_name': 'Copy Frameworks', - 'action': ['<(copy_frameworks_path)', '<(plugin_npapi_filename)'], + 'conditions': [ + ['"<(plugin_npapi_filename)" == "npo3dautoplugin"', + { + # The unbranded Mac plugin's name is a special case. + 'action': ['<(copy_frameworks_path)', 'O3D'], + }, + { + 'action': ['<(copy_frameworks_path)', + '<(plugin_npapi_filename)'], + }, + ], + ], }, { 'postbuild_name': 'Process Resource File', @@ -217,10 +238,24 @@ }, { 'postbuild_name': 'Compile Resource File', - 'action': ['/usr/bin/Rez', - '-o', - '${BUILT_PRODUCTS_DIR}/<(plugin_npapi_filename).plugin/Contents/Resources/<(plugin_npapi_filename).rsrc', - '${BUILT_PRODUCTS_DIR}/O3D.r', + 'conditions': [ + ['"<(plugin_npapi_filename)" == "npo3dautoplugin"', + { + # The unbranded Mac plugin's name is a special case. + 'action': ['/usr/bin/Rez', + '-o', + '${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Resources/O3D.rsrc', + '${BUILT_PRODUCTS_DIR}/O3D.r', + ], + }, + { + 'action': ['/usr/bin/Rez', + '-o', + '${BUILT_PRODUCTS_DIR}/<(plugin_npapi_filename).plugin/Contents/Resources/<(plugin_npapi_filename).rsrc', + '${BUILT_PRODUCTS_DIR}/O3D.r', + ], + }, + ], ], }, ], @@ -364,7 +399,17 @@ { 'mac_bundle': 1, 'product_extension': 'plugin', - 'product_name': '<(plugin_npapi_filename)', + 'conditions': [ + ['"<(plugin_npapi_filename)" == "npo3dautoplugin"', + { + # The unbranded Mac plugin's name is a special case. + 'product_name': 'O3D', + }, + { + 'product_name': '<(plugin_npapi_filename)', + }, + ], + ], 'dependencies': [ '../../breakpad/breakpad.gyp:breakpad', ], @@ -550,14 +595,32 @@ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist', ], - 'action': ['python', - 'version_info.py', - '--set_name=<(plugin_name)', - '--set_version=<(plugin_version)', - '--set_npapi_filename=<(plugin_npapi_filename)', - '--set_npapi_mimetype=<(plugin_npapi_mimetype)', - 'mac/Info.plist', - '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist', + 'conditions': [ + ['"<(plugin_npapi_filename)" == "npo3dautoplugin"', + { + # The unbranded Mac plugin's name is a special case. + 'action': ['python', + 'version_info.py', + '--set_name=<(plugin_name)', + '--set_version=<(plugin_version)', + '--set_npapi_filename=O3D', + '--set_npapi_mimetype=<(plugin_npapi_mimetype)', + 'mac/Info.plist', + '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist', + ], + }, + { + 'action': ['python', + 'version_info.py', + '--set_name=<(plugin_name)', + '--set_version=<(plugin_version)', + '--set_npapi_filename=<(plugin_npapi_filename)', + '--set_npapi_mimetype=<(plugin_npapi_mimetype)', + 'mac/Info.plist', + '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist', + ], + }, + ], ], }, ], |