Use rbs-integrated RDoc (ruby#16940)

Bump rdoc to the rbs-integrated revision and let bundled gem
specs always be published under .bundle/specifications/ so RDoc's
activation of rbs works during make html.

Two issues blocked `make html` after the rdoc bump:

1. tool/lib/bundled_gem.rb routed gemspecs of bundled gems with
   C extensions into .bundle/gems/<gem>/ instead of
   .bundle/specifications/. RubyGems looked at the standard
   location and could not activate rbs as a runtime dependency
   of rdoc. Drop that branch and always write to
   .bundle/specifications/; the parallel .bundled.<gem>.gemspec
   files (consumed only by extmk.rb's gemspec copy rule and
   outdate-bundled-gems.rb's existence check) are no longer
   needed.

2. ext/configure-ext.mk was generated before prepare-gems
   populated .bundle/gems/, so the template's
   `Dir.glob(".bundle/gems/**/extconf.rb")` found nothing on a
   clean tree and exts.mk lacked rules for bundled-gem
   extensions. Add prepare-gems to its prerequisites so the
   bundled-gem directories exist when the template runs.

https://claude.ai/code/session_01YRoRyZPew2LtN6u6BX8bzx

Author: claude

common.mk

@@ -346,7 +346,8 @@ $(EXTS_MK): ext/configure-ext.mk $(srcdir)/template/exts.mk.tmpl \
 	    $(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake) --configure-exts=ext/configure-ext.mk
 
 ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) \
-		$(srcdir)/template/configure-ext.mk.tmpl update-default-gemspecs
+		$(srcdir)/template/configure-ext.mk.tmpl update-default-gemspecs \
+		$(HAVE_BASERUBY:yes=prepare-gems)
 	$(ECHO) generating makefiles $@
 	$(Q)$(MAKEDIRS) $(@D)
 	$(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \

ext/extmk.rb

@@ -601,19 +601,6 @@ def create_makefile(*args, &block)
 clean-build_complete:
 	-$(Q)$(RM) $(build_complete)
 
-install: gemspec
-clean: clean-gemspec
-
-gemspec = $(TARGET_TOPDIR)/specifications/$(gem).gemspec
-$(gemspec): $(gem_srcdir)/.bundled.$(gem).gemspec
-	$(Q) $(MAKEDIRS) $(@D)
-	$(Q) $(COPY) $(gem_srcdir)/.bundled.$(gem).gemspec $@
-
-gemspec: $(gemspec)
-
-clean-gemspec:
-	-$(Q)$(RM) $(gemspec)
-
 LN_S = #{config_string('LN_S')}
 CP_R = #{config_string('CP')} -r
 }

gems/bundled_gems

@@ -37,7 +37,7 @@ ostruct             0.6.3   https://github.com/ruby/ostruct
 pstore              0.2.1   https://github.com/ruby/pstore
 benchmark           0.5.0   https://github.com/ruby/benchmark
 logger              1.7.0   https://github.com/ruby/logger
-rdoc                7.2.0   https://github.com/ruby/rdoc bc0baee787609f2205e8f1103f3e1d36b923184a
+rdoc                7.2.0   https://github.com/ruby/rdoc 1f93543615928b6d45357432f16ec6006e2d8b1e
 win32ole            1.9.3   https://github.com/ruby/win32ole
 irb                 1.18.0  https://github.com/ruby/irb
 reline              0.6.3   https://github.com/ruby/reline

tool/lib/bundled_gem.rb

@@ -74,15 +74,8 @@ def prepare_test(spec, dir = ".")
     Gem.ensure_gem_subdirectories(dir)
     gem_dir = File.join(dir, "gems", target)
     yield gem_dir
-    spec_dir = spec.extensions.empty? ? "specifications" : File.join("gems", target)
-    if spec.extensions.empty?
-      spec.dependencies.reject! {|dep| DEFAULT_GEMS_DEPENDENCIES.include?(dep.name)}
-    end
-    File.binwrite(File.join(dir, spec_dir, "#{target}.gemspec"), spec.to_ruby)
-    unless spec.extensions.empty?
-      spec.dependencies.clear
-      File.binwrite(File.join(dir, spec_dir, ".bundled.#{target}.gemspec"), spec.to_ruby)
-    end
+    spec.dependencies.reject! {|dep| DEFAULT_GEMS_DEPENDENCIES.include?(dep.name)}
+    File.binwrite(File.join(dir, "specifications", "#{target}.gemspec"), spec.to_ruby)
     if spec.bindir and spec.executables
       bindir = File.join(dir, "bin")
       Dir.mkdir(bindir) rescue nil

tool/outdate-bundled-gems.rb

@@ -160,8 +160,7 @@ def each_directory
 
 curdir.glob(".bundle/gems/*/") do |dir|
   base = File.basename(dir)
-  unless curdir.exist?(".bundle/specifications/#{base}.gemspec") or
-        curdir.exist?("#{dir}/.bundled.#{base}.gemspec")
+  unless curdir.exist?(".bundle/specifications/#{base}.gemspec")
     curdir.rmdir(dir)
   end
 end