diff options
| -rw-r--r-- | o3d/plugin/mac/Info.plist | 6 | ||||
| -rwxr-xr-x | o3d/plugin/mac/plugin_copy_frameworks.sh | 11 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 9 | ||||
| -rw-r--r-- | o3d/tests/build.scons | 2 | ||||
| -rw-r--r-- | o3d/tests/lab/runner_constants.py | 2 | ||||
| -rw-r--r-- | o3d/tests/selenium/selenium.gyp | 5 |
6 files changed, 20 insertions, 15 deletions
diff --git a/o3d/plugin/mac/Info.plist b/o3d/plugin/mac/Info.plist index 3bccd89..868d959 100644 --- a/o3d/plugin/mac/Info.plist +++ b/o3d/plugin/mac/Info.plist @@ -3,11 +3,11 @@ <plist version="1.0"> <dict> <key>CFBundleName</key> - <string>O3D Plugin</string> + <string>@@@PluginName@@@</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> - <string>O3D</string> + <string>@@@PluginNpapiFilename@@@</string> <key>CFBundleIconFile</key> <string></string> <key>CFBundleIdentifier</key> @@ -44,7 +44,7 @@ <key>BreakpadProduct</key> <string>O3D</string> <key>BreakpadProductDisplay</key> - <string>O3D browser plugin</string> + <string>@@@PluginName@@@</string> <key>BreakpadVendor</key> <string>Google</string> <key>BreakpadVersion</key> diff --git a/o3d/plugin/mac/plugin_copy_frameworks.sh b/o3d/plugin/mac/plugin_copy_frameworks.sh index 1df95dc..a920b71 100755 --- a/o3d/plugin/mac/plugin_copy_frameworks.sh +++ b/o3d/plugin/mac/plugin_copy_frameworks.sh @@ -2,12 +2,15 @@ # Copy stripped frameworks inside the plugin. +PLUGIN_NPAPI_FILENAME=$1 + ditto --arch i386 \ "${PROJECT_DIR}/../../third_party/cg/files/mac/Cg.framework" \ - "${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Frameworks/Cg.framework" + "${BUILT_PRODUCTS_DIR}/${PLUGIN_NPAPI_FILENAME}.plugin/Contents/Frameworks/Cg.framework" + +# Delete the .svn directories +find "${BUILT_PRODUCTS_DIR}/${PLUGIN_NPAPI_FILENAME}.plugin/Contents/Frameworks/Cg.framework" -type d -name .svn -print0 | xargs -0 rm -r ditto --arch i386 \ "${BUILT_PRODUCTS_DIR}/crash_report_sender.app" \ - "${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Resources/crash_report_sender.app" - - + "${BUILT_PRODUCTS_DIR}/${PLUGIN_NPAPI_FILENAME}.plugin/Contents/Resources/crash_report_sender.app" 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', diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 7d20e6c..29125c0 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -546,7 +546,7 @@ cleanup_steps = [] selenium_good_to_go = True if run_env.Bit('mac'): - plugin_path = '$ARTIFACTS_DIR/O3D.plugin' + plugin_path = '$ARTIFACTS_DIR/npo3dautoplugin.plugin' if run_env['MAC_HERMETIC_FIREFOX_DIR']: # if we have a hermetic version of Firefox, then run it diff --git a/o3d/tests/lab/runner_constants.py b/o3d/tests/lab/runner_constants.py index 33afbe5..ff6a09e 100644 --- a/o3d/tests/lab/runner_constants.py +++ b/o3d/tests/lab/runner_constants.py @@ -92,7 +92,7 @@ if util.IsWindows(): INSTALL_PATHS += [join(HOME, 'Application Data', 'Google', 'O3D', 'o3d_host.dll')] elif util.IsMac(): - INSTALL_PATHS += ['/Library/Internet Plug-Ins/O3D.plugin'] + INSTALL_PATHS += ['/Library/Internet Plug-Ins/npo3dautoplugin.plugin'] else: INSTALL_PATHS += [join(HOME, '.mozilla', 'plugins', 'libnpo3dautoplugin.so')] diff --git a/o3d/tests/selenium/selenium.gyp b/o3d/tests/selenium/selenium.gyp index fd5b4e1..9820a13 100644 --- a/o3d/tests/selenium/selenium.gyp +++ b/o3d/tests/selenium/selenium.gyp @@ -16,6 +16,7 @@ }, 'includes': [ '../../build/common.gypi', + '../../plugin/branding.gypi', ], 'targets': [ { @@ -183,7 +184,7 @@ { 'action_name': 'unpack_firefox', 'inputs': [ - '<(PRODUCT_DIR)/O3D.plugin', + '<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin', ], 'outputs': [ '<(PRODUCT_DIR)/selenium_firefox', @@ -191,7 +192,7 @@ 'action': [ 'python', 'unpack_firefox.py', - '--plugin_path=<(PRODUCT_DIR)/O3D.plugin', + '--plugin_path=<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin', '--product_path=<(PRODUCT_DIR)', ], }, |