Generate makefile matching function from patch list.

Author: aardvark179

lib/cext/preprocess.rb

@@ -6,52 +6,9 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-require_relative 'patches/json_patches'
-require_relative 'patches/nokogiri_patches'
-require_relative 'patches/pg_patches'
+require_relative '../truffle/truffle/cext_preprocessor.rb'
 
-class Preprocessor
-
-  PATCHED_FILES = {}
-
-  def self.add_gem_patches(patch_hash, gem_patches)
-    gem = gem_patches[:gem]
-    patch_list = gem_patches[:patches]
-    patch_list.each do |path_parts, patch|
-      processed_patch = {}
-      if path_parts.kind_of?(String)
-        key = path_parts
-      else
-        key = path_parts.last
-        processed_patch[:ext_dir] = path_parts.first if path_parts.size > 1
-      end
-      processed_patch[:patches] = patch
-      processed_patch[:gem] = gem
-      raise "Duplicate patch file #{key}." if patch_hash.include?(key)
-      patch_hash[key] = processed_patch
-    end
-  end
-
-  add_gem_patches(PATCHED_FILES, ::JsonPatches::PATCHES)
-  add_gem_patches(PATCHED_FILES, ::NokogiriPatches::PATCHES)
-  add_gem_patches(PATCHED_FILES, ::PgPatches::PATCHES)
-
-  def self.patch(file, contents, directory)
-    if patched_file = PATCHED_FILES[File.basename(file)]
-      matched = if patched_file[:ext_dir]
-                  directory.end_with?(File.join(patched_file[:gem], 'ext', patched_file[:ext_dir]))
-                else
-                  regexp = /^#{Regexp.escape(patched_file[:gem])}\b/
-                  directory.split('/').last(3).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }
-                end
-      if matched
-        patched_file[:patches].each do |patch|
-          contents = contents.gsub(patch[:match], patch[:replacement].rstrip)
-        end
-      end
-    end
-    contents
-  end
+class Truffle::CExt::Preprocessor
 
   if __FILE__ == $0
     require 'stringio'

lib/truffle/rbconfig-for-mkmf.rb

@@ -10,6 +10,7 @@
 # clang, opt and llvm-link versions.
 
 require 'rbconfig'
+require_relative 'truffle/cext_preprocessor.rb'
 
 search_paths = {}
 if Truffle::Platform.darwin?
@@ -131,33 +132,7 @@
 # compiler which disables this standard behaviour of the C preprocessor.
 begin
   with_conditional_preprocessing = proc do |command1, command2|
-    <<-EOF
-$(if $(or\\
-  $(and\\
-    $(findstring nokogiri, $(realpath $(<))),\\
-    $(or\\
-      $(findstring xml_node_set.c, $(<)),\\
-      $(findstring xslt_stylesheet.c, $(<)),\\
-      $(findstring xml_document.c, $(<)),\\
-      $(findstring xml_sax_parser.c, $(<)),\\
-      $(findstring xml_xpath_context.c, $(<)))),\\
- $(and\\
-    $(findstring pg, $(realpath $(<))),\\
-    $(or\\
-      $(findstring pg_binary_encoder.c, $(<)),\\
-      $(findstring pg_result.c, $(<)),\\
-      $(findstring pg_tuple.c, $(<)),\\
-      $(findstring pg_text_decoder.c, $(<)),\\
-      $(findstring pg_text_encoder.c, $(<)),\\
-      $(findstring pg_type_map_by_class.c, $(<)))),\\
-  $(and\\
-    $(findstring json, $(realpath $(<))),\\
-  $(or\\
-    $(findstring parser.c, $(<))))\\
-  ),\\
-  #{preprocess_ruby} #{cext_dir}/preprocess.rb $< | #{command1},\\
-  #{command2})
-EOF
+    Truffle::CExt::Preprocessor.makefile_matcher("#{preprocess_ruby} #{cext_dir}/preprocess.rb $< | #{command1}", command2)
   end
 
   mkconfig['COMPILE_C']   = with_conditional_preprocessing.call(

lib/truffle/truffle/cext_preprocessor.rb

@@ -0,0 +1,97 @@
+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 1.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+require_relative 'patches/json_patches'
+require_relative 'patches/nokogiri_patches'
+require_relative 'patches/pg_patches'
+
+class Truffle::CExt::Preprocessor
+
+  PATCHED_FILES = {}
+
+  def self.add_gem_patches(patch_hash, gem_patches)
+    gem = gem_patches[:gem]
+    patch_list = gem_patches[:patches]
+    patch_list.each do |path_parts, patch|
+      processed_patch = {}
+      if path_parts.kind_of?(String)
+        key = path_parts
+      else
+        key = path_parts.last
+        processed_patch[:ext_dir] = path_parts.first if path_parts.size > 1
+      end
+      processed_patch[:patches] = patch
+      processed_patch[:gem] = gem
+      raise "Duplicate patch file #{key}." if patch_hash.include?(key)
+      patch_hash[key] = processed_patch
+    end
+  end
+
+  add_gem_patches(PATCHED_FILES, ::JsonPatches::PATCHES)
+  add_gem_patches(PATCHED_FILES, ::NokogiriPatches::PATCHES)
+  add_gem_patches(PATCHED_FILES, ::PgPatches::PATCHES)
+
+  def self.makefile_matcher(command1, command2)
+    file_list = {}
+    PATCHED_FILES.each_pair do |file, patch|
+      dir = if patch[:ext_dir]
+              File.join(patch[:gem], 'ext', patch[:ext_dir])
+            else
+              "/#{patch[:gem]}"
+            end
+      (file_list[dir] ||= []) << file
+    end
+
+    make_function = <<-EOF
+$(if\\
+  $(or\\
+EOF
+    file_list.each_pair do |dir, files|
+      if !files.empty?
+        make_function += <<-EOF
+    $(and\\
+      $(findstring #{dir}, $(realpath $(<))),\\
+      $(or\\
+EOF
+        files.each do |file|
+          make_function += <<-EOF
+        $(findstring #{file}, $(<)),\\
+EOF
+        end
+        make_function += <<-EOF
+      )\\
+    ),\\
+EOF
+      end
+    end
+    make_function += <<-EOF
+  ),\\
+  #{command1},\\
+  #{command2}\\
+)
+EOF
+
+  end
+
+  def self.patch(file, contents, directory)
+    if patched_file = PATCHED_FILES[File.basename(file)]
+      matched = if patched_file[:ext_dir]
+                  directory.end_with?(File.join(patched_file[:gem], 'ext', patched_file[:ext_dir]))
+                else
+                  regexp = /^#{Regexp.escape(patched_file[:gem])}\b/
+                  directory.split('/').last(3).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }
+                end
+      if matched
+        patched_file[:patches].each do |patch|
+          contents = contents.gsub(patch[:match], patch[:replacement].rstrip)
+        end
+      end
+    end
+    contents
+  end
+end

lib/cext/patches/json_patches.rb renamed to lib/truffle/truffle/patches/json_patches.rb

@@ -388,7 +388,6 @@
                     "file:lib/truffle",
                 ],
                 "lib/cext/": [
-                    "file:lib/cext/patches",
                     "file:lib/cext/*.rb",
                     "dependency:org.truffleruby.cext/src/main/c/truffleposix/<lib:truffleposix>",
                     "dependency:org.truffleruby.cext/src/main/c/sulongmock/sulongmock.o",