kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/extmk.rb: fix for extstatic.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-12-30 16:58:51 +00:00
parent b7a59cd178
commit 8de8d8b562
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Dec 31 01:58:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: fix for extstatic.
Wed Dec 30 19:43:00 2009 NARUSE, Yui <naruse@ruby-lang.org> Wed Dec 30 19:43:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
* include/ruby/ruby.h (RREGEXP_SRC_END): added. * include/ruby/ruby.h (RREGEXP_SRC_END): added.

12
ext/extmk.rb
View file

@ -69,8 +69,10 @@ def extract_makefile(makefile, keep = true)
end end
$target = target $target = target
$extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1] $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
$static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false if $static.nil?
/^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false
/^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = false
end
$preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "") $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
$DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "") $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "")
if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1] if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
@ -439,7 +441,7 @@ Dir::chdir('ext')
hdrdir = $hdrdir hdrdir = $hdrdir
$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include" $hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
exts.each do |d| exts.each do |d|
$static = $force_static ? $static_ext[target] : false $static = $force_static ? $static_ext[target] : nil
if $ignore or !$nodynamic or $static if $ignore or !$nodynamic or $static
extmake(d) or abort extmake(d) or abort
@ -491,7 +493,7 @@ unless $extlist.empty?
end end
next next
end end
f = format("%s/%s.%s", s, i, $LIBEXT) f = format("%s/%s.%s", t, i, $LIBEXT)
if File.exist?(f) if File.exist?(f)
$extinit << " init(Init_#{i}, \"#{t}.so\");\n" $extinit << " init(Init_#{i}, \"#{t}.so\");\n"
$extobjs << "ext/#{f} " $extobjs << "ext/#{f} "
@ -570,7 +572,7 @@ $mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT") ENV.delete("RUBYOPT")
if $command_output if $command_output
message = "echo #{message}" message = "echo #{message}"
cmd = $makeflags.join(' ') cmd = $makeflags.map {|s|s.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ')
open($command_output, 'wb') do |f| open($command_output, 'wb') do |f|
case $command_output case $command_output
when /\.sh\z/ when /\.sh\z/

4
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2009-12-30" #define RUBY_RELEASE_DATE "2009-12-31"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 30 #define RUBY_RELEASE_DAY 31
#include "ruby/version.h" #include "ruby/version.h"