From 600e3330b3c4f170bd15e37554af533c2a3176ab Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sat, 14 Nov 2020 18:48:05 +0900
Subject: Scan source files only from `cdump` enabled gems.

---
 Rakefile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index 9869dc62e..4fcbb2837 100644
--- a/Rakefile
+++ b/Rakefile
@@ -60,6 +60,9 @@ else
   depfiles = []
 end
 
+cfiles  = Dir.glob("#{MRUBY_ROOT}/src/*.c")
+rbfiles = Dir.glob("#{MRUBY_ROOT}/mrblib/**/*.rb")
+psfiles = []
 MRuby.each_target do |target|
   gems.map do |gem|
     current_dir = gem.dir.relative_path_from(Dir.pwd)
@@ -94,21 +97,16 @@ MRuby.each_target do |target|
         depfiles += [ exec ]
       end
     end
+
+    if gem.cdump?
+      cfiles += Dir.glob(relative_from_root+"/{src,core}/*.c")
+      rbfiles += Dir.glob(relative_from_root+"/mrblib/**/*.rb")
+      psfiles += Dir.glob(relative_from_root+"/**/presym")
+    end
   end
 end
 
 mkdir_p "#{MRUBY_ROOT}/build"
-cfiles = (
-  Dir.glob("#{MRUBY_ROOT}/src/*.c")+
-  Dir.glob("#{MRUBY_ROOT}/mrbgems/**/*.c")+
-  Dir.glob("#{MRUBY_ROOT}/build/repos/**/{src,core}/*.c")
-).uniq
-rbfiles = (
-  Dir.glob("#{MRUBY_ROOT}/mrblib/**/*.rb")+
-  Dir.glob("#{MRUBY_ROOT}/mrbgems/*/mrblib/**/*.rb").grep_v(/mruby-test/)+
-  Dir.glob("#{MRUBY_ROOT}/build/repos/**/mrblib/**/*.rb")
-).uniq
-psfiles = Dir.glob("#{MRUBY_ROOT}/{mrblib,mrbgems,build/repos}/**/presym")
 symbols = []
 psfiles.each do |file|
   symbols += File.readlines(file).grep_v(/^# /)
@@ -197,7 +195,7 @@ file presym_file => cfiles+rbfiles+psfiles+[__FILE__] do
      src.scan(/[ \(\[\{]:'([^']+)'/)
     ]
   end
-  symbols = (symbols+csymbols+rbsymbols+op_table.keys).flatten.compact.uniq.sort.map{|x| x.gsub("\n", '\n')}
+  symbols = (symbols+csymbols+rbsymbols+op_table.keys).flatten.compact.uniq.sort.grep_v(/#/).map{|x| x.gsub("\n", '\n')}
   presyms = File.readlines(presym_file) rescue []
   presyms.each{|x| x.chomp!}
   if presyms != symbols
-- 
cgit v1.2.3