ruby-changes:2464
From: ko1@a...
Date: 18 Nov 2007 09:10:08 +0900
Subject: [ruby-changes:2464] nobu - Ruby:r13955 (ruby_1_8, trunk): * lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
nobu 2007-11-18 09:09:50 +0900 (Sun, 18 Nov 2007)
New Revision: 13955
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/lib/mkmf.rb
branches/ruby_1_8/version.h
trunk/ChangeLog
trunk/lib/mkmf.rb
trunk/version.h
Log:
* lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/mkmf.rb?r1=13955&r2=13954
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13955&r2=13954
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13955&r2=13954
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13955&r2=13954
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=13955&r2=13954
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13955&r2=13954
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13954)
+++ ChangeLog (revision 13955)
@@ -1,3 +1,7 @@
+Sun Nov 18 09:09:48 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
+
Sun Nov 18 05:19:46 2007 Tanaka Akira <akr@f...>
* lib/mkmf.rb (have_struct_member): define HAVE_type_member.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb (revision 13954)
+++ lib/mkmf.rb (revision 13955)
@@ -158,6 +158,9 @@
def quote
/\s/ =~ self ? "\"#{self}\"" : "#{self}"
end
+ def tr_cpp
+ strip.upcase.tr_s("^A-Z0-9_", "_")
+ end
end
class Array
def quote
@@ -688,7 +691,7 @@
def have_func(func, headers = nil, &b)
checking_for checking_message("#{func}()", headers) do
if try_func(func, $libs, headers, &b)
- $defs.push(format("-DHAVE_%s", func.upcase))
+ $defs.push(format("-DHAVE_%s", func.tr_cpp))
true
else
false
@@ -707,7 +710,7 @@
def have_var(var, headers = nil, &b)
checking_for checking_message(var, headers) do
if try_var(var, headers, &b)
- $defs.push(format("-DHAVE_%s", var.upcase))
+ $defs.push(format("-DHAVE_%s", var.tr_cpp))
true
else
false
@@ -782,8 +785,8 @@
int main() { return 0; }
int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
SRC
- $defs.push(format("-DHAVE_%s_%s", type.strip.upcase.tr_s("^A-Z0-9_", "_"), member.upcase))
- $defs.push(format("-DHAVE_ST_%s", member.upcase)) # backward compatibility
+ $defs.push(format("-DHAVE_%s_%s", type.tr_cpp, member.tr_cpp))
+ $defs.push(format("-DHAVE_ST_%s", member.tr_cpp)) # backward compatibility
true
else
false
@@ -799,7 +802,7 @@
typedef #{type} conftest_type;
int conftestval[sizeof(conftest_type)?1:-1];
SRC
- $defs.push(format("-DHAVE_TYPE_%s", type.strip.upcase.tr_s("^A-Z0-9_", "_")))
+ $defs.push(format("-DHAVE_TYPE_%s", type.tr_cpp))
true
else
false
@@ -854,7 +857,7 @@
typedef #{type || 'int'} conftest_type;
conftest_type conftestval = #{type ? '' : '(int)'}#{const};
SRC
- $defs.push(format("-DHAVE_CONST_%s", const.strip.upcase.tr_s("^A-Z0-9_", "_")))
+ $defs.push(format("-DHAVE_CONST_%s", const.tr_cpp))
true
else
false
@@ -901,7 +904,7 @@
end
checking_for checking_message("size of #{type}", headers), fmt do
if size = try_constant(expr, headers, &b)
- $defs.push(format("-DSIZEOF_%s=%d", type.upcase.tr_s("^A-Z0-9_", "_"), size))
+ $defs.push(format("-DSIZEOF_%s=%d", type.tr_cpp, size))
size
end
end
Index: version.h
===================================================================
--- version.h (revision 13954)
+++ version.h (revision 13955)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-17"
+#define RUBY_RELEASE_DATE "2007-11-18"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071117
+#define RUBY_RELEASE_CODE 20071118
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 13954)
+++ ruby_1_8/ChangeLog (revision 13955)
@@ -1,3 +1,7 @@
+Sun Nov 18 09:09:48 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
+
Sat Nov 17 13:58:11 2007 Masaki Suketa <masaki.suketa@n...>
* ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h (revision 13954)
+++ ruby_1_8/version.h (revision 13955)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-11-17"
+#define RUBY_RELEASE_DATE "2007-11-18"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071117
+#define RUBY_RELEASE_CODE 20071118
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb (revision 13954)
+++ ruby_1_8/lib/mkmf.rb (revision 13955)
@@ -131,6 +131,9 @@
def quote
/\s/ =~ self ? "\"#{self}\"" : self
end
+ def tr_cpp
+ strip.upcase.tr_s("^A-Z0-9_", "_")
+ end
end
class Array
def quote
@@ -654,7 +657,7 @@
def have_func(func, headers = nil, &b)
checking_for checking_message("#{func}()", headers) do
if try_func(func, $libs, headers, &b)
- $defs.push(format("-DHAVE_%s", func.upcase))
+ $defs.push(format("-DHAVE_%s", func.tr_cpp))
true
else
false
@@ -673,7 +676,7 @@
def have_var(var, headers = nil, &b)
checking_for checking_message(var, headers) do
if try_var(var, headers, &b)
- $defs.push(format("-DHAVE_%s", var.upcase))
+ $defs.push(format("-DHAVE_%s", var.tr_cpp))
true
else
false
@@ -746,7 +749,7 @@
int main() { return 0; }
int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
SRC
- $defs.push(format("-DHAVE_ST_%s", member.upcase))
+ $defs.push(format("-DHAVE_ST_%s", member.tr_cpp))
true
else
false
@@ -762,7 +765,7 @@
typedef #{type} conftest_type;
int conftestval[sizeof(conftest_type)?1:-1];
SRC
- $defs.push(format("-DHAVE_TYPE_%s", type.strip.upcase.tr_s("^A-Z0-9_", "_")))
+ $defs.push(format("-DHAVE_TYPE_%s", type.tr_cpp))
true
else
false
@@ -817,7 +820,7 @@
typedef #{type || 'int'} conftest_type;
conftest_type conftestval = #{type ? '' : '(int)'}#{const};
SRC
- $defs.push(format("-DHAVE_CONST_%s", const.strip.upcase.tr_s("^A-Z0-9_", "_")))
+ $defs.push(format("-DHAVE_CONST_%s", const.tr_cpp))
true
else
false
@@ -864,7 +867,7 @@
end
checking_for checking_message("size of #{type}", headers), fmt do
if size = try_constant(expr, headers, &b)
- $defs.push(format("-DSIZEOF_%s=%d", type.upcase.tr_s("^A-Z0-9_", "_"), size))
+ $defs.push(format("-DSIZEOF_%s=%d", type.tr_cpp, size))
size
end
end
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml