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

* win32/mkexports.rb, win32/resource.rb: use unique variable names.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-10-24 15:58:51 +00:00
parent 23a68ff2ff
commit e329433630
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Oct 25 00:58:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/mkexports.rb, win32/resource.rb: use unique variable names.
Mon Oct 23 04:30:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Oct 23 04:30:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* marshal.c (r_object0): use return value from proc given as the * marshal.c (r_object0): use return value from proc given as the

4
win32/mkexports.rb
View file

@ -14,7 +14,7 @@ class Exports
def self.create(*args, &block) def self.create(*args, &block)
platform = RUBY_PLATFORM platform = RUBY_PLATFORM
pat, klass = @subclass.find {|pat, klass| pat =~ platform} pat, klass = @subclass.find {|p, k| p =~ platform}
unless klass unless klass
raise ArgumentError, "unsupported platform: #{platform}" raise ArgumentError, "unsupported platform: #{platform}"
end end
@ -36,7 +36,6 @@ class Exports
def initialize(objs) def initialize(objs)
syms = {} syms = {}
winapis = {} winapis = {}
internal = export = nil
each_export(objs) do |internal, export| each_export(objs) do |internal, export|
syms[internal] = export syms[internal] = export
winapis[$1] = internal if /^_?(rb_w32_\w+)(?:@\d+)?$/ =~ internal winapis[$1] = internal if /^_?(rb_w32_\w+)(?:@\d+)?$/ =~ internal
@ -62,7 +61,6 @@ class Exports
exports << "Library " + library exports << "Library " + library
end end
exports << "Description " + description.dump if description exports << "Description " + description.dump if description
k = v = nil
exports << "EXPORTS" << symbols() exports << "EXPORTS" << symbols()
exports exports
end end

4
win32/resource.rb
View file

@ -48,7 +48,7 @@ end
[$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', 'CUI', ruby_icon], [$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', 'CUI', ruby_icon],
[$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon], [$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon],
[$so_name, '.dll', 'VFT_DLL', 'DLL', dll_icons.join], [$so_name, '.dll', 'VFT_DLL', 'DLL', dll_icons.join],
].each do |base, ext, type, desc, icons| ].each do |base, ext, type, desc, icon|
open(base + '.rc', "w") { |f| open(base + '.rc', "w") { |f|
f.binmode if /mingw/ =~ RUBY_PLATFORM f.binmode if /mingw/ =~ RUBY_PLATFORM
@ -58,7 +58,7 @@ end
#include <winver.h> #include <winver.h>
#endif #endif
#{icons || ''} #{icon || ''}
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION #{fversion} FILEVERSION #{fversion}
PRODUCTVERSION #{fversion} PRODUCTVERSION #{fversion}