ruby-changes:2790
From: ko1@a...
Date: 18 Dec 2007 02:31:48 +0900
Subject: [ruby-changes:2790] nobu - Ruby:r14281 (trunk): * configure.in (BUILTIN_ENCS): removed.
nobu 2007-12-18 02:30:57 +0900 (Tue, 18 Dec 2007) New Revision: 14281 Modified files: trunk/ChangeLog trunk/common.mk trunk/configure.in trunk/enc/depend trunk/enc/make_encmake.rb Log: * configure.in (BUILTIN_ENCS): removed. * common.mk (enc.mk): pass BUILTIN_ENCS from command line. * enc/depend: ditto. * enc/make_encmake.rb: ditto. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/make_encmake.rb?r1=14281&r2=14280 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14281&r2=14280 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=14281&r2=14280 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/depend?r1=14281&r2=14280 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=14281&r2=14280 Index: configure.in =================================================================== --- configure.in (revision 14280) +++ configure.in (revision 14281) @@ -1738,11 +1738,8 @@ BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ ]*=/{' \ -e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \ -e '}' "${srcdir}/enc/Makefile.in"`"] -BUILTIN_ENCS="`echo $BUILTIN_ENCS`" BUILTIN_ENCOBJS= for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done - -AC_SUBST(BUILTIN_ENCS) AC_SUBST(BUILTIN_ENCOBJS) AC_CONFIG_FILES($FIRSTMAKEFILE) Index: ChangeLog =================================================================== --- ChangeLog (revision 14280) +++ ChangeLog (revision 14281) @@ -1,3 +1,13 @@ +Tue Dec 18 02:30:56 2007 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> * sprintf.c (rb_str_format): need to clear output buffer to avoid Index: enc/depend =================================================================== --- enc/depend (revision 14280) +++ enc/depend (revision 14281) @@ -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"]) %> Index: enc/make_encmake.rb =================================================================== --- enc/make_encmake.rb (revision 14280) +++ enc/make_encmake.rb (revision 14281) @@ -7,6 +7,13 @@ require 'mkmf' 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.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]} if File.exist?(depend = File.join($srcdir, "depend")) @@ -14,6 +21,6 @@ eval(serb(File.read(depend), 'tmp')) mkin << "\n#### depend ####\n\n" << depend_rules(tmp).join end -open(ARGV[0], 'w') {|f| +open(ARGV[0], 'wb') {|f| f.puts mkin } Index: common.mk =================================================================== --- common.mk (revision 14280) +++ common.mk (revision 14281) @@ -344,7 +344,7 @@ enc.mk: miniruby$(EXEEXT) $(srcdir)/enc/make_encmake.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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml