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

* configure.in (BUILTIN_ENCS): removed.

Browse Source 
* common.mk (enc.mk): pass BUILTIN_ENCS from command line.

* enc/depend: ditto.

* enc/make_encmake.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-17 17:30:57 +00:00
parent c9fe9f5850
commit c611b6d0cc
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Tue Dec 18 02:30:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (BUILTIN_ENCS): removed.
* common.mk (enc.mk): pass BUILTIN_ENCS from command line.
* enc/depend: ditto.
* enc/make_encmake.rb: ditto.
Tue Dec 18 01:46:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Dec 18 01:46:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_str_format): need to clear output buffer to avoid * sprintf.c (rb_str_format): need to clear output buffer to avoid

2
common.mk
View File

@ -344,7 +344,7 @@ encs: enc.mk
enc.mk: miniruby$(EXEEXT) $(srcdir)/enc/make_encmake.rb \ enc.mk: miniruby$(EXEEXT) $(srcdir)/enc/make_encmake.rb \
$(srcdir)/enc/Makefile.in $(srcdir)/enc/depend $(srcdir)/lib/mkmf.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend $(srcdir)/lib/mkmf.rb
$(MINIRUBY) $(srcdir)/enc/make_encmake.rb $@ $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@
.PRECIOUS: $(MKFILES) .PRECIOUS: $(MKFILES)

3
configure.in
View File

@ -1738,11 +1738,8 @@ tr -d '\015' < largefile.h > confdefs.h
BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ ]*=/{' \ BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ ]*=/{' \
-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \ -e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
-e '}' "${srcdir}/enc/Makefile.in"`"] -e '}' "${srcdir}/enc/Makefile.in"`"]
BUILTIN_ENCS="`echo $BUILTIN_ENCS`"
BUILTIN_ENCOBJS= BUILTIN_ENCOBJS=
for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done
AC_SUBST(BUILTIN_ENCS)
AC_SUBST(BUILTIN_ENCOBJS) AC_SUBST(BUILTIN_ENCOBJS)
AC_CONFIG_FILES($FIRSTMAKEFILE) AC_CONFIG_FILES($FIRSTMAKEFILE)

2
enc/depend
View File

@ -1,4 +1,4 @@
! encs = (Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - CONFIG["BUILTIN_ENCS"].split).each {|e| e.chomp!(".c")} ! encs = (Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS).each {|e| e.chomp!(".c")}
VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join(CONFIG["PATH_SEPARATOR"]) %> VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join(CONFIG["PATH_SEPARATOR"]) %>

9
enc/make_encmake.rb
View File

@ -7,6 +7,13 @@ $:.unshift(".")
require 'mkmf' require 'mkmf'
require 'tool/serb' require 'tool/serb'
if /--builtin-encs=/ =~ ARGV[0]
BUILTIN_ENCS = $'.split.each {|e| e.sub!(/(?:\.\w+)?\z/, '.c')}
ARGV.shift
else
BUILTIN_ENCS = []
end
mkin = File.read(File.join($srcdir, "Makefile.in")) mkin = File.read(File.join($srcdir, "Makefile.in"))
mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]} mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
if File.exist?(depend = File.join($srcdir, "depend")) if File.exist?(depend = File.join($srcdir, "depend"))
@ -14,6 +21,6 @@ if File.exist?(depend = File.join($srcdir, "depend"))
eval(serb(File.read(depend), 'tmp')) eval(serb(File.read(depend), 'tmp'))
mkin << "\n#### depend ####\n\n" << depend_rules(tmp).join mkin << "\n#### depend ####\n\n" << depend_rules(tmp).join
end end
open(ARGV[0], 'w') {|f| open(ARGV[0], 'wb') {|f|
f.puts mkin f.puts mkin
} }