diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 2 | ||||
| -rw-r--r-- | wince/mkconfig_wce.rb | 7 | ||||
| -rw-r--r-- | wince/mkexports.rb | 35 |
5 files changed, 11 insertions, 46 deletions
@@ -1,3 +1,10 @@ +Fri May 18 03:02:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/mkexports.rb: preserve prefixed underscores for WINAPI + symbols. + + * wince/mkconfig_wce.rb, wince/mkexports.rb: obsolete. + Thu May 17 17:03:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * misc/ruby-style.el (ruby-style-label-indent): for yacc rules. @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-05-17" +#define RUBY_RELEASE_DATE "2007-05-18" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070517 +#define RUBY_RELEASE_CODE 20070518 #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 5 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 18 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 214e4c6772..587081007f 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -8,7 +8,7 @@ objs = ARGV.collect {|s| s.tr('/', '\\')} IO.foreach("|dumpbin -symbols " + objs.join(' ')) do |l| next if /^[0-9A-F]+ 0+ UNDEF / =~ l next unless l.sub!(/.*\sExternal\s+\|\s+/, '') - if l.sub!(/^_/, '') + if l.sub!(/^_(?!\w+@\d+$)/, '') next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') next diff --git a/wince/mkconfig_wce.rb b/wince/mkconfig_wce.rb deleted file mode 100644 index 4d9671cde7..0000000000 --- a/wince/mkconfig_wce.rb +++ /dev/null @@ -1,7 +0,0 @@ -f = File.open(ARGV[0], File::WRONLY|File::APPEND) -f.write <<EOM -class Object - remove_const :RUBY_PLATFORM - RUBY_PLATFORM = Config::CONFIG[\"RUBY_PLATFORM\"] -end -EOM diff --git a/wince/mkexports.rb b/wince/mkexports.rb deleted file mode 100644 index 8e96649276..0000000000 --- a/wince/mkexports.rb +++ /dev/null @@ -1,35 +0,0 @@ -#!./miniruby -s - -SYM = {} - -objs = ARGV.collect {|s| p s+'\n'; s.tr('/', '\\') } -IO.foreach("|dumpbin -symbols " + objs.join(' ')) do |l| - next if /^[0-9A-F]+ 0+ UNDEF / =~ l - next unless l.sub!(/.*\sExternal\s+\|\s+/, '') - if ARGV[1]=~/sh/ - if l.sub!(/^_/, '') - next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l - elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') - next - end - else - next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l - end - SYM[l.strip] = true -end - - -exports = [] -if $name - exports << "Name " + $name -elsif $library - exports << "Library " + $library -end -exports << "Description " + $description.dump if $description -exports << "EXPORTS" << SYM.keys.sort - -if $output - open($output, 'w') {|f| f.puts exports.join("\n")} -else - puts exports.join("\n") -end |