ruby-changes:2776
From: ko1@a...
Date: 17 Dec 2007 17:48:25 +0900
Subject: [ruby-changes:2776] nobu - Ruby:r14267 (trunk): * common.mk (encs): new target to compile external encodings.
nobu 2007-12-17 17:47:28 +0900 (Mon, 17 Dec 2007)
New Revision: 14267
Added files:
trunk/enc/make_encmake.rb
trunk/tool/serb.rb
Modified files:
trunk/ChangeLog
trunk/common.mk
trunk/enc/Makefile.in
trunk/ext/extmk.rb
trunk/lib/mkmf.rb
trunk/tool/compile_prelude.rb
Log:
* common.mk (encs): new target to compile external encodings.
* enc/Makefile.in: became a serb template.
* enc/make_encmake.rb: creates enc.mk from enc/Makefile.in using serb.
* lib/mkmf.rb (relative_from): moved from ext/extmk.rb.
* lib/mkmf.rb ($extmk): true if under to top source directory, not
only ext.
* lib/mkmf.rb (depend_rules): extracted from create_makefile.
* tool/serb.rb (serb): splitted from tool/compile_prelude.rb.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/tool/serb.rb?revision=14267&view=markup
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/tool/serb.rb?r1=14267&r2=14266
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/make_encmake.rb?revision=14267&view=markup
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/make_encmake.rb?r1=14267&r2=14266
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/tool/compile_prelude.rb?r1=14267&r2=14266
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14267&r2=14266
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=14267&r2=14266
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/Makefile.in?r1=14267&r2=14266
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=14267&r2=14266
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=14267&r2=14266
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14266)
+++ ChangeLog (revision 14267)
@@ -1,3 +1,20 @@
+Mon Dec 17 17:47:26 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * common.mk (encs): new target to compile external encodings.
+
+ * enc/Makefile.in: became a serb template.
+
+ * enc/make_encmake.rb: creates enc.mk from enc/Makefile.in using serb.
+
+ * lib/mkmf.rb (relative_from): moved from ext/extmk.rb.
+
+ * lib/mkmf.rb ($extmk): true if under to top source directory, not
+ only ext.
+
+ * lib/mkmf.rb (depend_rules): extracted from create_makefile.
+
+ * tool/serb.rb (serb): splitted from tool/compile_prelude.rb.
+
Mon Dec 17 17:32:55 2007 Nobuyoshi Nakada <nobu@r...>
* configure.in (MAKEFILES): removed enc/Makefile.
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in (revision 14266)
+++ enc/Makefile.in (revision 14267)
@@ -4,7 +4,7 @@
EXTOUT = @EXTOUT@
hdrdir = $(top_srcdir)/include
arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(top_srcdir):$(srcdir)
+VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join("@PATH_SEPARATOR@") %>
ENCSODIR = $(EXTOUT)/$(arch)/enc
DLEXT = @DLEXT@
OBJEXT = @OBJEXT@
@@ -13,8 +13,8 @@
euc_jp.c sjis.c \
unicode.c utf8.c
-ENCOBJS = @EXTERNAL_ENCOBJS@
-ENCSOS = @ENCSOS@
+ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t ")+"\n"%>
+ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")+"\n"%>
empty =
CC = @CC@
OUTFLAG = @OUTFLAG@$(empty)
@@ -26,3 +26,17 @@
LIBS = @LIBS@ $(EXTLIBS)
LDSHARED = @LDSHARED@
DLDFLAGS = @DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
+
+#!#! if File.exist?(depend = File.join($srcdir, "depend"))
+#### depend ####
+#!#<% depend_rules(depend).join%>
+#!#! end
+#!#! encs.each do |e|
+#!#
+#!#$(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT)
+#!# <%LINK_SO.gsub(/\n/, "\n\t")%>
+#!#! end
+#!#! encs.each do |e|
+#!#
+#!#<%e%>.$(OBJEXT): <% (RULE_SUBST || "%s") % "#{e}.c" %>
+#!#! end
Index: enc/make_encmake.rb
===================================================================
--- enc/make_encmake.rb (revision 0)
+++ enc/make_encmake.rb (revision 14267)
@@ -0,0 +1,23 @@
+#! ./miniruby
+
+dir = File.expand_path("../..", __FILE__)
+$:.unshift(File.join(dir, "lib"))
+$:.unshift(dir)
+File.directory?("enc") || File.mkdir("enc")
+$:.unshift(".")
+require 'mkmf'
+require 'tool/serb'
+
+encdir = File.join($top_srcdir, "enc")
+
+encs = Dir.open(encdir) {|d| d.grep(/.+\.c\z/)}
+encs -= CONFIG["BUILTIN_ENCS"].split
+encs.each {|e| e.chomp!(".c")}
+mkin = File.read(File.join(encdir, "Makefile.in"))
+mkin.gsub!(/^\#!\# ?/, '')
+mkin.gsub!(/@(#{RbConfig::MAKEFILE_CONFIG.keys.join('|')})@/) {CONFIG[$1]}
+tmp = ''
+eval(serb(mkin, 'tmp'))
+open(ARGV[0], 'w') {|f|
+ f.puts tmp
+}
Property changes on: enc/make_encmake.rb
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ LF
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb (revision 14266)
+++ lib/mkmf.rb (revision 14267)
@@ -74,6 +74,15 @@
Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$(?:\(target_prefix\)|\{target_prefix\}))?')
end
+def relative_from(path, base)
+ dir = File.join(path, "")
+ if File.expand_path(dir) == File.expand_path(dir, base)
+ path
+ else
+ File.join(base, path)
+ end
+end
+
INSTALL_DIRS = [
[dir_re('commondir'), "$(RUBYCOMMONDIR)"],
[dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
@@ -136,7 +145,7 @@
topdir = File.dirname(libdir = File.dirname(__FILE__))
extdir = File.expand_path("ext", topdir)
-$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
+$extmk = File.expand_path($0)[0, topdir.size+1] == topdir+"/"
if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
$topdir = $hdrdir
$top_srcdir = $hdrdir
@@ -1257,6 +1266,60 @@
RULES
end
+def depend_rules(depend)
+ suffixes = []
+ depout = []
+ depout << "$(OBJS): $(RUBY_EXTCONF_H)\n\n" if $extconf_h
+ unless suffixes.empty?
+ depout << ".SUFFIXES: ." + suffixes.uniq.join(" .") + "\n\n"
+ end
+ open(depend, "r") do |dfile|
+ cont = implicit = nil
+ impconv = proc do
+ COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
+ implicit = nil
+ end
+ ruleconv = proc do |line|
+ if implicit
+ if /\A\t/ =~ line
+ implicit[1] << line
+ next
+ else
+ impconv[]
+ end
+ end
+ if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
+ suffixes << m[1] << m[2]
+ implicit = [[m[1], m[2]], [m.post_match]]
+ next
+ elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
+ line.gsub!(%r"(?<=\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)", &RULE_SUBST.method(:%))
+ end
+ depout << line
+ end
+ while line = dfile.gets()
+ line.gsub!(/\.o\b/, ".#{$OBJEXT}")
+ line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h
+ line.gsub!(%r"\$\(hdrdir\)/(?!ruby/)", '\&ruby/')
+ if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
+ (cont ||= []) << line
+ next
+ elsif cont
+ line = (cont << line).join
+ cont = nil
+ end
+ ruleconv.call(line)
+ end
+ if cont
+ ruleconv.call(cont.join)
+ elsif implicit
+ impconv.call
+ end
+ end
+ depout.flatten!
+ depout
+end
+
# Generates the Makefile for your extension, passing along any options and
# preprocessor constants that you may have generated through other methods.
#
@@ -1518,57 +1581,7 @@
depend = File.join(srcdir, "depend")
if File.exist?(depend)
- suffixes = []
- depout = []
- open(depend, "r") do |dfile|
- mfile.printf "###\n"
- cont = implicit = nil
- impconv = proc do
- COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
- implicit = nil
- end
- ruleconv = proc do |line|
- if implicit
- if /\A\t/ =~ line
- implicit[1] << line
- next
- else
- impconv[]
- end
- end
- if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
- suffixes << m[1] << m[2]
- implicit = [[m[1], m[2]], [m.post_match]]
- next
- elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
- line.gsub!(%r"(?<=\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)", &RULE_SUBST.method(:%))
- end
- depout << line
- end
- while line = dfile.gets()
- line.gsub!(/\.o\b/, ".#{$OBJEXT}")
- line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h
- line.gsub!(%r"\$\(hdrdir\)/(?!ruby/)", '\&ruby/')
- if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
- (cont ||= []) << line
- next
- elsif cont
- line = (cont << line).join
- cont = nil
- end
- ruleconv.call(line)
- end
- if cont
- ruleconv.call(cont.join)
- elsif implicit
- impconv.call
- end
- end
- unless suffixes.empty?
- mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n"
- end
- mfile.print "$(OBJS): $(RUBY_EXTCONF_H)\n\n" if $extconf_h
- mfile.print(*depout.flatten)
+ mfile.print("###\n", *depend_rules(depend))
else
headers = %w[ruby.h defines.h]
if RULE_SUBST
Index: common.mk
===================================================================
--- common.mk (revision 14266)
+++ common.mk (revision 14267)
@@ -96,7 +96,7 @@
BOOTSTRAPRUBY = $(BASERUBY)
-all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
+all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) encs
@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
prog: $(PROGRAM) $(WPROGRAM)
@@ -339,6 +339,12 @@
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb
+encs: enc.mk
+ $(MAKE) -f enc.mk
+
+enc.mk: miniruby$(EXEEXT)
+ $(MINIRUBY) $(srcdir)/enc/make_encmake.rb $@
+
.PRECIOUS: $(MKFILES)
.PHONY: test install install-nodoc install-doc dist
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb (revision 14266)
+++ ext/extmk.rb (revision 14267)
@@ -42,15 +42,6 @@
@quote ? x.quote : x
end
-def relative_from(path, base)
- dir = File.join(path, "")
- if File.expand_path(dir) == File.expand_path(dir, base)
- path
- else
- File.join(base, path)
- end
-end
-
def extract_makefile(makefile, keep = true)
m = File.read(makefile)
if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
Index: tool/compile_prelude.rb
===================================================================
--- tool/compile_prelude.rb (revision 14266)
+++ tool/compile_prelude.rb (revision 14267)
@@ -54,23 +54,7 @@
[setup_lines, lines]
}
-def serb(str, var)
- result = ''
- str.each_line {|line|
- if /\A!/ =~ line
- result << $'
- else
- line.split(/(<%.*?%>)/).each {|x|
- if /\A<%(.*)%>\z/ =~ x
- result << "#{var} << (#{$1}).to_s\n"
- else
- result << "#{var} << #{x.dump}\n"
- end
- }
- end
- }
- result
-end
+require 'tool/serb'
tmp = ''
eval(serb(<<'EOS', 'tmp'))
Index: tool/serb.rb
===================================================================
--- tool/serb.rb (revision 0)
+++ tool/serb.rb (revision 14267)
@@ -0,0 +1,17 @@
+def serb(str, var)
+ result = ''
+ str.each_line {|line|
+ if /\A!/ =~ line
+ result << $'
+ else
+ line.split(/(<%.*?%>)/).each {|x|
+ if /\A<%(.*)%>\z/ =~ x
+ result << "#{var} << (#{$1}).to_s\n"
+ else
+ result << "#{var} << #{x.dump}\n"
+ end
+ }
+ end
+ }
+ result
+end
Property changes on: tool/serb.rb
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ LF
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml