Permalink
Browse files

2000-05-09

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent a1b4737 commit 7dff2acd8ec0eb60a51f99711a0c32b436c2ace0 matz committed May 9, 2000
Showing with 514 additions and 347 deletions.
  1. +62 −0 ChangeLog
  2. +1 −1 Makefile.in
  3. +1 −1 array.c
  4. +1 −0 config_s.dj
  5. +37 −15 configure
  6. +15 −0 configure.in
  7. +0 −1 cygwin/GNUmakefile.in
  8. +9 −1 defines.h
  9. +1 −1 dir.c
  10. +16 −12 dln.c
  11. +43 −25 eval.c
  12. +20 −2 ext/Win32API/Win32API.c
  13. +7 −9 ext/extmk.rb.in
  14. +17 −1 ext/socket/extconf.rb
  15. +2 −0 ext/socket/socket.c
  16. +1 −1 file.c
  17. +10 −40 gc.c
  18. +1 −1 hash.c
  19. +1 −1 intern.h
  20. +1 −1 io.c
  21. +200 −185 lib/cgi.rb
  22. +1 −1 lib/cgi/session.rb
  23. +2 −2 lib/debug.rb
  24. +6 −6 lib/mkmf.rb
  25. +12 −6 lib/net/telnet.rb
  26. +1 −1 lib/thread.rb
  27. +1 −1 lib/timeout.rb
  28. +1 −1 object.c
  29. +12 −1 parse.y
  30. +1 −1 process.c
  31. +3 −4 regex.c
  32. +3 −3 ruby.c
  33. +1 −11 ruby.h
  34. +3 −3 signal.c
  35. +3 −3 sprintf.c
  36. +1 −1 string.c
  37. +1 −1 variable.c
  38. +2 −2 version.h
  39. +1 −0 win32/config.status
  40. +13 −1 win32/ruby.def
View
@@ -1,3 +1,65 @@
+Mon May 8 23:47:39 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
+
+ * eval.c (rb_callcc): prev & next should be initialized to zero.
+
+Mon May 8 23:17:36 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * dln.c (dln_init): remove possible buffer overrun. This is
+ suggested by Aleksi Niemela <aleksi.niemela@cinnober.com>
+
+ * dln.c (init_funcname): ditto.
+
+Sat May 6 23:35:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * parse.y (lhs): should allow `obj.Attr = 5' type expression.
+
+Sat May 6 15:46:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * ext/socket/extconf.rb: add a new configure option to force use
+ of the WIDE Project's getaddrinfo(): --enbale-wide-getaddrinfo.
+
+Fri May 5 21:19:22 2000 MOROHOSHI Akihiko <moro@remus.dti.ne.jp>
+
+ * parse.y (yylex): allow '$1foo' and such.
+
+Fri May 5 03:25:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * regex.c (re_compile_fastmap): charset_not for multibyte
+ characters excluded too many characters.
+
+Tue May 2 13:23:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * eval.c (rb_thread_schedule): little bit more impartial context
+ switching.
+
+Tue May 2 09:50:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
+
+ * configure.in: add DLDLIBS to set platform specific library
+ for extensions.
+
+ * ext/extmk.rb.in: use @DLDLIBS@ instead of RUBY_PLATFORM choice.
+
+ * lib/mkmf.rb: use CONFIG["DLDLIBS"] instead of RUBY_PLATFORM choice.
+
+ * config_s.dj: add @DLDLIBS@.
+
+ * win32/config.status: ditto.
+
+ * win32/ruby.def: regular maintenance.
+
+Mon May 1 23:42:44 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * configure.in, eval.c: add DLEXT2. now DLEXT on Cygwin is "so".
+
+ * defines.h: use dllimport, dllexport for Cygwin 1.1.x.
+
+ * ruby.h: ditto.
+
+ * cygwin/GNUmakefile.in: ditto.
+
+ * ext/Win32API/Win32API.c: directly "call" in asm statement for
+ gcc 2.95.x or newer.
+
Sat Apr 29 04:58:12 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* array.c (rb_ary_unshift_m): performance improvement.
View
@@ -81,7 +81,7 @@ OBJS = array.@OBJEXT@ \
version.@OBJEXT@ \
$(MISSING)
-all: miniruby$(EXEEXT) @PREP@ rbconfig.rb
+all: miniruby$(EXEEXT) @PREP@ rbconfig.rb $(LIBRUBY)
@@MINIRUBY@ -Xext extmk.rb @EXTSTATIC@
miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) dmyext.@OBJEXT@
View
@@ -8,7 +8,7 @@
Copyright (C) 1993-2000 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
- Copyright (C) 2000 Information-technology Promotion Agancy, Japan
+ Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
View
@@ -51,6 +51,7 @@ s%@LIBRUBY_A@%libruby.a%g
s%@LIBRUBYARG@%libruby.a%g
s%@LIBRUBY_SO@%%g
s%@SOLIBS@%%g
+s%@DLDLIBS@%%g
s%@srcdir%.%g
s%@arch@%i386-djgpp%g
s%@sitedir@%${prefix}/lib/ruby/site_ruby%g
View
@@ -4530,6 +4530,16 @@ EOF
#define DLEXT ".dll"
EOF
;;
+ cygwin*) DLEXT=so
+ cat >> confdefs.h <<\EOF
+#define DLEXT ".so"
+EOF
+
+ DLEXT2=dll
+ cat >> confdefs.h <<\EOF
+#define DLEXT2 ".dll"
+EOF
+;;
*) DLEXT=so
cat >> confdefs.h <<\EOF
#define DLEXT ".so"
@@ -4572,15 +4582,15 @@ fi
case "$target_os" in
human*)
echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6
-echo "configure:4576: checking for _harderr in -lsignal" >&5
+echo "configure:4586: checking for _harderr in -lsignal" >&5
ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lsignal $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4584 "configure"
+#line 4594 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4591,7 +4601,7 @@ int main() {
_harderr()
; return 0; }
EOF
-if { (eval echo configure:4595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4619,15 +4629,15 @@ else
fi
echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6
-echo "configure:4623: checking for hmemset in -lhmem" >&5
+echo "configure:4633: checking for hmemset in -lhmem" >&5
ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lhmem $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4631 "configure"
+#line 4641 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4638,7 +4648,7 @@ int main() {
hmemset()
; return 0; }
EOF
-if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4668,12 +4678,12 @@ fi
for ac_func in select gettimeofday
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4672: checking for $ac_func" >&5
+echo "configure:4682: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4677 "configure"
+#line 4687 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4696,7 +4706,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4721,15 +4731,15 @@ fi
done
echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6
-echo "configure:4725: checking whether PD libc _dtos18 fail to convert big number" >&5
+echo "configure:4735: checking whether PD libc _dtos18 fail to convert big number" >&5
if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
rb_cv_missing__dtos18=no
else
cat > conftest.$ac_ext <<EOF
-#line 4733 "configure"
+#line 4743 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4741,7 +4751,7 @@ main ()
}
EOF
-if { (eval echo configure:4745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
rb_cv_missing__dtos18=yes
else
@@ -4763,15 +4773,15 @@ EOF
fi
echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6
-echo "configure:4767: checking whether PD libc fconvert fail to round" >&5
+echo "configure:4777: checking whether PD libc fconvert fail to round" >&5
if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
rb_cv_missing_fconvert=no
else
cat > conftest.$ac_ext <<EOF
-#line 4775 "configure"
+#line 4785 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4784,7 +4794,7 @@ main ()
}
EOF
-if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
rb_cv_missing_fconvert=yes
else
@@ -4869,6 +4879,15 @@ if test "$target_os" = "beos"; then
esac
fi
+case "$target_os" in
+ cygwin*|beos*|openstep*|nextstep*|rhapsody*|macos*|os2_emx*)
+ DLDLIBS=""
+ ;;
+ *)
+ DLDLIBS="-lc"
+ ;;
+esac
+
LIBRUBY_LDSHARED=$LDSHARED
LIBRUBY_DLDFLAGS=$DLDFLAGS
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
@@ -4981,6 +5000,7 @@ esac
+
ri_prefix=
test "$program_prefix" != NONE &&
ri_prefix=$program_prefix
@@ -5250,6 +5270,7 @@ s%@STATIC@%$STATIC%g
s%@CCDLFLAGS@%$CCDLFLAGS%g
s%@LDSHARED@%$LDSHARED%g
s%@DLEXT@%$DLEXT%g
+s%@DLEXT2@%$DLEXT2%g
s%@STRIP@%$STRIP%g
s%@EXTSTATIC@%$EXTSTATIC%g
s%@setup@%$setup%g
@@ -5264,6 +5285,7 @@ s%@LIBRUBY_ALIASES@%$LIBRUBY_ALIASES%g
s%@LIBRUBY@%$LIBRUBY%g
s%@LIBRUBYARG@%$LIBRUBYARG%g
s%@SOLIBS@%$SOLIBS%g
+s%@DLDLIBS@%$DLDLIBS%g
s%@arch@%$arch%g
s%@sitedir@%$sitedir%g
s%@configure_args@%$configure_args%g
View
@@ -403,6 +403,7 @@ AC_SUBST(STATIC)dnl
AC_SUBST(CCDLFLAGS)dnl
AC_SUBST(LDSHARED)dnl
AC_SUBST(DLEXT)dnl
+AC_SUBST(DLEXT2)dnl
STATIC=
@@ -569,6 +570,10 @@ else
AC_DEFINE(DLEXT, ".bundle");;
os2_emx*) DLEXT=dll
AC_DEFINE(DLEXT, ".dll");;
+ cygwin*) DLEXT=so
+ AC_DEFINE(DLEXT, ".so")
+ DLEXT2=dll
+ AC_DEFINE(DLEXT2, ".dll");;
*) DLEXT=so
AC_DEFINE(DLEXT, ".so");;
esac
@@ -711,6 +716,15 @@ if test "$target_os" = "beos"; then
esac
fi
+case "$target_os" in
+ cygwin*|beos*|openstep*|nextstep*|rhapsody*|macos*|os2_emx*)
+ DLDLIBS=""
+ ;;
+ *)
+ DLDLIBS="-lc"
+ ;;
+esac
+
LIBRUBY_LDSHARED=$LDSHARED
LIBRUBY_DLDFLAGS=$DLDFLAGS
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
@@ -819,6 +833,7 @@ AC_SUBST(LIBRUBY_ALIASES)
AC_SUBST(LIBRUBY)
AC_SUBST(LIBRUBYARG)
AC_SUBST(SOLIBS)
+AC_SUBST(DLDLIBS)
ri_prefix=
test "$program_prefix" != NONE &&
@@ -6,4 +6,3 @@ miniruby$(EXEEXT): $(RUBYCWDLL)
$(RUBYCWDLL): $(OBJS) dmyext.o
$(LDSHARED) $(DLDFLAGS) -o $(RUBYCWDLL) --output-lib=$(LIBRUBY_SO) --dllname=$(RUBYCWDLL) -Wl,-e,__cygwin_noncygwin_dll_entry@12 --add-stdcall-alias $(OBJS) dmyext.o
- @NM@ --extern-only $(OBJS) dmyext.o | sed -n '/^........ [CD] _\(.*\)$$/s//#define \1 (*__imp_\1)/p' >import.h
View
@@ -34,6 +34,14 @@
#include "win32/win32.h"
#endif
+#if defined __CYGWIN__
+# if defined USEIMPORTLIB
+# define EXTERN extern __declspec(dllimport)
+# else
+# define EXTERN extern __declspec(dllexport)
+# endif
+#endif
+
#ifndef EXTERN
#define EXTERN extern
#endif
@@ -62,7 +70,7 @@
#undef HAVE_SETITIMER
#endif
-#if defined(__CYGWIN__) || defined(DJGPP) || defined(__BOW__)
+#if defined(DJGPP) || defined(__BOW__)
#undef HAVE_SETITIMER
#endif
View
@@ -8,7 +8,7 @@
Copyright (C) 1993-2000 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
- Copyright (C) 2000 Information-technology Promotion Agancy, Japan
+ Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
Oops, something went wrong.

0 comments on commit 7dff2ac

Please sign in to comment.