From b2d9f1e9d0da3a0b63e231d5692824368efd80cd Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 17 Dec 2007 08:47:28 +0000
Subject: * 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 117 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 65 insertions(+), 52 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 985c70e4a0..f8588b4fe2 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -74,6 +74,15 @@ def dir_re(dir)
   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 @@ end
 
 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 @@ all install static install-so install-rb: Makefile
 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 @@ site-install-rb: install-rb
 
   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
-- 
cgit v1.2.3