зеркало из https://github.com/github/ruby.git
* bcc32/Makefile.sub: remove unnecessary `.dll' from filename of
dll's resource file. * cygwin/GNUmakefile.in: ditto. [ruby-dev:17103] * win32/Makefile.sub: ditto. [ruby-dev:17103] * win32/resource.rb: ditto. [ruby-dev:17103] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa
Родитель
c0d0125bc7
Коммит
0eb196f281
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
Wed Sep 11 11:33:40 2002 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* bcc32/Makefile.sub: remove unnecessary `.dll' from filename of
|
||||
dll's resource file.
|
||||
|
||||
* cygwin/GNUmakefile.in: ditto. [ruby-dev:17103]
|
||||
|
||||
* win32/Makefile.sub: ditto. [ruby-dev:17103]
|
||||
|
||||
* win32/resource.rb: ditto. [ruby-dev:17103]
|
||||
|
||||
Wed Sep 11 09:59:46 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||
|
||||
* io.c (rb_io_wait_readable): added.
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@ distclean-local: clean-local
|
|||
@if exist pub.def del pub.def
|
||||
@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
|
||||
@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
|
||||
@if exist $(LIBRUBY_SO).rc del $(LIBRUBY_SO).rc
|
||||
@if exist $(RUBY_SO_NAME).rc del $(RUBY_SO_NAME).rc
|
||||
@if exist $(PROGRAM) del $(PROGRAM)
|
||||
@if exist $(WPROGRAM) del $(WPROGRAM)
|
||||
@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
|
||||
|
|
@ -446,11 +446,11 @@ rbconfig.rb: miniruby$(EXEEXT) config.status
|
|||
-install_name=$(RUBY_INSTALL_NAME) \
|
||||
-so_name=$(RUBY_SO_NAME) rbconfig.rb
|
||||
|
||||
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
|
||||
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
|
||||
@.\miniruby$(EXEEXT) $(srcdir)win32/resource.rb \
|
||||
-ruby_name=$(RUBY_INSTALL_NAME) \
|
||||
-rubyw_name=$(RUBYW_INSTALL_NAME) \
|
||||
-so_name=$(LIBRUBY_SO) \
|
||||
-so_name=$(RUBY_SO_NAME) \
|
||||
. $(icondirs) $(srcdir)/win32
|
||||
|
||||
#config.status: $(srcdir)configure
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ else
|
|||
endif
|
||||
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
|
||||
RUBYDEF = $(RUBY_INSTALL_NAME).def
|
||||
SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS)
|
||||
SOLIBS := $(RUBY_SO_NAME).res.@OBJEXT@ $(SOLIBS)
|
||||
EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
|
||||
|
||||
$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ $(RUBY_EXP)
|
||||
$(LIBRUBY_SO): $(RUBYDEF) $(RUBY_SO_NAME).res.@OBJEXT@ $(RUBY_EXP)
|
||||
$(LIBRUBY): $(LIBRUBY_SO)
|
||||
|
||||
%.res.@OBJEXT@: %.rc
|
||||
@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
|
||||
|
||||
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
|
||||
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
|
||||
@@MINIRUBY@ $(srcdir)/win32/resource.rb \
|
||||
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
|
||||
-so_name=$(LIBRUBY_SO) \
|
||||
-so_name=$(RUBY_SO_NAME) \
|
||||
. $(icondirs) $(srcdir)/win32
|
||||
|
||||
$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
|
||||
|
|
|
|||
|
|
@ -368,8 +368,8 @@ $(LIBRUBY_A): $(OBJS) dmyext.obj
|
|||
$(LIBRUBY): $(RUBYDEF)
|
||||
$(AR) -out:$@ -def:$(RUBYDEF) -machine:$(MACHINE)
|
||||
|
||||
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $@.res
|
||||
$(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $@.res $(LIBS) \
|
||||
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $*.res
|
||||
$(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $*.res $(LIBS) \
|
||||
-Fe$@ -link -dll -def:$(RUBYDEF)
|
||||
|
||||
$(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)
|
||||
|
|
@ -416,7 +416,7 @@ distclean-local: clean-local
|
|||
@if exist $(RUBYDEF) del $(RUBYDEF)
|
||||
@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
|
||||
@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
|
||||
@if exist $(LIBRUBY_SO).rc del $(LIBRUBY_SO).rc
|
||||
@if exist $(RUBY_SO_NAME).rc del $(RUBY_SO_NAME).rc
|
||||
@if exist $(PROGRAM) del $(PROGRAM)
|
||||
@if exist $(WPROGRAM) del $(WPROGRAM)
|
||||
@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
|
||||
|
|
@ -439,11 +439,11 @@ rbconfig.rb: miniruby$(EXEEXT) config.status
|
|||
-install_name=$(RUBY_INSTALL_NAME) \
|
||||
-so_name=$(RUBY_SO_NAME) rbconfig.rb
|
||||
|
||||
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
|
||||
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
|
||||
@.\miniruby$(EXEEXT) $(srcdir)/win32/resource.rb \
|
||||
-ruby_name=$(RUBY_INSTALL_NAME) \
|
||||
-rubyw_name=$(RUBYW_INSTALL_NAME) \
|
||||
-so_name=$(LIBRUBY_SO) \
|
||||
-so_name=$(RUBY_SO_NAME) \
|
||||
. $(icondirs) $(srcdir)/win32
|
||||
|
||||
{$(srcdir)/missing}.c.obj:
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0"
|
|||
|
||||
$ruby_name ||= CONFIG["RUBY_INSTALL_NAME"]
|
||||
$rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w')
|
||||
$so_name ||= CONFIG["RUBY_SO_NAME"] + '.dll'
|
||||
$so_name ||= CONFIG["RUBY_SO_NAME"]
|
||||
|
||||
icons = {}
|
||||
def icons.find(path)
|
||||
|
|
@ -49,7 +49,7 @@ end
|
|||
[ # base name extension file type icons
|
||||
[$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', ruby_icon],
|
||||
[$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon],
|
||||
[$so_name, '', 'VFT_DLL', dll_icons],
|
||||
[$so_name, '.dll', 'VFT_DLL', dll_icons],
|
||||
].each do |base, ext, type, icons|
|
||||
open(base + '.rc', "w") { |f|
|
||||
f.binmode if /mingw/ =~ RUBY_PLATFORM
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче