summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-07-14 08:21:30 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-07-14 08:21:30 +0000
commitcc2c313903ff348f588a121238e1be532ad58fba (patch)
tree94e4ed1547d8f5716c32a35620a475048d0ac320
parent9144491376799259d3430ad36c0c862b21c053a2 (diff)
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--cygwin/GNUmakefile.in12
-rw-r--r--version.h4
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c3b973dfc..7d8a11cb85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 14 17:19:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * cygwin/GNUmakefile.in: use miniruby instead of sed.
+
Fri Jul 14 12:49:50 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
* io.c (argf_eof): need to check stdin, when next_p == -1.
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index e1b1f7c6e6..cdaa22ae3a 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -22,14 +22,14 @@ endif
RUBYDEF = $(RUBY_INSTALL_NAME).def
-miniruby$(EXEEXT): $(DLL)
+rbconfig.rb: $(DLL)
-$(DLL): $(OBJS) dmyext.o $(RUBYDEF)
+$(DLL): $(OBJS) dmyext.@OBJEXT@ $(RUBYDEF)
$(LDSHARED) $(DLDFLAGS) -o $(DLL) --output-lib=$(LIBRUBY_SO) \
--dllname=$(DLLNAME) --add-stdcall-alias --def=$(RUBYDEF) \
- $(RUBYEXP) $(OBJS) dmyext.o $(LIBS)
+ $(RUBYEXP) $(OBJS) dmyext.@OBJEXT@ $(LIBS)
-$(RUBYDEF): $(OBJS) dmyext.o
+$(RUBYDEF): $(OBJS) dmyext.@OBJEXT@
echo EXPORTS > $(RUBYDEF)
- @NM@ --extern-only --defined-only $(OBJS) dmyext.o | \
- sed -n '/^........ [CDT] _\(.*\)$$/s//\1/p' >> $(RUBYDEF)
+ @NM@ --extern-only --defined-only $(OBJS) dmyext.@OBJEXT@ | \
+ @MINIRUBY@ -ne 'print $$1, "\n" if / [CDT] _(.*)$$/' >> $(RUBYDEF)
diff --git a/version.h b/version.h
index 4b8e96439c..dc0d133dbf 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.5.4"
-#define RUBY_RELEASE_DATE "2000-07-12"
+#define RUBY_RELEASE_DATE "2000-07-14"
#define RUBY_VERSION_CODE 154
-#define RUBY_RELEASE_CODE 20000712
+#define RUBY_RELEASE_CODE 20000714