mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5c3523de76
commit
db1571b1b4
4 changed files with 15 additions and 7 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Mon Sep 4 13:40:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
|
||||||
|
|
||||||
|
* configure.in: renamed libruby.a to libruby.{cygwin,mingw32}.a
|
||||||
|
on cygwin and mingw32.
|
||||||
|
|
||||||
Fri Sep 1 10:36:45 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Fri Sep 1 10:36:45 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* stable version 1.6.0 released.
|
* stable version 1.6.0 released.
|
||||||
|
|
|
@ -24,6 +24,7 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@
|
||||||
SOLIBS = @SOLIBS@
|
SOLIBS = @SOLIBS@
|
||||||
|
|
||||||
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
||||||
|
RUBY_SO_NAME=@RUBY_SO_NAME@
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
|
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
|
||||||
|
|
||||||
|
|
|
@ -849,17 +849,18 @@ case "$target_os" in
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
cygwin*|mingw*)
|
cygwin*|mingw*)
|
||||||
|
RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'.$target_os
|
||||||
if test x"$enable_shared" = xyes; then
|
if test x"$enable_shared" = xyes; then
|
||||||
LIBRUBY_SO='$(RUBY_INSTALL_NAME).'$target_os.dll
|
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
|
||||||
LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
|
LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
|
||||||
else
|
else
|
||||||
LIBRUBY_SO=dummy
|
LIBRUBY_SO=dummy
|
||||||
LIBRUBY_DLDFLAGS='--output-exp=$(RUBY_INSTALL_NAME).exp --dllname=$(RUBY_INSTALL_NAME)$(EXEEXT) --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
|
LIBRUBY_DLDFLAGS='--output-exp=$(RUBY_SO_NAME).exp --dllname=$(RUBY_SO_NAME)$(EXEEXT) --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
|
||||||
fi
|
fi
|
||||||
LIBRUBY_ALIASES=''
|
LIBRUBY_ALIASES=''
|
||||||
LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a'
|
LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a'
|
||||||
LIBRUBY='lib$(RUBY_INSTALL_NAME).a'
|
LIBRUBY='lib$(RUBY_SO_NAME).a'
|
||||||
LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)'
|
LIBRUBYARG='-L. -l$(RUBY_SO_NAME)'
|
||||||
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
|
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
|
||||||
SOLIBS='$(LIBS)'
|
SOLIBS='$(LIBS)'
|
||||||
case "$target_os" in
|
case "$target_os" in
|
||||||
|
|
|
@ -32,6 +32,10 @@ wdir = Dir.getwd
|
||||||
File.makedirs bindir, true
|
File.makedirs bindir, true
|
||||||
File.install ruby_install_name+exeext,
|
File.install ruby_install_name+exeext,
|
||||||
"#{bindir}/#{ruby_install_name}#{exeext}", 0755, true
|
"#{bindir}/#{ruby_install_name}#{exeext}", 0755, true
|
||||||
|
rubyw = ruby_install_name.sub(/ruby/, '\&w')+exeext
|
||||||
|
if File.exist? rubyw
|
||||||
|
File.install rubyw, "#{bindir}/#{rubyw}", 0755, true
|
||||||
|
end
|
||||||
for dll in Dir['*.dll']
|
for dll in Dir['*.dll']
|
||||||
File.install dll, "#{bindir}/#{dll}", 0755, true
|
File.install dll, "#{bindir}/#{dll}", 0755, true
|
||||||
end
|
end
|
||||||
|
@ -86,9 +90,6 @@ end
|
||||||
if RUBY_PLATFORM =~ /mswin32|mingw/
|
if RUBY_PLATFORM =~ /mswin32|mingw/
|
||||||
File.makedirs archlibdir + "/win32", true
|
File.makedirs archlibdir + "/win32", true
|
||||||
File.install "win32/win32.h", archlibdir + "/win32", 0644, true
|
File.install "win32/win32.h", archlibdir + "/win32", 0644, true
|
||||||
if File.exist? wdir+'/'+CONFIG["LIBRUBY"]
|
|
||||||
File.install wdir+'/'+CONFIG["LIBRUBY"], archlibdir, 0644, true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0644, true
|
File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0644, true
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue