[前][次][番号順一覧][スレッド一覧]

ruby-changes:11485

From: nobu <ko1@a...>
Date: Wed, 1 Apr 2009 18:45:08 +0900 (JST)
Subject: [ruby-changes:11485] Ruby:r23111 (trunk): * mkconfig.rb: ignores version numbers in config.status. replaces

nobu	2009-04-01 18:44:56 +0900 (Wed, 01 Apr 2009)

  New Revision: 23111

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23111

  Log:
    * mkconfig.rb: ignores version numbers in config.status.  replaces
      all $$s in program_transform_name.

  Modified files:
    trunk/ChangeLog
    trunk/mkconfig.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23110)
+++ ChangeLog	(revision 23111)
@@ -1,3 +1,8 @@
+Wed Apr  1 18:44:53 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* mkconfig.rb: ignores version numbers in config.status.  replaces
+	  all $$s in program_transform_name.
+
 Wed Apr  1 15:12:21 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in (.c.i): use CPP instead of CC, since gcc -E can'
Index: mkconfig.rb
===================================================================
--- mkconfig.rb	(revision 23110)
+++ mkconfig.rb	(revision 23111)
@@ -76,11 +76,12 @@
     next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
     next if $so_name and /^RUBY_SO_NAME$/ =~  name
     next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ name
+    next if /^(?:MAJOR|MINOR|TEENY)$/ =~ name
     arch = val if name == "arch"
     if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val
       next if $install_name
       sep = %r"#{Regexp.quote($1)}"
-      ptn = $2.sub(/\$\$/, '$').split(sep, 2)
+      ptn = $2.gsub(/\$\$/, '$').split(sep, 2)
       name = "ruby_install_name"
       val = "ruby".sub(/#{ptn[0]}/, ptn[1])
     end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]