ruby-changes:25866
From: ko1 <ko1@a...>
Date: Wed, 28 Nov 2012 14:52:22 +0900 (JST)
Subject: [ruby-changes:25866] ko1:r37923 (trunk): * ext/psych/extconf.rb: copy sources into build directory,
ko1 2012-11-28 14:52:11 +0900 (Wed, 28 Nov 2012) New Revision: 37923 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37923 Log: * ext/psych/extconf.rb: copy sources into build directory, not into srcdir. Modified files: trunk/ChangeLog trunk/ext/psych/extconf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 37922) +++ ChangeLog (revision 37923) @@ -1,3 +1,8 @@ +Wed Nov 28 14:50:55 2012 Koichi Sasada <ko1@a...> + + * ext/psych/extconf.rb: copy sources into build directory, + not into srcdir. + Wed Nov 28 14:34:06 2012 KOSAKI Motohiro <kosaki.motohiro@g...> * thread.c (rb_mutex_lock): moved trap context check from Index: ext/psych/extconf.rb =================================================================== --- ext/psych/extconf.rb (revision 37922) +++ ext/psych/extconf.rb (revision 37923) @@ -11,12 +11,17 @@ srcdir = File.expand_path File.dirname __FILE__ files = Dir.chdir File.join(srcdir, 'yaml') do Dir.entries(Dir.pwd).find_all { |f| - File.file?(f) && File.extname(f) =~ /^\.[hc]/ + File.file?(f) && /^\.[hc]/ =~ File.extname(f) }.map { |f| File.expand_path f } end - FileUtils.cp_r files, srcdir + dstdir = Dir.pwd + FileUtils.cp_r files, dstdir + $objs = (Dir.glob(File.join(File.dirname(__FILE__), '*.c')) + Dir.glob('*.c')).map{|f| + File.basename(f, '.c') + ".#{$OBJEXT}" + } + if $mswin $CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H" end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/