Use correct path for libnoblur in deployed selenium-webdriver package

(and add libnoblur as a dep in the Rakefile)
mpichlin · Aug 26, 2014 · 1fd667e · 1fd667e
1 parent 4486f70
commit 1fd667e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Rakefile b/Rakefile
@@ -564,6 +564,8 @@ end
 
 namespace :node do
   task :deploy => [
+    "//cpp:noblur",
+    "//cpp:noblur64",
     "//javascript/firefox-driver:webdriver",
     "//javascript/webdriver:asserts_lib",
     "//javascript/webdriver:webdriver_lib",
@@ -580,6 +582,8 @@ namespace :node do
         " --output=build/javascript/node/selenium-webdriver" <<
         " --resource=COPYING:/COPYING" <<
         " --resource=javascript/firefox-driver/webdriver.json:firefox/webdriver.json" <<
+        " --resource=build/cpp/amd64/libnoblur64.so:firefox/amd64/libnoblur64.so" <<
+        " --resource=build/cpp/i386/libnoblur.so:firefox/i386/libnoblur.so" <<
         " --resource=build/javascript/firefox-driver/webdriver.xpi:firefox/webdriver.xpi" <<
         " --resource=third_party/closure/LICENSE:goog/LICENSE" <<
         " --resource=common/src/web/:test/data/" <<

diff --git a/javascript/node/selenium-webdriver/firefox/binary.js b/javascript/node/selenium-webdriver/firefox/binary.js
@@ -30,12 +30,12 @@ var promise = require('..').promise,
 /** @const */
 var NO_FOCUS_LIB_X86 = _base.isDevMode() ?
     path.join(__dirname, '../../../../cpp/prebuilt/i386/libnoblur.so') :
-    path.join(__dirname, 'libnoblur.so') ;
+    path.join(__dirname, '../lib/firefox/i386/libnoblur.so') ;
 
 /** @const */
 var NO_FOCUS_LIB_AMD64 = _base.isDevMode() ?
     path.join(__dirname, '../../../../cpp/prebuilt/amd64/libnoblur64.so') :
-    path.join(__dirname, 'libnoblur64.so') ;
+    path.join(__dirname, '../lib/firefox/amd64/libnoblur64.so') ;
 
 var X_IGNORE_NO_FOCUS_LIB = 'x_ignore_nofocus.so';