[ruby-dev:12796] Re: program-transform-name

新井です。

In message "[ruby-dev:12794] program-transform-name"
  on 07 Apr 2001 09:37:34 +0900,
  Kazuhiro Yoshida <[e-mail]> wrote:
> もりきゅうです。
> 
> $ ./configure --program-transform-name=spin
> とすると
> $ make test
> と
> # make install
> でこけます。rubytest.rb と instruby.rb で
> CONFIG["ruby_install_name"] となっていたところを
> CONFIG["RUBY_INSTALL_NAME"] にしたら直りました。

私もつい最近、--program-prefix をつけたら、make test、make
install が動かない点に気づき、添付のパッチを mkconfig.rb に
あてました。ちゃんと評価してからメールしようと思ったのですが、
時間が取れなかったので現時点のものをそのままつけます。

# ruby_install_name と RUBY_INSTALL_NAME は使い分けてるわけ
# ではないですよねえ？


Index: mkconfig.rb
===================================================================
RCS file: /src/ruby/mkconfig.rb,v
retrieving revision 1.11
diff -u -r1.11 mkconfig.rb
--- mkconfig.rb	2001/01/22 07:37:14	1.11
+++ mkconfig.rb	2001/04/07 14:49:47
@@ -6,18 +6,22 @@
 srcdir = $srcdir if $srcdir
 File.makedirs(File.dirname(rbconfig_rb), true)
 
-version = VERSION
+version = RUBY_VERSION
 config = open(rbconfig_rb, "w")
 $stdout.reopen(config)
 
-fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE}
+def config_subst(name, val)
+  "  CONFIG[\"" + name + "\"] = \"" + val + "\"\n"
+end
+
+fast = {'prefix'=>TRUE, 'RUBY_INSTALL_NAME'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE}
 print %[
 module Config
 
-  VERSION == "#{version}" or
-    raise "ruby lib version (#{version}) doesn't match executable version (\#{VERSION})"
+  RUBY_VERSION == "#{version}" or
+    raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})"
 
-# This file was created by configrb when ruby was built. Any changes
+# This file was created by mkconfig.rb when ruby was built. Any changes
 # made to this file will be lost the next time ruby is built.
 ]
 
@@ -28,44 +32,41 @@
 has_version = false
 File.foreach "config.status" do |line|
   next if /^#/ =~ line
-  if /^s[%,]@program_transform_name@[%,]s,(.*)[%,]/ =~ line
-    next if $install_name
-    ptn = $1.sub(/\$\$/, '$').split(/,/)	#'
-    v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + "ruby".sub(ptn[0],ptn[1]) + "\"\n"
-  elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line
+  if /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line
     name = $1
     val = $2 || ""
-    next if /^(INSTALL|DEFS|configure_input|srcdir|top_srcdir)$/ =~ name
-    next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
+    next if /^(INSTALL|DEFS|program_transform_name|configure_input|srcdir|top_srcdir)$/ =~ name
+    next if $install_name and /^RUBY_INSTALL_NAME$/ =~  name
     next if $so_name and /^RUBY_SO_NAME$/ =~  name
-    v = "  CONFIG[\"" + name + "\"] = " +
-      val.sub(/^\s*(.*)\s*$/, '"\1"').gsub(/\$\{?(\w+)\}?/) {
+
+    val = val.strip.gsub(/\$\{?(\w+)\}?/) {
       "\#{CONFIG[\\\"#{$1}\\\"]}"
-    } + "\n"
+    }
+
     if fast[name]
-      v_fast << v
+      v_fast << config_subst(name, val)
     else
-      v_others << v
+      v_others << config_subst(name, val)
     end
     has_version = true if name == "MAJOR"
   elsif /^ac_given_srcdir=(.*)/ =~ line
-    v_fast << "  CONFIG[\"srcdir\"] = \"" + File.expand_path($1) + "\"\n"
+    v_fast << config_subst("srcdir", File.expand_path($1))
     has_srcdir = true
   elsif /^ac_given_INSTALL=(.*)/ =~ line
-    v_fast << "  CONFIG[\"INSTALL\"] = " + $1 + "\n"
+    v_fast << config_subst("INSTALL", $1)
   end
 #  break if /^CEOF/
 end
 
 if not has_srcdir
-  v_fast << "  CONFIG[\"srcdir\"] = \"" + File.expand_path(srcdir) + "\"\n"
+  v_fast << config_subst("srcdir", File.expand_path(srcdir))
 end
 
 if not has_version
-  VERSION.scan(/(\d+)\.(\d+)\.(\d+)/) {
-    print "  CONFIG[\"MAJOR\"] = \"" + $1 + "\"\n"
-    print "  CONFIG[\"MINOR\"] = \"" + $2 + "\"\n"
-    print "  CONFIG[\"TEENY\"] = \"" + $3 + "\"\n"
+  RUBY_VERSION.scan(/(\d+)\.(\d+)\.(\d+)/) {
+    print config_subst("MAJOR", $1)
+    print config_subst("MINOR", $2)
+    print config_subst("TEENY", $3)
   }
 end
 
@@ -80,15 +81,15 @@
 end
 
 if $install_name
-  v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n"
-  v_fast << "  CONFIG[\"RUBY_INSTALL_NAME\"] = \"" + $install_name + "\"\n"
+  v_fast << config_subst("RUBY_INSTALL_NAME", $install_name)
 end
 if $so_name
-  v_fast << "  CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
+  v_fast << config_subst("RUBY_SO_NAME", $so_name)
 end
 
 print v_fast, v_others
 print <<EOS
+  CONFIG["ruby_install_name"] = CONFIG["RUBY_INSTALL_NAME"].dup
   CONFIG["compile_dir"] = "#{Dir.pwd}"
   MAKEFILE_CONFIG = {}
   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}

--
新井康司 (Koji Arai)