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

ruby-changes:12548

From: nagai <ko1@a...>
Date: Thu, 23 Jul 2009 17:29:07 +0900 (JST)
Subject: [ruby-changes:12548] Ruby:r24256 (trunk): * ext/tk/extconf.rb: should not create "config_list" in a $srcdir.

nagai	2009-07-23 17:28:49 +0900 (Thu, 23 Jul 2009)

  New Revision: 24256

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

  Log:
    * ext/tk/extconf.rb: should not create "config_list" in a $srcdir.

  Modified files:
    trunk/ChangeLog
    trunk/ext/tk/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24255)
+++ ChangeLog	(revision 24256)
@@ -1,3 +1,7 @@
+Thu Jul 23 17:26:51 2009  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/extconf.rb: should not create "config_list" in a $srcdir.
+
 Thu Jul 23 14:35:02 2009  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 24255)
+++ ext/tk/extconf.rb	(revision 24256)
@@ -1,6 +1,6 @@
 ##############################################################
 # extconf.rb for tcltklib
-# release date: 2009-07-15
+# release date: 2009-07-23
 ##############################################################
 require 'mkmf'
 
@@ -22,8 +22,8 @@
 # check configs
 ##############################################################
 $cleanfiles << 'config_list'
-config_list_file = File.join(File.dirname(__FILE__),'config_list')
-config_list_file_source = config_list_file + '.in'
+config_list_file = 'config_list'
+config_list_file_source = File.join(File.dirname(__FILE__),'config_list.in')
 if !File.exist?(config_list_file) || 
     File.ctime(config_list_file_source) > File.ctime(config_list_file)
   old_config_list_file = config_list_file_source
@@ -84,13 +84,12 @@
 if update_flag
   puts "Configure options for Ruby/Tk may be updated."
   puts "So, delete files which depend on old configs."
-  File.delete(*(Dir.glob(File.join(File.dirname(__FILE__), 
-                                   "*.#{CONFIG['DLEXT']}"))))
-  File.delete(*(Dir.glob(File.join(File.dirname(__FILE__), "*.#{$OBJEXT}"))))
-  File.delete(File.join(File.dirname(__FILE__), 'Makefile')) rescue nil
+  File.delete(*Dir.glob("*.#{CONFIG['DLEXT']}"))
+  File.delete(*Dir.glob("*.#{$OBJEXT}"))
+  File.delete('Makefile') rescue nil
 
 else
-  makefile = File.join(File.dirname(__FILE__),'Makefile')
+  makefile = 'Makefile'
   if File.exist?(makefile) && 
       File.ctime(config_list_file) > File.ctime(makefile)
     # no need to update Makefile
@@ -98,6 +97,7 @@
   end
 end
 
+
 ##############################################################
 # fuctions
 ##############################################################

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

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