diff options
| -rw-r--r-- | enc/depend | 8 | ||||
| -rwxr-xr-x | ext/extmk.rb | 17 | ||||
| -rwxr-xr-x | ext/ripper/tools/generate.rb | 1 |
3 files changed, 12 insertions, 14 deletions
diff --git a/enc/depend b/enc/depend index fb6bb57de5..ca6085dad9 100644 --- a/enc/depend +++ b/enc/depend @@ -38,7 +38,7 @@ % cleanobjs << "$*.def" if deffile % rule_subst = CONFIG["RULE_SUBST"] || "%s" % transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s" -% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "") % "" +% transvpath_prefix = rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "" % if File::ALT_SEPARATOR % pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")} % else @@ -99,7 +99,7 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma. <%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%> % src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}] -<%=transvpath % "#{e}.c"%>: <%= src.map {|e| transvpath % "#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb +<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb % end % end @@ -150,8 +150,8 @@ clean: $(Q)$(RM) enc/unicode/name2ctype.h -$(Q)$(RMDIR) enc/unicode<%=@ignore_error%> % end -% workdirs.reverse_each do|dir| - -$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%> +% workdirs.reverse_each do|d| + -$(Q)$(RMDIR) <%=pathrep[d]%><%=@ignore_error%> % end clean-srcs: diff --git a/ext/extmk.rb b/ext/extmk.rb index 0eb9d0a10f..3b2c0c65fa 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -190,7 +190,6 @@ def extmake(target) # ignore ensure rm_f "conftest*" - config = $0 $0 = $PROGRAM_NAME end end @@ -424,7 +423,7 @@ end unless $extstatic ext_prefix = "#{$top_srcdir}/ext" exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t} withes, withouts = %w[--with --without].collect {|w| - if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any? + if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any? nil elsif (w = w.grep(String)).empty? proc {true} @@ -617,20 +616,20 @@ if $configure_only and $command_output end mf.puts targets = %w[all install static install-so install-rb clean distclean realclean] - targets.each do |target| - mf.puts "#{target}: $(extensions:/.=/#{target})" + targets.each do |tgt| + mf.puts "#{tgt}: $(extensions:/.=/#{tgt})" end mf.puts mf.puts "all: #{rubies.join(' ')}" mf.puts "#{rubies.join(' ')}: $(extensions:/.=/all)" - rubies.each do |target| - mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@" + rubies.each do |tgt| + mf.puts "#{tgt}:\n\t$(Q)$(MAKE) $(MFLAGS) $@" end mf.puts - exec = config_string("exec") {|s| s + " "} - targets.each do |target| + exec = config_string("exec") {|str| str + " "} + targets.each do |tgt| exts.each do |d| - mf.puts "#{d[0..-2]}#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)" + mf.puts "#{d[0..-2]}#{tgt}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)" end end end diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb index 333b64afae..48ad9e1d25 100755 --- a/ext/ripper/tools/generate.rb +++ b/ext/ripper/tools/generate.rb @@ -6,7 +6,6 @@ def main mode = nil ids1src = nil ids2src = nil - template = nil output = nil parser = @parser = OptionParser.new |