1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/erb] Skip using the extension for truffleruby as well

Browse Source 
(https://github.com/ruby/erb/pull/39)

* Skip using the extension for truffleruby as well

* Just skip building the C extension for TruffleRuby

* Skip rake compile for truffleruby

* Use resolve_feature_path

* Revert "Use resolve_feature_path"

This reverts commit https://github.com/ruby/erb/commit/acc1e0c0ffaf.

* Use resolve_feature_path with LoadError guard

https://github.com/ruby/erb/commit/85dcb08439
This commit is contained in:
Takashi Kokubun 2022-11-26 22:30:43 -08:00 committed by git
parent ec76c9868b
commit d2c62426e5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/erb/escape/extconf.rb
View File

@ -1,2 +1,7 @@
require 'mkmf' require 'mkmf'
if RUBY_ENGINE == 'truffleruby'
File.write('Makefile', dummy_makefile($srcdir).join)
else
create_makefile 'erb/escape' create_makefile 'erb/escape'
end

7
lib/erb/util.rb
View File

@ -4,10 +4,13 @@
# A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope # A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope
# Rails will not monkey-patch ERB::Escape#html_escape. # Rails will not monkey-patch ERB::Escape#html_escape.
begin begin
# We don't build the C extension for JRuby, TruffleRuby, and WASM
if $LOAD_PATH.resolve_feature_path('erb/escape')
require 'erb/escape' require 'erb/escape'
rescue LoadError # JRuby can't load .so
end end
unless defined?(ERB::Escape) # JRuby rescue LoadError # resolve_feature_path raises LoadError on TruffleRuby 22.3.0
end
unless defined?(ERB::Escape)
module ERB::Escape module ERB::Escape
def html_escape(s) def html_escape(s)
CGI.escapeHTML(s.to_s) CGI.escapeHTML(s.to_s)