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

10 files changed, 16 insertions, 19 deletions

diff --git a/o3d/breakpad/breakpad.gyp b/o3d/breakpad/breakpad.gyp
index 9623efd..7099432 100644
--- a/o3d/breakpad/breakpad.gyp
+++ b/o3d/breakpad/breakpad.gyp
@@ -7,8 +7,8 @@
     'chromium_code': 1,
   },
   'includes': [
+    '../build/branding.gypi',
     '../build/common.gypi',
-    '../plugin/branding.gypi',
   ],
   'target_defaults': {
     'include_dirs': [
diff --git a/o3d/plugin/branding.gypi b/o3d/build/branding.gypi
index 93335c8..4102fb6 100644
--- a/o3d/plugin/branding.gypi
+++ b/o3d/build/branding.gypi
@@ -16,6 +16,7 @@
     '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',
   }
diff --git a/o3d/plugin/version.gypi b/o3d/build/version.gypi
index 2c57d45..2c57d45 100644
--- a/o3d/plugin/version.gypi
+++ b/o3d/build/version.gypi
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index 9b4237c..f7df445 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -5,12 +5,11 @@
 {
   'variables': {
     'chromium_code': 1,
-    # Whether to enable the English-only, Win/Mac-only fullscreen message.
-    'plugin_enable_fullscreen_msg%': '1',
   },
   'includes': [
+    '../build/branding.gypi',
     '../build/common.gypi',
-    '../plugin/version.gypi',
+    '../build/version.gypi',
   ],
   'target_defaults': {
     'include_dirs': [
@@ -24,15 +23,9 @@
     ],
     'defines': [
       'O3D_PLUGIN_VERSION="<(plugin_version)"',
+      'O3D_PLUGIN_EXTRAS_DIRECTORY="<(plugin_extras_directory)"',
     ],
     'conditions': [
-      ['<(plugin_enable_fullscreen_msg) != 0',
-        {
-          'defines': [
-            'O3D_PLUGIN_ENABLE_FULLSCREEN_MSG=1',
-          ],
-        },
-      ],
       ['OS == "win"',
         {
           'msvs_settings': {
diff --git a/o3d/core/win/d3d9/install_check.cc b/o3d/core/win/d3d9/install_check.cc
index 6dfd157..dce002e 100644
--- a/o3d/core/win/d3d9/install_check.cc
+++ b/o3d/core/win/d3d9/install_check.cc
@@ -105,7 +105,8 @@ bool D3DX9InstallCheck(std::string* error) {
     return false;
   }
 
-  if (!PathAppend(dll_path.get(), _T("O3DExtras\\d3dx9_36.dll"))) {
+  if (!PathAppend(dll_path.get(),
+                  _T(O3D_PLUGIN_EXTRAS_DIRECTORY) _T("\\d3dx9_36.dll"))) {
     *error = "Failed to compute location of d3dx9_36.dll.";
     return false;
   }
@@ -215,7 +216,9 @@ bool D3D9SoftwareInstallCheck(std::string* error) {
     return false;
   }
 
-  if (!PathAppend(dll_path.get(), _T("O3DExtras\\swiftshader_d3d9.dll"))) {
+  if (!PathAppend(dll_path.get(),
+                  _T(O3D_PLUGIN_EXTRAS_DIRECTORY)
+                      _T("\\swiftshader_d3d9.dll"))) {
     *error = "Failed to compute new software renderer location.";
     return false;
   }
diff --git a/o3d/installer/installer.gyp b/o3d/installer/installer.gyp
index 4361d65..dba0f4d 100644
--- a/o3d/installer/installer.gyp
+++ b/o3d/installer/installer.gyp
@@ -7,8 +7,8 @@
     'chromium_code': 1,
   },
   'includes': [
+    '../build/branding.gypi',
     '../build/common.gypi',
-    '../plugin/branding.gypi',
   ],
   'targets': [
     {
diff --git a/o3d/installer/linux/debian.in/debian.gyp b/o3d/installer/linux/debian.in/debian.gyp
index 614e311..63846ac 100644
--- a/o3d/installer/linux/debian.in/debian.gyp
+++ b/o3d/installer/linux/debian.in/debian.gyp
@@ -5,7 +5,7 @@
 {
   'includes': [
     '../../../build/common.gypi',
-    '../../../plugin/version.gypi',
+    '../../../build/version.gypi',
   ],
   'variables': {
     'INSTALLER_DIR': '<(PRODUCT_DIR)/installer',
diff --git a/o3d/installer/mac/installer.gyp b/o3d/installer/mac/installer.gyp
index 7e41527..7ff46bf 100644
--- a/o3d/installer/mac/installer.gyp
+++ b/o3d/installer/mac/installer.gyp
@@ -8,7 +8,7 @@
   },
   'includes': [
     '../../build/common.gypi',
-    '../../plugin/version.gypi',
+    '../../build/version.gypi',
   ],
   'targets': [
     {
diff --git a/o3d/installer/win/installer.gyp b/o3d/installer/win/installer.gyp
index 9246aa7..0f100d3 100644
--- a/o3d/installer/win/installer.gyp
+++ b/o3d/installer/win/installer.gyp
@@ -34,7 +34,7 @@
   },
   'includes': [
     '../../build/common.gypi',
-    '../../plugin/version.gypi',
+    '../../build/version.gypi',
   ],
   'targets': [
     {
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': [