DanielWagnerHall: Fix names of native events libraries. Hacky.

r17400

Rakefile

@@ -20,6 +20,7 @@ require 'rake-tasks/crazy_fun/mappings/javascript'
 require 'rake-tasks/crazy_fun/mappings/mozilla'
 require 'rake-tasks/crazy_fun/mappings/python'
 require 'rake-tasks/crazy_fun/mappings/rake'
+require 'rake-tasks/crazy_fun/mappings/rename'
 require 'rake-tasks/crazy_fun/mappings/ruby'
 require 'rake-tasks/crazy_fun/mappings/visualstudio'
 
@@ -68,6 +69,7 @@ JavascriptMappings.new.add_all(crazy_fun)
 MozillaMappings.new.add_all(crazy_fun)
 PythonMappings.new.add_all(crazy_fun)
 RakeMappings.new.add_all(crazy_fun)
+RenameMappings.new.add_all(crazy_fun)
 RubyMappings.new.add_all(crazy_fun)
 VisualStudioMappings.new.add_all(crazy_fun)
 

java/client/src/org/openqa/selenium/firefox/build.desc

@@ -19,14 +19,39 @@ java_library(name = "firefox",
     ":x86",
   ])
 
+folder(name = "amd64",
+  deps = [
+    ":noblur64",
+    ":imehandler64",
+  ])
+
 folder(name = "x86",
   deps = [
-    "//cpp:noblur",
-    "//cpp:imehandler",
+    ":noblur",
+    ":imehandler",
   ])
 
-folder(name = "amd64",
+# TODO(dawagner): These tmp folders are a horrible hack, and should disappear post haste
+rename(name = "noblur",
+  deps = [
+    "//cpp:noblur",
+  ],
+  out = "tmp_x86/x_ignore_nofocus.so")
+
+rename(name = "noblur64",
   deps = [
     "//cpp:noblur64",
+  ],
+  out = "tmp_amd64/x_ignore_nofocus.so")
+
+rename(name = "imehandler",
+  deps = [
+    "//cpp:imehandler",
+  ],
+  out = "tmp_x86/libibushandler.so")
+
+rename(name = "imehandler64",
+  deps = [
     "//cpp:imehandler64",
-  ])
+  ],
+  out = "tmp_amd64/libibushandler.so")

rake-tasks/crazy_fun/mappings/rename.rb

@@ -0,0 +1,93 @@
+require 'rake-tasks/crazy_fun/mappings/common'
+
+class RenameMappings
+  def add_all(fun)
+    fun.add_mapping("rename", Rename::CheckPreconditions.new)
+    fun.add_mapping("rename", Rename::AddDependencies.new)
+    fun.add_mapping("rename", Rename::Export.new)
+  end
+end
+
+module Rename
+
+  class CheckPreconditions < Tasks
+    def handle(fun, dir, args)
+      raise StandardError, ":name must be set" if args[:name].nil?
+      raise StandardError, ":srcs or :deps must be set" if args[:srcs].nil? and args[:deps].nil?
+      raise StandardError, ":out must be set" if args[:out].nil?
+    end
+  end
+
+  class AddDependencies < Tasks
+    def handle(fun, dir, args)
+      name = task_name(dir, args[:name])
+      task name => []
+      task = Rake::Task[name]
+      task.out = "build/#{dir}/#{args[:out]}"
+      add_dependencies(task, dir, args[:deps])
+      add_dependencies(task, dir, args[:srcs])
+    end
+  end
+
+  class Export < Tasks
+    def handle(fun, dir, args)
+      name = task_name(dir, args[:name])
+      task = Rake::Task[name]
+
+      task name do
+        from = Rake::Task[args[:srcs].nil? ? args[:deps][0] : args[:srcs][0]].out
+        to = Rake::Task[task].out
+        mkdir_p File.dirname(to)
+        cp_r from, to
+      end
+    end
+  end
+end
+
+require 'rake-tasks/crazy_fun/mappings/common'
+
+class RenameMappings
+  def add_all(fun)
+    fun.add_mapping("rename", Rename::CheckPreconditions.new)
+    fun.add_mapping("rename", Rename::AddDependencies.new)
+    fun.add_mapping("rename", Rename::Export.new)
+  end
+end
+
+module Rename
+
+  class CheckPreconditions < Tasks
+    def handle(fun, dir, args)
+      raise StandardError, ":name must be set" if args[:name].nil?
+      raise StandardError, ":srcs or :deps must be set" if args[:srcs].nil? and args[:deps].nil?
+      raise StandardError, ":out must be set" if args[:out].nil?
+    end
+  end
+
+  class AddDependencies < Tasks
+    def handle(fun, dir, args)
+      name = task_name(dir, args[:name])
+      task name => []
+      task = Rake::Task[name]
+      task.out = "build/#{dir}/#{args[:out]}"
+      add_dependencies(task, dir, args[:deps])
+      add_dependencies(task, dir, args[:srcs])
+    end
+  end
+
+  class Export < Tasks
+    def handle(fun, dir, args)
+      name = task_name(dir, args[:name])
+      task = Rake::Task[name]
+
+      puts "Setting up task: #{name}"
+      task name do
+        from = Rake::Task[args[:srcs].nil? ? args[:deps][0] : args[:srcs][0]].out
+        to = Rake::Task[task].out
+        mkdir_p File.dirname(to)
+        cp_r from, to
+      end
+    end
+  end
+end
+