ruby-dev

なかだです。

At Wed, 30 Aug 2000 12:54:46 +0900
WATANABE Hirofumi <eban@os.rim.or.jp> wrote:
> DLL の名前には cygwin が入ってるわけだし, 入れましょうか.
> 今のままでも libruby.a を作るのをやめて, 直接
> ruby.{cygwin,mingw32}.dll をリンクするようにすれば
> -lruby.{cygwin,ruby} でいいかって気もします.
> ＃/usr/local/lib に ruby.{cygwin,mingw32}.dll を ln -s か cp.

  とりあえず暫定的に ruby.$(os).dll と libruby.$(os).a という形にしてみま
した。

# ついでに rubyw もインストールするように。

> それは DLL の名前にもバージョンを含めるかどうかも決めないと
> いけないでしょうね. 遊びで ruby.cygwin.dll.1.6.0 というのを
> 作ってみたら動いたので, 基本的にはなんでもよさそう
> (ruby-cygwin.dll という名前以外は).

  DLL を ruby.cygwin.dll.1.6 とかにして、stub を libruby.cygwin.a にする
とか。


diff -pruPX ./.excludes current/Makefile.in devel/Makefile.in
--- current/Makefile.in	Thu Aug  3 18:50:32 2000
+++ devel/Makefile.in	Fri Sep  1 23:27:16 2000
@@ -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)
 
diff -pruPX ./.excludes current/configure.in devel/configure.in
--- current/configure.in	Mon Aug 28 18:53:24 2000
+++ devel/configure.in	Sat Sep  2 00:16:59 2000
@@ -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
diff -pruPX ./.excludes current/instruby.rb devel/instruby.rb
--- current/instruby.rb	Fri Sep  1 18:18:11 2000
+++ devel/instruby.rb	Fri Sep  1 23:48:47 2000
@@ -32,6 +32,10 @@ wdir = Dir.getwd
 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 @@ end
 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
 


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦

Thread

Prev Next

In This Thread

Prev Next

[#10781] MatchingData#[] — Shugo Maeda <shugo@...>

[#10793] 今度こそ (patch of the ruby-1.4.6 for NT4.0&VC4.0 on DEC Alpha.) — kou@...1609.sip.eee.yamaguchi-u.ac.jp (Koichi Okada)

[#10812] empty rescue clause — Takaaki Tateishi <ttate@...>

[#10814] Re: ruby 1.6.0 preview2 — tenmei@... (Noriaki Harada)

[#10829] [BUG] re_search with range — Minero Aoki <aamine@...>

[#10856] typo in finalize.rb — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10861] MatchingData#last_group — Shugo Maeda <shugo@...>

[#10864] a = []; p a.sort! — "Akinori -Aki- MUSHA" <knu@...>

[#10866] Class Variable (sono 2) — Shin-ichiro HARA <sinara@...>

[#10879] recursive require / preload — Yasushi Shoji <yashi@...>

[#10882] setenv,unsetenv — Takaaki Tateishi <ttate@...>

[#10889] Re: mod_ruby error? — Wakou Aoyama <wakou@...>

[#10890] Re: Telnet#preprocess — Wakou Aoyama <wakou@...>

[#10891] Re: net/telnet.rb — Wakou Aoyama <wakou@...>

[#10892] Re: lib/cgi.rb — Wakou Aoyama <wakou@...>

[#10893] Re: lib/cgi.rb — Wakou Aoyama <wakou@...>

[#10894] Forward: [ruby-ext:01274] Re: 多重代入での to_a (Re: Ruby/Python doesn't work with Ruby 1.6) — matz@... (Yukihiro Matsumoto)

[#10897] Re: [CVS 266] "matz: 1.6.0 final (hopufully)" — WATANABE Hirofumi <Hirofumi.Watanabe@...>

[#10903] Class Variable と継承 — Kazuhiro NISHIYAMA <zn@...>

[#10904] Module#class_variables — Yasushi Shoji <yashi@...>

[#10907] attr_tester — Yasushi Shoji <yashi@...>

[#10910] tsvr.rb broken ? — Katsuyuki Komatsu <komatsu@...>

[#10911] time.rb — Katsuyuki Komatsu <komatsu@...>

[#10920] SIGINT on windows — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10921] proper tail recursion — Shugo Maeda <shugo@...>

[#10924] instance methods of Module/Class — Hiroshi IGARASHI <igarashi@...>

[#10928] man ruby — Takaaki Tateishi <ttate@...>

[#10933] Meta-Level API — Hiroshi IGARASHI <igarashi@...>

[#10943] Passing []/String as argument — Jun Adachi <adachi@...>

[#10944] dummy DLL on Windows — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10946] require "marshal" failure — Katsuyuki Komatsu <komatsu@...>

[#10948] File::Constants — Yasushi Shoji <yashi@...>

[#10952] negative signal number — GOTOU YUUZOU <gotoyuzo@...>

[#10956] server maintenance — Shugo Maeda <shugo@...>

[#10959] match data — 助田 雅紀 <masaki.suketa@...>

[#10968] jcode.rb bug — "Okada Jun" <yun@...>

[#10978] [PATCH] require in require — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10985] httphead.rb proxy version problem — Katsuyuki Komatsu <komatsu@...>

[#10988] [patch] String#index( sub, pos, range ) — Minero Aoki <aamine@...>

[#11006] lstat — WATANABE Hirofumi <eban@...>

[#11028] regex.c warning of alpha — Katsuyuki Komatsu <komatsu@...>

[#11037] RUBYLIB_PRIFIX at emx/gcc — kenn@...

[#11049] [PATCH] RTEST() value as boolean — nobu.nakada@...

[#11052] ruby-1.6.1-20000921-i386-cygwin and Thread — Shin-ichiro HARA <sinara@...>

[#11061] [PATCH] prefix for sitedir — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#11064] jcode.rb bug — KANEKO Naoshi <wbs01621@...>

[#11066] [PATCH] gcc extension in regex.c — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#11073] expect.rb — Kazuhiro NISHIYAMA <zn@...>

[#11074] 定数のネスト — Kazuhiro NISHIYAMA <zn@...>

[#11078] test — Shugo Maeda <shugo@...>

[#11082] LIBPATH patch for emx/gcc — kenn@...

[#11083] Application Error in 1.6.0 on Win2K — matz@... (Yukihiro Matsumoto)

[#11090] Ruby CVS Repository — "Akinori -Aki- MUSHA" <knu@...>

[#11091] ruby 1.6.1 mingw32 bug? — kenn@...

[#11093] gsub! : not substitute if block returns nil — Masahiro Tanaka <masa@...>

[#11098] mod_ruby error? — akira yamada / やまだあきら <akira@...>

[ruby-dev:10797] Re: bmingw package

Thread

In This Thread

[#10959] match data — 助田　雅紀 <masaki.suketa@...>