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

1 files changed, 23 insertions, 0 deletions

diff --git a/o3d/build/branding.gypi b/o3d/build/branding.gypi
new file mode 100644
index 0000000..4102fb6
--- /dev/null
+++ b/o3d/build/branding.gypi
@@ -0,0 +1,23 @@
+# 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',
+    'plugin_extras_directory%': 'O3DExtras',
+    # You must set this to 1 if changing any of the above.
+    'plugin_rebranded%': '0',
+  }
+}