ruby-dev

なかだです。

At Fri, 28 Jul 2000 23:02:56 +0900
Katsuyuki Komatsu <komatsu@sarion.co.jp> wrote:
> >   $(MAKE) -f $(srcdir)/win32/setup.mak する前に消してしまって大
> > 丈夫じゃないでしょうか。全部成功してから消すようにしてたのは、
> > 単にデバッグのためだけだったりしますので。
> 
> 考えてみると、configure.batで消すようにすれば
> TMPMAKEをwin32/setup.makに渡さなくて済みますね。
> 
> [ruby-dev:10441]を出した後でtrafficが増えて申し訳ない
> ですけど出し直します。

  もうちょっと早く消すようにしてみました。それと、$(srcdir)/win32 で ./
configure.bat してもそのまま動くようにもしてみました。何もしないだけです
けど。lib/mkmf.rb はなぜか変わってしまっていたのを戻しました。 

  あと ext/mswin32_extmk.rb ですが、ext/configsub.rb とか名前を変えても
いいような気がしてきてます。いや、これで .rc ファイルなんかも作れないか
なとか思い始めたもんで。require "rbconfig.rb" とどっちがいいかは思案中。

# command.com の rem はコメントじゃなくて「何もしないコマンド」だと思う。


diff -pruX .excludes current/ext/mswin32_extmk.rb devel/ext/mswin32_extmk.rb
--- current/ext/mswin32_extmk.rb	Thu Jul 27 20:41:37 2000
+++ devel/ext/mswin32_extmk.rb	Fri Jul 28 18:09:31 2000
@@ -11,7 +11,7 @@ BEGIN {
     CONFIG['TEENY'] = $3
   end
 
-  File.foreach "config.status" do |$_|
+  File.foreach($config || "config.status") do |$_|
     next if /^#/
     if /^s%@(\w+)@%(.*)%g/
       name = $1
diff -pruX .excludes current/lib/mkmf.rb devel/lib/mkmf.rb
--- current/lib/mkmf.rb	Thu Jul 27 20:23:18 2000
+++ devel/lib/mkmf.rb	Fri Jul 28 17:58:11 2000
@@ -490,7 +490,7 @@ $libs = CONFIG["DLDLIBS"]
 $local_flags = ""
 case RUBY_PLATFORM
 when /mswin32/
-  $local_flags = "$(RUBY_SO_NAME).lib /link /EXPORT:Init_$(TARGET)"
+  $local_flags = "$(RUBY_SO_NAME).lib -link /EXPORT:Init_$(TARGET)"
 end
 $LOCAL_LIBS = ""
 $defs = []
diff -pruX .excludes current/win32/Makefile devel/win32/Makefile
--- current/win32/Makefile	Thu Jul 27 20:39:10 2000
+++ devel/win32/Makefile	Sat Jul 29 01:20:00 2000
@@ -2,9 +2,18 @@ SHELL = $(COMPSEC)
 
 #### Start of system configuration section. ####
 
+## variables may be overridden by $(compile_dir)/Makefile
 !IFNDEF srcdir
-srcdir = .
+srcdir = ..
 !ENDIF
+!IFNDEF RUBY_INSTALL_NAME
+RUBY_INSTALL_NAME = ruby
+!ENDIF
+!IFNDEF RUBY_SO_NAME
+RUBY_SO_NAME = rubymw
+!ENDIF
+###############
+
 VPATH = $(srcdir):$(srcdir)/missing
 
 CC = cl
@@ -25,11 +34,9 @@ LDSHARED = 
 DLDFLAGS = 
 SOLIBS = 
 
-#RUBY_INSTALL_NAME=ruby
-#RUBY_SO_NAME=rubymw
 EXEEXT = .exe
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-WPROGRAM=$(RUBY_INSTALL_NAME:ruby=rubyw)$(EXEEXT)
+WPROGRAM=$(RUBY_INSTALL_NAME)w$(EXEEXT)
 RUBYDEF = $(RUBY_SO_NAME).def
 
 STACK = 0x2000000
@@ -90,7 +97,7 @@ all:		miniruby$(EXEEXT) rbconfig.rb ext/
 		set LIB=../../win32;$(ORGLIBPATH)
 		@.\miniruby$(EXEEXT) -Xext extmk.rb 
 
-ext/extmk.rb:	$(srcdir)/ext/extmk.rb.in rbconfig.rb
+ext/extmk.rb:	$(srcdir)/ext/extmk.rb.in config.status
 		@echo Creating ext/extmk.rb
 		@.\miniruby$(EXEEXT) $(srcdir)/ext/mswin32_extmk.rb \
 			-srcdir=$(srcdir) \
diff -pruX .excludes current/win32/configure.bat devel/win32/configure.bat
--- current/win32/configure.bat	Fri Jul 28 22:50:04 2000
+++ devel/win32/configure.bat	Sat Jul 29 01:17:08 2000
@@ -1,9 +1,11 @@
 @echo off

-rem Don't set environment variable in batch file other than autoexec.bat

-rem to avoid "Out of environment space" problem on Windows 95/98.

-rem set TMPMAKE=~tmp~.mak

-echo $(conf):; @-$(MAKE) -$(MAKEFLAGS) -f $(@D:\=/)/setup.mak \>> ~tmp~.mak

+::: Don't set environment variable in batch file other than autoexec.bat

+::: to avoid "Out of environment space" problem on Windows 95/98.

+::: set TMPMAKE=~tmp~.mak

+

+echo "%0": nul > ~tmp~.mak

+echo 	@del ~tmp~.mak

+echo 	@$(MAKE) -$(MAKEFLAGS) -l -f $(@D:\=/)/setup.mak \>> ~tmp~.mak

 if not "%1" == "" echo 	srcdir=%1 \>> ~tmp~.mak

 echo 	WIN32DIR=$(@D:\=/) >> ~tmp~.mak

-nmake -nologo -f ~tmp~.mak -a conf="%0"

-del ~tmp~.mak

+nmake -nologo -f ~tmp~.mak

diff -pruX .excludes current/win32/setup.mak devel/win32/setup.mak
--- current/win32/setup.mak	Fri Jul 28 22:45:09 2000
+++ devel/win32/setup.mak	Sat Jul 29 01:14:19 2000
@@ -2,18 +2,16 @@
 
 !IF "$(WIN32DIR)" == "win32"
 srcdir = .
-!ELSE
+!ELSEIF "$(WIN32DIR)" == "$(WIN32DIR:/win32=)/win32"
 srcdir = $(WIN32DIR:/win32=)
+!ELSE
+srcdir = $(WIN32DIR)/..
 !ENDIF
 
-!IF "$(WIN32DIR)" == "."
-!ERROR Please `configure' other than `win32' directory.
-!ELSE
 all: config.h config.status
 all: ext
 all: Makefile
 all:; @echo type `nmake' to make ruby for mswin32.
-!ENDIF
 
 Makefile:
 	@echo srcdir = $(srcdir:\=/) > $@


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

Thread

Prev Next

In This Thread

Prev Next

[#10157] re.c memory leak ? — Katsuyuki Komatsu <komatsu@...>

[#10160] 1 >> 323232 — Tadayoshi Funaba <tadf@...>

[#10168] [BUG] ruby-1.5.4 — Koji Arai <JCA02266@...>

[#10170] sort_by — matz@... (Yukihiro Matsumoto)

[#10184] Bignum#remainder — nobu.nakada@...

[#10197] Re: modulo and remainder — matz@... (Yukihiro Matsumoto)

[#10201] ruby-dev:7501 パッチ — arton <arton@...>

[#10202] make clean failure — Katsuyuki Komatsu <komatsu@...>

[#10217] exit status of child process — nagai@...

[#10226] 組み込み Ruby — Kazuhiro Yoshida <moriq.kazuhiro@...>

[#10234] lib/profile.rb — Tadayoshi Funaba <tadf@...>

[#10238] date/date2 — matz@... (Yukihiro Matsumoto)

[#10243] Re: Time#usec — ARIMA Yasuhiro <fit0298@...>

[#10246] * io.c (rb_file_s_open): terminate fptr unless null. — WATANABE Hirofumi <eban@...>

[#10256] README.EXT の修正 — Noboru Saitou <noborus@...>

[#10259] thread bug? — Shugo Maeda <shugo@...>

[#10264] ext/socket changes for BeOS — Katsuyuki Komatsu <komatsu@...>

[#10267] FW: ruby's select causes busy waiting? — Jun-ichiro itojun Hagino <itojun@...>

[#10271] uri — matz@... (Yukihiro Matsumoto)

[#10272] date/date2 — matz@... (Yukihiro Matsumoto)

[#10278] Re: environment variables — WATANABE Hirofumi <eban@...>

[#10280] Ruby 1.4.5 ext/socket/socket.c — Katsuyuki Komatsu <komatsu@...>

[#10282] Config::CONFIG.each_value in rbconfig.rb — WATANABE Hirofumi <eban@...>

[#10288] bignum division has bug? — Hiroshi IGARASHI <igarashi@...>

[#10309] Telnet#preprocess — GOTOU YUUZOU <gotoyuzo@...>

[#10322] IO#eof? (ARGF) — WATANABE Tetsuya <tetsu@...>

[#10325] [REQ] print a warning message for overriding Object#__id__ — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#10337] [PATCH] $OBJEXT and $objs in mkmf.rb — Minero Aoki <aamine@...>

[#10338] should prohibit `module_function' for class Class — WATANABE Hirofumi <eban@...>

[#10341] list and quit command in debug.rb — WATANABE Hirofumi <eban@...>

[#10347] -bignum % fixnum — Tadayoshi Funaba <tadf@...>

[#10351] configure がない — Kazuhiro NISHIYAMA <zn@...>

[#10356] [REQ] Array#replace {} — Minero Aoki <aamine@...>

[#10358] combining Ruby — Masaki Suketa <CQN02273@...>

[#10384] ruby 1.4.6 preview — matz@... (Yukihiro Matsumoto)

[#10439] Tk trouble on 1.5.x — nagai@...

[#10440] exception on TkAfter proc — nagai@...

[#10447] rational != obj — Tadayoshi Funaba <tadf@...>

[#10448] shellwords.rb — Tadayoshi Funaba <tadf@...>

[#10465] fileutils.rb — Minero Aoki <aamine@...>

[#10468] ruby -vh — Kazuhiro NISHIYAMA <zn@...>

[ruby-dev:10444] Re: environment variables

Thread

In This Thread

[#10325] [REQ] print a warning message for overriding Object#id — Hideto ISHIBASHI <hideto-i@...4u.or.jp>