diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 23:56:55 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 23:56:55 +0000 |
| commit | a1deefe8c869a7944c0419091ec45620af9b515c (patch) | |
| tree | cf185db1e9d95d542c42049bb713a65d025e0734 /o3d/plugin | |
| parent | 515c71659b320d501ca37fa7a3a39b2cf3a6d6f8 (diff) | |
| download | chromium_src-a1deefe8c869a7944c0419091ec45620af9b515c.zip chromium_src-a1deefe8c869a7944c0419091ec45620af9b515c.tar.gz chromium_src-a1deefe8c869a7944c0419091ec45620af9b515c.tar.bz2 | |
Parameterize the name of the "O3DExtras" directory with a GYP variable (to allow side-by-side installs of differently-branded builds that both include the extras directory).
Also move the branding.gypi and version.gypi files from plugin/ to build/, which is a more sensible location.
Also delete an extraneous definition of plugin_enable_fullscreen_msg from core.gyp (it's already in common.gypi).
TEST=built on Windows, both with and without plugin_extras_directory specified
BUG=none
Review URL: http://codereview.chromium.org/2893011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/branding.gypi | 22 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 4 | ||||
| -rw-r--r-- | o3d/plugin/version.gypi | 9 |
3 files changed, 2 insertions, 33 deletions
diff --git a/o3d/plugin/branding.gypi b/o3d/plugin/branding.gypi deleted file mode 100644 index 93335c8..0000000 --- a/o3d/plugin/branding.gypi +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - # Default identity. Can be overridden to allow making custom - # plugins based on O3D, but they will not work with regular O3D apps. - 'plugin_name%': 'O3D Plugin', - 'plugin_npapi_filename%': 'npo3dautoplugin', - 'plugin_npapi_mimetype%': 'application/vnd.o3d.auto', - 'plugin_activex_hostcontrol_clsid%': '9666A772-407E-4F90-BC37-982E8160EB2D', - 'plugin_activex_typelib_clsid%': 'D4F6E31C-E952-48FE-9833-6AE308BD79C6', - 'plugin_activex_hostcontrol_name%': 'o3d_host', - 'plugin_activex_typelib_name%': 'npapi_host2', - 'plugin_installdir_csidl%': 'CSIDL_APPDATA', - 'plugin_vendor_directory%': 'Google', - 'plugin_product_directory%': 'O3D', - # You must set this to 1 if changing any of the above. - 'plugin_rebranded%': '0', - } -} diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index f43511a..9914c10 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -60,9 +60,9 @@ 'plugin_domain_whitelist%': '', }, 'includes': [ + '../build/branding.gypi', '../build/common.gypi', - 'branding.gypi', - 'version.gypi', + '../build/version.gypi', ], 'target_defaults': { 'include_dirs': [ diff --git a/o3d/plugin/version.gypi b/o3d/plugin/version.gypi deleted file mode 100644 index 2c57d45..0000000 --- a/o3d/plugin/version.gypi +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'plugin_version': '0.1.43.3', - } -} |