summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-24 15:58:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-24 15:58:51 +0000
commite32943363088035c04b63b54cbe5179c4f5cd527 ()
tree676e32d826aaa834d6f7307d8f9b21515a771cab
parent23a68ff2ff8264faef9ad22679e91caf6e76b78b (diff)
* win32/mkexports.rb, win32/resource.rb: use unique variable names.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/mkexports.rb4
-rw-r--r--win32/resource.rb4
3 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,7 @@
Mon Oct 23 04:30:04 2006 Yukihiro Matsumoto <[email protected]>
* marshal.c (r_object0): use return value from proc given as the
@@ -14,7 +14,7 @@ class Exports
def self.create(*args, &block)
platform = RUBY_PLATFORM
- pat, klass = @subclass.find {|pat, klass| pat =~ platform}
unless klass
raise ArgumentError, "unsupported platform: #{platform}"
end
@@ -36,7 +36,6 @@ class Exports
def initialize(objs)
syms = {}
winapis = {}
- internal = export = nil
each_export(objs) do |internal, export|
syms[internal] = export
winapis[$1] = internal if /^_?(rb_w32_\w+)(?:@\d+)?$/ =~ internal
@@ -62,7 +61,6 @@ class Exports
exports << "Library " + library
end
exports << "Description " + description.dump if description
- k = v = nil
exports << "EXPORTS" << symbols()
exports
end
@@ -48,7 +48,7 @@ end
[$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', 'CUI', ruby_icon],
[$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon],
[$so_name, '.dll', 'VFT_DLL', 'DLL', dll_icons.join],
-].each do |base, ext, type, desc, icons|
open(base + '.rc', "w") { |f|
f.binmode if /mingw/ =~ RUBY_PLATFORM
@@ -58,7 +58,7 @@ end
#include <winver.h>
#endif
-#{icons || ''}
VS_VERSION_INFO VERSIONINFO
FILEVERSION #{fversion}
PRODUCTVERSION #{fversion}