Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

eban

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit ab206c84fffdae3d38cf6eba3b3c2949ac23c1ec 1 parent eb92668
@eban eban authored
Showing with 15 additions and 7 deletions.
  1. +5 −0 ChangeLog
  2. +1 −0  Makefile.in
  3. +5 −4 configure.in
  4. +4 −3 instruby.rb
View
5 ChangeLog
@@ -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>
* stable version 1.6.0 released.
View
1  Makefile.in
@@ -24,6 +24,7 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@
SOLIBS = @SOLIBS@
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
+RUBY_SO_NAME=@RUBY_SO_NAME@
EXEEXT = @EXEEXT@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
View
9 configure.in
@@ -849,17 +849,18 @@ case "$target_os" in
esac
;;
cygwin*|mingw*)
+ RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'.$target_os
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)'
else
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
LIBRUBY_ALIASES=''
LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a'
- LIBRUBY='lib$(RUBY_INSTALL_NAME).a'
- LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)'
+ LIBRUBY='lib$(RUBY_SO_NAME).a'
+ LIBRUBYARG='-L. -l$(RUBY_SO_NAME)'
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
SOLIBS='$(LIBS)'
case "$target_os" in
View
7 instruby.rb
@@ -32,6 +32,10 @@
File.makedirs bindir, true
File.install ruby_install_name+exeext,
"#{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']
File.install dll, "#{bindir}/#{dll}", 0755, true
end
@@ -86,9 +90,6 @@
if RUBY_PLATFORM =~ /mswin32|mingw/
File.makedirs archlibdir + "/win32", 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
File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0644, true
Please sign in to comment.
Something went wrong with that request. Please try again.