This adds in targets for selenium and updated several other problems,

including some problems with the samples and idl generation.

Selenium targets launch selenium on all platforms, but the tests don't
pass anywhere but Windows yet because the plugin isn't found.
I'll work on that next.
Review URL: http://codereview.chromium.org/197014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25467 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 132 insertions, 78 deletions

diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp
index 32f3998..1996704 100644
--- a/o3d/build/all.gyp
+++ b/o3d/build/all.gyp
@@ -26,12 +26,10 @@
         '../import/import.gyp:o3dImport',
         '../installer/installer.gyp:installer',
         '../plugin/idl/idl.gyp:o3dPluginIdl',
-        '../plugin/plugin.gyp:add_version',
         '../plugin/plugin.gyp:npo3dautoplugin',
-        '../plugin/plugin.gyp:o3dPluginLogging',
         '../samples/samples.gyp:*',
+        '../tests/selenium/selenium.gyp:*',
         '../serializer/serializer.gyp:o3dSerializer',
-        '../statsreport/statsreport.gyp:o3dStatsReport',
         '../tests/tests.gyp:unit_tests',
         '../utils/utils.gyp:o3dUtils',
       ],
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index a011c8e..5dc0538 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -16,10 +16,14 @@
     'nacldir': 'third_party/native_client/googleclient',
     'nixysadir': 'third_party/nixysa',
     'npapidir': 'third_party/npapi',
+    'pdiffdir': 'third_party/pdiff/files',
     'pngdir': 'third_party/libpng',
+    'screenshotsdir': 'o3d_assets/tests/screenshots',
+    'seleniumdir': 'third_party/selenium_rc/files',
     'skiadir': 'third_party/skia/include',
     'zlibdir': 'third_party/zlib',
     'o3d_in_chrome%': 0,
+    'selenium_screenshots%': 0,
   },
   'target_defaults': {
     'defines': [
@@ -44,7 +48,6 @@
           'cgdir': 'third_party/cg/files/win',
           'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
           'LIBRARY_SUFFIX': '.lib',
-          'CONFIGURATION': '$(ConfigurationName)',
         },
         'target_defaults': {
           'defines': [
@@ -65,7 +68,6 @@
           'renderer': 'gl',
           'cgdir': 'third_party/cg/files/mac',
           'LIBRARY_SUFFIX': '.a',
-          'CONFIGURATION': '$(CONFIGURATION)',
         },
         'target_defaults': {
           'defines': [
@@ -103,12 +105,21 @@
           'renderer': 'gl',
           'cgdir': 'third_party/cg/files/linux',
           'LIBRARY_SUFFIX': '.a',
-          'CONFIGURATION': '$(CONFIGURATION)',
         },
         'target_defaults': {
           'defines': [
-            'RENDERER_GL',
+            'LINUX',
+            'MOZ_X11',
+            'NACL_LINUX=1',
             'OS_LINUX',
+            'RENDERER_GL',
+            'SK_BUILD_FOR_UNIX',
+            'UNICODE',
+            'XP_UNIX',
+          ],
+          'cflags': [
+            '-fvisibility=hidden',
+            '-Wstrict-aliasing',
           ],
         },
       },
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp
index 88dba6b..0244c48 100644
--- a/o3d/build/libs.gyp
+++ b/o3d/build/libs.gyp
@@ -13,15 +13,99 @@
   ],
   'targets': [
     {
+      'target_name': 'gl_libs',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../../<(glewdir)/include',
+        ],
+      },
+      'conditions': [
+        [ 'OS=="linux"',
+          {
+            'direct_dependent_settings': {
+              'defines': [
+                'GL_GLEXT_PROTOTYPES',
+              ],
+              'scons_variable_settings': {
+                'LIBPATH': [
+                  '../../<(glewdir)/lib',
+                ],
+              },
+              'libraries': [
+                "-lGL",
+                "-lGLEW",
+              ],
+            },
+          },
+        ],
+        [ 'OS=="mac"',
+          {
+            'direct_dependent_settings': {
+              'libraries': [
+                '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+              ],
+            },
+          },
+        ],
+      ],
+    },
+    {
       'target_name': 'cg_libs',
       'type': 'none',
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../../<(cgdir)/include',
+        ],
+      },
+      'conditions': [
+        [ 'OS=="linux"',
+          {
+            'direct_dependent_settings': {
+              'scons_variable_settings': {
+                'LIBPATH': [
+                  '<(PRODUCT_DIR)',
+                ],
+              },
+              'libraries': [
+                "-lCg",
+                "-lCgGL",
+              ],
+            },
+          },
+        ],
+        [ 'OS=="win"',
+          {
+            'direct_dependent_settings': {
+              'libraries': [
+                "../../<(cgdir)/lib/cg.lib",
+                "../../<(cgdir)/lib/cgD3D9.lib",
+                "../../<(cgdir)/lib/cgGL.lib",
+                "../../<(cgdir)/lib/glut32.lib",
+              ],
+            },
+          },
+        ],
+        [ 'OS=="mac"',
+          {
+            'direct_dependent_settings': {
+              'libraries': [
+                "<(PRODUCT_DIR)/Cg.framework",
+              ],
+            },
+          }
+        ],
+      ],
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)',
           'conditions' : [
-            [ 'OS=="mac"',
+            [ 'OS=="linux"',
               {
                 'files': [
+                  "../../<(cgdir)/lib/libCg.so",
+                  "../../<(cgdir)/lib/libCgGL.so",
+                  "../../<(cgdir)/bin/cgc",
                 ],
               },
             ],
@@ -49,25 +133,38 @@
     },
   ],
   'conditions': [
-    ['OS=="win"', {
-      'targets': [
-        {
-          'target_name': 'dx_dll',
-          'type': 'none',
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'conditions' : [
-                ['"<(dx_redist_exists)" == "True"', {
-                  'files': ['<(dx_redist_path)/d3dx9_36.dll'],
-                },{
-                  'files': ['$(windir)/system32/d3dx9_36.dll'],
-                }],
+    ['OS=="win"',
+      {
+        'targets': [
+          {
+            'target_name': 'dx_dll',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'include_dirs': [
+                '$(DXSDK_DIR)/Include',
+              ],
+              'libraries': [
+                '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"',
               ],
             },
-          ],
-        },
-      ],
-    }],
+            'copies': [
+              {
+                'destination': '<(PRODUCT_DIR)',
+                'conditions' : [
+                  ['"<(dx_redist_exists)" == "True"',
+                    {
+                      'files': ['<(dx_redist_path)/d3dx9_36.dll'],
+                    },
+                    {
+                      'files': ['$(windir)/system32/d3dx9_36.dll'],
+                    }
+                  ],
+                ],
+              },
+            ],
+          },
+        ],
+      }
+    ],
   ],
 }
diff --git a/o3d/build/nacl.gyp b/o3d/build/nacl.gyp
index 19b4de5..e69de29 100644
--- a/o3d/build/nacl.gyp
+++ b/o3d/build/nacl.gyp
@@ -1,52 +0,0 @@
-# Copyright (c) 2009 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': {
-    'chromium_code': 1,
-  },
-  'includes': [
-    'common.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'build_nacl',
-      'type': 'none',
-      'variables': {
-        'nacl_output_dir': '<(SHARED_INTERMEDIATE_DIR)/nacl_libs',
-      },
-      'actions': [
-        {
-          'action_name': 'build_nacl',
-          'inputs' : [
-            'build_nacl.py',
-          ],
-          'outputs': [
-            '<(nacl_output_dir)/google_nacl_imc<(LIBRARY_SUFFIX)',
-            '<(nacl_output_dir)/google_nacl_imc_c<(LIBRARY_SUFFIX)',
-            'dummy_file_that_never_gets_built_so_scons_always_runs',
-          ],
-          'action': [
-            'python',
-            '<@(_inputs)',
-            '--output="<(nacl_output_dir)"',
-            '--configuration="<(CONFIGURATION)"',
-            '--platform=<(OS)',
-            'google_nacl_imc',
-            'google_nacl_imc_c',
-          ],
-        },
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../../<(nacldir)',
-        ],
-        'libraries': [
-          '<(nacl_output_dir)/google_nacl_imc<(LIBRARY_SUFFIX)',
-          '<(nacl_output_dir)/google_nacl_imc_c<(LIBRARY_SUFFIX)',
-        ],
-      },
-    },
-  ],
-}