Merge lp:~abreu-alexandre/oxide/chromedriver-support into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Add chromedriver support

Add chromedriver support

[Chris Coulson (chrisccoulson)]

Thanks for this. I've left some comments inline. In addition to that:

- There should probably be a build-config option for enabling the chromedriver binary (ENABLE_CHROMEDRIVER ?)
- It's missing an install target.

review: Needs Fixing

[lp:~abreu-alexandre/oxide/chromedriver-support]

626. By Alexandre Abreu on 2014-07-02

chromedriver support

[Alexandre Abreu (abreu-alexandre)]

Updated

[lp:~abreu-alexandre/oxide/chromedriver-support]

627. By Alexandre Abreu on 2014-07-02

chrome driver support

[Alexandre Abreu (abreu-alexandre)]

ping?

[Chris Coulson (chrisccoulson)]

review: Needs Fixing

[lp:~abreu-alexandre/oxide/chromedriver-support]

628. By Alexandre Abreu on 2014-07-08

updates

629. By Alexandre Abreu on 2014-07-10

nit

630. By Alexandre Abreu on 2014-07-10

updates

631. By Alexandre Abreu on 2014-07-10

fixes

[Alexandre Abreu (abreu-alexandre)]

updated

[Chris Coulson (chrisccoulson)]

Thanks. I've just added one comment (wondering whether we need the extra chromedriver.gyp file now). Other than that, this looks good now

[lp:~abreu-alexandre/oxide/chromedriver-support]

632. By Alexandre Abreu on 2014-07-10

remvoe chromedriver.gyp

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-01 11:45:03 +0000
+++ CMakeLists.txt	2014-07-10 18:43:42 +0000
@@ -108,6 +108,12 @@
 else()
   list(APPEND GYP_COMMAND -Denable_plugins=1)
 endif()
+if(DEFINED ENABLE_CHROMEDRIVER AND ENABLE_CHROMEDRIVER EQUAL 1)
+  list(APPEND GYP_COMMAND -Denable_chromedriver_build=1)
+else()
+  list(APPEND GYP_COMMAND -Denable_chromedriver_build=0)
+endif()
+
 
 if(CMAKE_CROSSCOMPILING)
   if(NOT CHROMIUM_C_HOST_COMPILER OR NOT CHROMIUM_CXX_HOST_COMPILER OR NOT CHROMIUM_HOST_AR)

=== modified file 'build/all.gyp'
--- build/all.gyp	2014-06-30 20:27:30 +0000
+++ build/all.gyp	2014-07-10 18:43:42 +0000
@@ -23,6 +23,14 @@
         '<@(oxide_all_targets)',
         '<(DEPTH)/sandbox/sandbox.gyp:chrome_sandbox',
         '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpegsumo',
+      ],
+      'conditions': [
+        ['enable_chromedriver_build==1', {
+            'dependencies': [
+              '<(DEPTH)/chrome/chrome.gyp:chromedriver',
+            ],
+          }
+        ]
       ]
     }
   ]

=== modified file 'build/common.gypi'
--- build/common.gypi	2014-05-28 07:44:21 +0000
+++ build/common.gypi	2014-07-10 18:43:42 +0000
@@ -31,6 +31,7 @@
     'toolkit_uses_gtk': 0,
     'ozone_platform': 'oxide',
     'ozone_auto_platforms': 0,
+    'remoting': 0,
     'external_ozone_platforms': [
       'oxide',
     ],

=== modified file 'build/gyp_oxide'
--- build/gyp_oxide	2014-05-01 11:46:18 +0000
+++ build/gyp_oxide	2014-07-10 18:43:42 +0000
@@ -42,6 +42,9 @@
 sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'chrome', 'tools', 'build'))
 sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'third_party', 'WebKit', 'Source', 'build', 'scripts'))
 
+## Needed to build chrome driver and as one of its deps pulls remoting.gyp or one of its deps
+sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'remoting', 'tools', 'build'))
+
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "scripts"))
 
 def additional_include_files(args=[]):

=== renamed file 'build/scripts/repack_locales.py' => 'build/scripts/oxide_repack_locales.py'
=== modified file 'qt/CMakeLists.txt'
--- qt/CMakeLists.txt	2014-04-16 08:34:12 +0000
+++ qt/CMakeLists.txt	2014-07-10 18:43:42 +0000
@@ -81,6 +81,11 @@
 install(DIRECTORY ${CHROMIUM_PRODUCT_DIR}/locales
         DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
 
+if(DEFINED ENABLE_CHROMEDRIVER AND ENABLE_CHROMEDRIVER EQUAL 0)
+  install(PROGRAMS ${CHROMIUM_PRODUCT_DIR}/chromedriver
+          DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
+endif()
+
 list(APPEND PACKAGE_FILES ${OXIDE_INSTALL_LIB_FILES})
 list(APPEND PACKAGE_FILES ${OXIDE_INSTALL_LIBEXEC_FILES})
 list(APPEND PACKAGE_PROGRAMS ${OXIDE_INSTALL_LIBEXEC_PROGRAMS})

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2014-07-09 00:47:03 +0000
+++ shared/shared.gyp	2014-07-10 18:43:42 +0000
@@ -107,14 +107,14 @@
           'action_name': 'repack_locales',
           'variables': {
             'pak_locales': '<(locales)',
-            'repack_locales_path': '../build/scripts/repack_locales.py',
+            'repack_locales_path': '../build/scripts/oxide_repack_locales.py',
           },
           'inputs': [
             '<(repack_locales_path)',
-            '<!@pymod_do_main(repack_locales -i -p <(OS) -b chromium -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pak_locales))'
+            '<!@pymod_do_main(oxide_repack_locales -i -p <(OS) -b chromium -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pak_locales))'
           ],
           'outputs': [
-            '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pak_locales))'
+            '<!@pymod_do_main(oxide_repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pak_locales))'
           ],
           'action': [
             'python',