diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 19:48:22 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 19:48:22 +0000 |
| commit | f594f850a495da1d73dc8586301a76135eec8cf1 (patch) | |
| tree | f084295d54e2b3a460049daa1cbe0b3034fe2c27 /win32 | |
| parent | 82f7f29c59bf97dcaf77d06269e03a936fa7a2cb (diff) | |
* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
warnings with $VERBOSE.
* win32/resource.rb: only file which has more than one icon is DLL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 5 | ||||
| -rw-r--r-- | win32/mkexports.rb | 4 | ||||
| -rw-r--r-- | win32/resource.rb | 10 |
3 files changed, 8 insertions, 11 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 4fa86903f9..cbf6378c37 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -166,7 +166,7 @@ EXEEXT = .exe PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def -MINIRUBY = .\miniruby$(EXEEXT) +MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- !if !defined(STACK) @@ -211,9 +211,6 @@ config.status: $(CONFIG_H) $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub @echo Creating config.h -!if exist(config.h) - @copy config.h config.h.old > nul -!endif @$(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat config.h << #if _MSC_VER != $(MSC_VER) #error MSC version unmatch diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 69131da3df..e92aae0422 100644 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -1,5 +1,7 @@ #!./miniruby -s +$name = $library = $description = nil + module RbConfig autoload :CONFIG, "rbconfig" end @@ -130,5 +132,5 @@ end END { exports = Exports.extract(ARGV) - Exports.output {|f| f.puts exports} + Exports.output {|f| f.puts(*exports)} } diff --git a/win32/resource.rb b/win32/resource.rb index e8c3ed88c7..cb62fb97c4 100644 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -29,16 +29,14 @@ else end ruby_icon = rubyw_icon = nil -[$ruby_name, 'ruby'].each do |i| +[$ruby_name, 'ruby'].find do |i| if i = icons[i] ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n" - break end end -[$rubyw_name, 'rubyw'].each do |i| +[$rubyw_name, 'rubyw'].find do |i| if i = icons[i] rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n" - break end end dll_icons = [] @@ -49,7 +47,7 @@ end [ # base name extension file type desc, icons [$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], + [$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 @@ -60,7 +58,7 @@ end #include <winver.h> #endif -#{icons ? icons.join : ''} +#{icons || ''} VS_VERSION_INFO VERSIONINFO FILEVERSION #{fversion} PRODUCTVERSION #{fversion} |