Remove uncalled code (base generator amongst others) (#7682)

Author: luke-hill

Rakefile

@@ -1,17 +1,16 @@
 # -*- mode: ruby -*-
 
-$LOAD_PATH.unshift File.expand_path(".")
+$LOAD_PATH.unshift File.expand_path('.')
 
 require 'rake'
-require 'rake_tasks/files'
 require 'net/telnet'
 require 'stringio'
 require 'fileutils'
 require 'open-uri'
 
 include Rake::DSL
 
-Rake.application.instance_variable_set "@name", "go"
+Rake.application.instance_variable_set(:@name, 'go')
 orig_verbose = verbose
 verbose(false)
 
@@ -29,7 +28,7 @@ require 'rake_tasks/crazy_fun/mappings/ruby'
 
 # Location of all new methods
 require 'rake_tasks/selenium_rake/checks'
-require 'rake_tasks/selenium_rake/ie_code_generator'
+require 'rake_tasks/selenium_rake/ie_generator'
 require 'rake_tasks/selenium_rake/java_formatter'
 require 'rake_tasks/selenium_rake/cpp_formatter'
 require 'rake_tasks/selenium_rake/type_definitions_generator'
@@ -38,7 +37,6 @@ require 'rake_tasks/selenium_rake/type_definitions_generator'
 # These are the final items mixed into the global NS
 require 'rake_tasks/bazel'
 require 'rake_tasks/copyright'
-require 'rake_tasks/files'
 require 'rake_tasks/python'
 
 # Our modifications to the Rake library
@@ -89,7 +87,7 @@ crazy_fun.create_tasks(Dir["rb/**/build.desc"])
 
 # If it looks like a bazel target, build it with bazel
 rule /\/\/.*/ do |task|
-  task.out = Bazel.execute("build", ["--workspace_status_command", "scripts/build-info.py"], task.name)
+  task.out = Bazel.execute('build', %w(--workspace_status_command scripts/build-info.py), task.name)
 end
 
 # Spoof tasks to get CI working with bazel
@@ -281,17 +279,17 @@ ie_generator = SeleniumRake::IEGenerator.new
 
 # Generate a C++ Header file for mapping between magic numbers and #defines
 # in the C++ code.
-ie_generator.ie_generate_type_mapping(
-  :name => "ie_result_type_cpp",
-  :src => "cpp/iedriver/result_types.txt",
-  :type => "cpp",
-  :out => "cpp/iedriver/IEReturnTypes.h"
+ie_generator.generate_type_mapping(
+  name: 'ie_result_type_cpp',
+  src: 'cpp/iedriver/result_types.txt',
+  type: 'cpp',
+  out: 'cpp/iedriver/IEReturnTypes.h'
 )
 
 task :javadocs => [:common, :firefox, :ie, :remote, :support, :chrome, :selenium] do
-  rm_rf "build/javadoc"
-  mkdir_p "build/javadoc"
-   sourcepath = ""
+  rm_rf 'build/javadoc'
+  mkdir_p 'build/javadoc'
+   sourcepath = ''
    classpath = '.'
    Dir["third_party/java/*/*.jar"].each do |jar|
      classpath << ":" + jar unless jar.to_s =~ /.*-src.*\.jar/
@@ -622,7 +620,7 @@ namespace :py do
   end
 
   %w[chrome ff marionette ie edge blackberry remote_firefox safari].each do |browser|
-    browser_data = SeleniumRake::Browsers::BROWSERS[browser][:python]
+    browser_data = SeleniumRake::Browsers::BROWSERS[browser]
     deps = browser_data[:deps] || []
     deps += [:prep]
     driver = browser_data[:driver]

rake_tasks/crazy_fun/mappings/export.rb

@@ -2,6 +2,4 @@
 
 require_relative 'export_mappings'
 require_relative 'export/check_preconditions'
-require_relative 'export/export_tasks'
-require_relative 'export/create_task'
 require_relative 'export/add_dependencies'

rake_tasks/crazy_fun/mappings/export/add_dependencies.rb

@@ -1,5 +1,5 @@
 module Export
-  class AddDependencies < ExportTasks
+  class AddDependencies
     def handle(_fun, dir, args)
       to_export = dir + "/" + args[:srcs][0]
       name = export_name(dir, args[:name], File.extname(to_export))

rake_tasks/crazy_fun/mappings/export/create_task.rb

@@ -79,6 +79,37 @@ def gccbuild_c(src_file, obj_dir, args, is_32_bit)
       end
       true
     end
+
+    private
+
+    def copy_prebuilt(prebuilt, out)
+      dir = out.split('/')[0..-2].join('/')
+
+      if prebuilt.nil?
+        mkdir_p dir
+        File.open(out, 'w') { |f| f.write('') }
+      elsif File.directory? prebuilt
+        from = "#{prebuilt}/#{out}".sub(/\/build\//, '/')
+
+        if File.exist?(from)
+          puts "Falling back to copy of: #{from}"
+          mkdir_p dir
+          if File.directory? from
+            cp_r "#{from}/.", out
+          else
+            cp_r from, out
+          end
+        else
+          puts "Unable to locate prebuilt copy of #{out}"
+        end
+      elsif File.exist?(prebuilt)
+        puts "Falling back to copy of: #{prebuilt}"
+        mkdir_p dir
+        cp prebuilt, out
+      else
+        puts "Unable to locate prebuilt copy of #{out}"
+      end
+    end
   end
 
   class CheckPreconditions

rake_tasks/crazy_fun/mappings/export/export_tasks.rb

@@ -208,7 +208,6 @@ def initialize()
     def parse_deps(file)
       file = File.expand_path(file)
 
-      # Check the global cache if we've already parsed this file.
       if @@DEPS_FILES[file]
         @@DEPS_FILES[file].each do |info|
           info.provides.each{|p| record_provider(p, info)}
@@ -241,7 +240,6 @@ def parse_deps(file)
     def parse_file(file)
       file = File.expand_path(file)
 
-      # Check the global cache if we've already parsed this file.
       if @@FILES[file]
         info = @files[file] = @@FILES[file]
         info.provides.each{|p| record_provider(p, info)}
@@ -365,15 +363,6 @@ def record_provider(symbol, info)
   end
 
   class BaseJs < Tasks
-    def js_name(dir, name)
-      name = task_name(dir, name)
-      js = "build/" + (name.slice(2 ... name.length))
-      js = js.sub(":", "/")
-      js << ".js"
-
-      Platform.path_for js
-    end
-
     def build_deps(ignore, task, deps)
       prereqs = task.prerequisites
       prereqs.each do |p|
@@ -404,8 +393,6 @@ def calc_deps(src_files, js_files)
       Array(js_files).each {|f| deps.parse_file(f)}
       deps.calc_deps(src_files).uniq
     end
-
-    private
   end
 
   class CheckPreconditions
@@ -479,15 +466,6 @@ def handle(fun, dir, args)
   end
 
   class CreateLibrary < BaseJs
-    def manifest_name(dir, name)
-      name = task_name(dir, name)
-      mf = "build/" + (name.slice(2 ... name.length))
-      mf = mf.sub(":", "/")
-      mf << ".mf"
-
-      Platform.path_for mf
-    end
-
     def handle(fun, dir, args)
       manifest = manifest_name(dir, args[:name])
       task_name = task_name(dir, args[:name])
@@ -667,10 +645,6 @@ def collect_module_info(dir, modules)
         info
       end
 
-      #modules.sort! do |x, y|
-      #  x[:deps].count <=> y[:deps].count
-      #end
-      #
       result_list = []
       seen_list = []
       modules.each do |info|
@@ -685,64 +659,6 @@ def collect_module_info(dir, modules)
           result_list[0][:module_deps].empty?
       result_list
     end
-
-    def handle(fun, dir, args)
-      check_preconditions(args)
-      declare_task(dir, args)
-
-      task_name = task_name(dir, args[:name])
-      task task_name do
-        folder = "build/#{dir}/#{args[:name]}"
-
-        puts "Preparing: #{task_name} as #{folder}"
-
-        module_info = collect_module_info(dir, args[:modules])
-        srcs = (args[:srcs] || []).collect do |src|
-          File.expand_path(File.join(dir, src))
-        end
-        deps = []
-        module_info.each do |info|
-          srcs.concat(info[:srcs])
-          deps.concat(info[:deps])
-        end
-        srcs.uniq!
-        deps.uniq!
-
-        js_files = calc_deps(srcs, deps)
-
-        flags = args[:flags] || []
-        flags.push("--module_output_path_prefix='#{folder}/#{args[:name]}_'")
-
-        num_files = 0
-        module_info.each do |info|
-          indices = info[:srcs].collect do |src|
-            js_files.index(src)
-          end
-          module_file_count = (indices.max + 1) - num_files
-          module_deps = info[:module_deps].collect do |dep|
-            @@MODULE_INFO[dep][:name]
-          end
-          module_deps = module_deps.empty? ? "" : ":#{module_deps.join(",")}"
-          flags.push("--module=#{info[:name]}:#{module_file_count}#{module_deps}")
-          num_files += module_file_count
-        end
-
-        js_files.each do |file|
-          flags.push("--js=\"#{file}\"")
-        end
-
-        (args[:externs] || []).each do |file|
-          flags.push("--externs=\"#{File.expand_path(File.join(dir, file))}\"")
-        end
-
-        mkdir_p Platform.path_for folder
-
-        cmd = "java -cp third_party/closure/bin/compiler.jar com.google.javascript.jscomp.CommandLineRunner " <<
-          flags.join(" ")
-
-        sh cmd
-      end
-    end
   end
 
   class BaseCompileFragment < BaseJs

rake_tasks/crazy_fun/mappings/gcc.rb

@@ -1,11 +1,9 @@
 module Python
   class PyTask < Tasks
-    def get_resources(browser, args)
+    def get_resources(_browser, args)
       resources = []
       resources.concat(args[:resources]) if args[:resources]
-      browser_specific_resources = SeleniumRake::Browsers::BROWSERS[browser][:python][:resources]
-      resources.concat(browser_specific_resources) if browser_specific_resources
-      return resources
+      resources
     end
   end
 end

rake_tasks/crazy_fun/mappings/javascript.rb

@@ -7,7 +7,7 @@ def handle(fun, dir, args)
       drivers = []
 
       browsers.each do |browser|
-        browser_data = SeleniumRake::Browsers::BROWSERS[browser][:python]
+        browser_data = SeleniumRake::Browsers::BROWSERS[browser]
         deps += browser_data[:deps] if browser_data[:deps]
         drivers += [browser_data[:driver]] if browser_data[:driver]
       end