Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ruby: Update to 2.0.0-p353

Browse Source
This commit is contained in:
Alexey Pavlov
2013-11-24 19:57:44 +04:00
parent fe014d6d1c
commit 5763751bb2
2 changed files with 158 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruby/PKGBUILD
View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=('ruby' 'ruby-docs')
pkgver=2.0.0_p247
pkgver=2.0.0_p353
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.ruby-lang.org/en/'
@@ -10,15 +10,15 @@ makedepends=('openssl' 'libffi' 'doxygen' 'libyaml')
options=('!emptydirs' '!makeflags' 'staticlibs')
source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
'gemrc'
'ruby-2.0.0-p195-msys2-full.patch')
md5sums=('60913f3eec0c4071f44df42600be2604'
'ruby-2.0.0-p353-msys2-full.patch')
md5sums=('20eb8f067d20f6b76b7e16cce2a85a55'
'6fb8e7a09955e0f64be3158fb4a27e7a'
'44a37623e4607f21ca01207d7640bd99')
'7988176faee0b07dd9bd2370c0ed3b84')
prepare() {
cd ruby-${pkgver//_/-}
patch -p1 -i ${srcdir}/ruby-2.0.0-p195-msys2-full.patch
patch -p1 -i ${srcdir}/ruby-2.0.0-p353-msys2-full.patch
autoreconf -fi
}

305
ruby/ruby-2.0.0-p195-msys2-full.patch → ruby/ruby-2.0.0-p353-msys2-full.patch
View File

@@ -1,7 +1,7 @@
diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
--- ruby-2.0.0-p195-orig/configure 2013-05-14 12:02:28.000000000 +0000
+++ ruby-2.0.0-p195/configure 2013-05-22 06:32:23.706054700 +0000
@@ -3171,7 +3171,7 @@
diff -Naur ruby-2.0.0-p353/configure ruby-2.0.0-p353-msys2/configure
--- ruby-2.0.0-p353/configure 2013-11-22 08:23:39.000000000 +0400
+++ ruby-2.0.0-p353-msys2/configure 2013-11-24 19:28:43.413620300 +0400
@@ -3172,7 +3172,7 @@
nacl_cv_os_nick=linux ;; #(
darwin*) :
nacl_cv_os_nick=mac ;; #(
@@ -10,7 +10,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
nacl_cv_os_nick=win ;; #(
*) :
nacl_cv_os_nick=$build_os ;;
@@ -4615,7 +4615,7 @@
@@ -4616,7 +4616,7 @@
case "$host_os" in #(
@@ -19,7 +19,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingw32 environment" >&5
$as_echo_n "checking for mingw32 environment... " >&6; }
@@ -5649,7 +5649,7 @@
@@ -5650,7 +5650,7 @@
case "$target_os" in #(
@@ -28,7 +28,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
ac_cv_prog_ac_ct_OBJCOPY=":" ;; #(
*) :
;;
@@ -5858,7 +5858,7 @@
@@ -5859,7 +5859,7 @@
case "$target_os" in #(
@@ -37,7 +37,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
@@ -7514,7 +7514,7 @@
@@ -7515,7 +7515,7 @@
# comments. We bypass ANSI C mode for them. Otherwise
# extension libs cannot include those headers.
;; #(
@@ -46,7 +46,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
# need lgamma_r(), finite()
;; #(
@@ -8170,7 +8170,7 @@
@@ -8171,7 +8171,7 @@
esac
LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
;; #(
@@ -55,7 +55,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
ac_cv_header_langinfo_h=yes
for ac_func in cygwin_conv_path
do :
@@ -15822,7 +15822,7 @@
@@ -15835,7 +15835,7 @@
setjmp_prefix=_
elif test "$ac_cv_func_sigsetjmp" = yes; then
case $target_os in #(
@@ -64,7 +64,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
setjmp_prefix= ;; #(
*) :
setjmp_prefix=sig ;;
@@ -17334,7 +17334,7 @@
@@ -17347,7 +17347,7 @@
*) :
CCDLFLAGS="$CCDLFLAGS -fno-common" ;;
esac ;; #(
@@ -73,7 +73,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
;; #(
*) :
@@ -17521,10 +17521,10 @@
@@ -17534,10 +17534,10 @@
: ${LDSHARED='$(LD) -Bshareable -x'}
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
rb_cv_dlopen=yes ;; #(
@@ -86,7 +86,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
: ${LIBPATHENV=""}
rb_cv_dlopen=yes ;; #(
@@ -17829,7 +17829,7 @@
@@ -17842,7 +17842,7 @@
LOAD_RELATIVE=1
DLEXT=dll ;; #(
@@ -95,7 +95,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
LOAD_RELATIVE=1
DLEXT=so ;; #(
@@ -18109,7 +18109,7 @@
@@ -18125,7 +18125,7 @@
SOLIBS=
case "$target_os" in #(
@@ -104,7 +104,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
: ${DLDLIBS=""}
;; #(
@@ -18334,7 +18334,7 @@
@@ -18350,7 +18350,7 @@
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;; #(
@@ -113,7 +113,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
LIBRUBY_RELATIVE=yes
;; #(
@@ -18791,7 +18791,7 @@
@@ -18813,7 +18813,7 @@
esac
CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
;; #(
@@ -122,7 +122,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)'
LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
@@ -18803,6 +18803,13 @@
@@ -18825,6 +18825,13 @@
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
fi
;; #(
@@ -136,7 +136,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
mingw*) :
RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
@@ -19145,7 +19152,7 @@
@@ -19167,7 +19174,7 @@
RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
case "$target_os" in #(
@@ -145,9 +145,9 @@ diff -Naur ruby-2.0.0-p195-orig/configure ruby-2.0.0-p195/configure
RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
--- ruby-2.0.0-p195-orig/configure.in 2013-05-11 18:12:02.000000000 +0000
+++ ruby-2.0.0-p195/configure.in 2013-05-22 06:41:23.862304700 +0000
diff -Naur ruby-2.0.0-p353/configure.in ruby-2.0.0-p353-msys2/configure.in
--- ruby-2.0.0-p353/configure.in 2013-11-12 18:31:59.000000000 +0400
+++ ruby-2.0.0-p353-msys2/configure.in 2013-11-24 19:28:43.455622700 +0400
@@ -48,7 +48,7 @@
AC_DEFUN([RUBY_MINGW32],
@@ -183,7 +183,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
AC_CHECK_TOOL(WINDRES, windres)
AC_CHECK_TOOL(DLLWRAP, dllwrap)
target=`echo $target | sed "s/^$target_cpu-/-/"`
@@ -711,7 +711,7 @@
@@ -717,7 +717,7 @@
# comments. We bypass ANSI C mode for them. Otherwise
# extension libs cannot include those headers.
],
@@ -192,7 +192,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
# need lgamma_r(), finite()
],
[haiku], [
@@ -887,7 +887,7 @@
@@ -893,7 +893,7 @@
[haiku*], [ ac_cv_func_shutdown=no])
LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
],
@@ -201,7 +201,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
AC_CHECK_FUNCS(cygwin_conv_path)
AC_LIBOBJ([langinfo])
],
@@ -1678,7 +1678,7 @@
@@ -1685,7 +1685,7 @@
elif test "$ac_cv_func__setjmp" = yes; then
setjmp_prefix=_
elif test "$ac_cv_func_sigsetjmp" = yes; then
@@ -210,7 +210,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
else
setjmp_prefix=
fi
@@ -2248,7 +2248,7 @@
@@ -2255,7 +2255,7 @@
# mkmf.rb's have_header() to fail if the desired resource happens to be
# installed in the /usr/local tree.
RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
@@ -219,7 +219,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
[
RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
else
@@ -2383,9 +2383,9 @@
@@ -2390,9 +2390,9 @@
: ${LDSHARED='$(LD) -Bshareable -x'}
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
rb_cv_dlopen=yes],
@@ -231,7 +231,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
: ${LIBPATHENV=""}
rb_cv_dlopen=yes],
@@ -2500,9 +2500,9 @@
@@ -2507,9 +2507,9 @@
[os2-emx*], [
LOAD_RELATIVE=1
DLEXT=dll],
@@ -243,7 +243,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
[
DLEXT=so])
fi
@@ -2637,7 +2637,7 @@
@@ -2647,7 +2647,7 @@
SOLIBS=
AS_CASE(["$target_os"],
@@ -252,7 +252,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
: ${DLDLIBS=""}
],
[
@@ -2770,7 +2770,7 @@
@@ -2780,7 +2780,7 @@
[interix*], [
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
],
@@ -261,7 +261,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
LIBRUBY_RELATIVE=yes
])
], [
@@ -2965,7 +2965,7 @@
@@ -2975,7 +2975,7 @@
AS_CASE(["$target_cpu"],[powerpc*], [CFLAGS="$CFLAGS -relax_pointers"])
CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
],
@@ -270,7 +270,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)'
LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
AS_CASE(["$target_os"],
@@ -2975,6 +2975,12 @@
@@ -2985,6 +2985,12 @@
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
fi
],
@@ -283,7 +283,7 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
[mingw*], [
RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
if test x"${target_cpu}" != xi386; then
@@ -3200,7 +3206,7 @@
@@ -3210,7 +3216,7 @@
RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
AS_CASE(["$target_os"],
@@ -292,9 +292,9 @@ diff -Naur ruby-2.0.0-p195-orig/configure.in ruby-2.0.0-p195/configure.in
RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
diff -Naur ruby-2.0.0-p195-orig/cygwin/GNUmakefile.in ruby-2.0.0-p195/cygwin/GNUmakefile.in
--- ruby-2.0.0-p195-orig/cygwin/GNUmakefile.in 2012-11-05 14:00:35.000000000 +0000
+++ ruby-2.0.0-p195/cygwin/GNUmakefile.in 2013-05-22 06:32:23.752929700 +0000
diff -Naur ruby-2.0.0-p353/cygwin/GNUmakefile.in ruby-2.0.0-p353-msys2/cygwin/GNUmakefile.in
--- ruby-2.0.0-p353/cygwin/GNUmakefile.in 2012-11-05 18:00:35.000000000 +0400
+++ ruby-2.0.0-p353-msys2/cygwin/GNUmakefile.in 2013-11-24 19:28:43.459622900 +0400
@@ -6,6 +6,8 @@
ifeq (@target_os@,cygwin)
@@ -317,17 +317,17 @@ diff -Naur ruby-2.0.0-p195-orig/cygwin/GNUmakefile.in ruby-2.0.0-p195/cygwin/GNU
clean-local::
@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
diff -Naur ruby-2.0.0-p195-orig/ext/dl/win32/extconf.rb ruby-2.0.0-p195/ext/dl/win32/extconf.rb
--- ruby-2.0.0-p195-orig/ext/dl/win32/extconf.rb 2012-12-11 03:02:04.000000000 +0000
+++ ruby-2.0.0-p195/ext/dl/win32/extconf.rb 2013-05-22 06:32:23.768554700 +0000
diff -Naur ruby-2.0.0-p353/ext/dl/win32/extconf.rb ruby-2.0.0-p353-msys2/ext/dl/win32/extconf.rb
--- ruby-2.0.0-p353/ext/dl/win32/extconf.rb 2012-12-11 07:02:04.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/dl/win32/extconf.rb 2013-11-24 19:28:43.462623100 +0400
@@ -1,3 +1,3 @@
-if compiled?('dl') and !compiled?('fiddle') and $mswin||$bccwin||$mingw||$cygwin
+if compiled?('dl') and !compiled?('fiddle') and $mswin||$bccwin||$mingw||$cygwin||$msys
create_makefile('win32')
end
diff -Naur ruby-2.0.0-p195-orig/ext/etc/extconf.rb ruby-2.0.0-p195/ext/etc/extconf.rb
--- ruby-2.0.0-p195-orig/ext/etc/extconf.rb 2010-09-15 23:27:48.000000000 +0000
+++ ruby-2.0.0-p195/ext/etc/extconf.rb 2013-05-22 06:32:23.768554700 +0000
diff -Naur ruby-2.0.0-p353/ext/etc/extconf.rb ruby-2.0.0-p353-msys2/ext/etc/extconf.rb
--- ruby-2.0.0-p353/ext/etc/extconf.rb 2010-09-16 03:27:48.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/etc/extconf.rb 2013-11-24 19:28:43.465623200 +0400
@@ -22,7 +22,7 @@
$defs.push("-DPW_AGE2VAL="+f)
end
@@ -337,17 +337,17 @@ diff -Naur ruby-2.0.0-p195-orig/ext/etc/extconf.rb ruby-2.0.0-p195/ext/etc/extco
have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
have_struct_member('struct group', 'gr_passwd', 'grp.h')
diff -Naur ruby-2.0.0-p195-orig/ext/fiddle/win32/extconf.rb ruby-2.0.0-p195/ext/fiddle/win32/extconf.rb
--- ruby-2.0.0-p195-orig/ext/fiddle/win32/extconf.rb 2012-12-10 09:03:17.000000000 +0000
+++ ruby-2.0.0-p195/ext/fiddle/win32/extconf.rb 2013-05-22 06:32:23.768554700 +0000
diff -Naur ruby-2.0.0-p353/ext/fiddle/win32/extconf.rb ruby-2.0.0-p353-msys2/ext/fiddle/win32/extconf.rb
--- ruby-2.0.0-p353/ext/fiddle/win32/extconf.rb 2012-12-10 13:03:17.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/fiddle/win32/extconf.rb 2013-11-24 19:28:43.467623400 +0400
@@ -1,3 +1,3 @@
-if compiled?('fiddle') and $mswin||$mingw||$cygwin
+if compiled?('fiddle') and $mswin||$mingw||$cygwin||$msys
create_makefile('win32')
end
diff -Naur ruby-2.0.0-p195-orig/ext/readline/extconf.rb ruby-2.0.0-p195/ext/readline/extconf.rb
--- ruby-2.0.0-p195-orig/ext/readline/extconf.rb 2013-02-01 05:37:29.000000000 +0000
+++ ruby-2.0.0-p195/ext/readline/extconf.rb 2013-05-22 06:32:23.784179700 +0000
diff -Naur ruby-2.0.0-p353/ext/readline/extconf.rb ruby-2.0.0-p353-msys2/ext/readline/extconf.rb
--- ruby-2.0.0-p353/ext/readline/extconf.rb 2013-02-01 09:37:29.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/readline/extconf.rb 2013-11-24 19:28:43.470623500 +0400
@@ -25,7 +25,7 @@
dir_config("readline")
enable_libedit = enable_config("libedit")
@@ -357,9 +357,9 @@ diff -Naur ruby-2.0.0-p195-orig/ext/readline/extconf.rb ruby-2.0.0-p195/ext/read
have_library("ncurses", "tgetnum") ||
have_library("termcap", "tgetnum") ||
have_library("curses", "tgetnum")
diff -Naur ruby-2.0.0-p195-orig/ext/socket/extconf.rb ruby-2.0.0-p195/ext/socket/extconf.rb
--- ruby-2.0.0-p195-orig/ext/socket/extconf.rb 2013-01-26 02:31:40.000000000 +0000
+++ ruby-2.0.0-p195/ext/socket/extconf.rb 2013-05-22 06:32:23.784179700 +0000
diff -Naur ruby-2.0.0-p353/ext/socket/extconf.rb ruby-2.0.0-p353-msys2/ext/socket/extconf.rb
--- ruby-2.0.0-p353/ext/socket/extconf.rb 2013-06-15 20:31:06.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/socket/extconf.rb 2013-11-24 19:28:43.474623800 +0400
@@ -6,7 +6,7 @@
when /(ms|bcc)win(32|64)|mingw/
test_func = "WSACleanup"
@@ -369,7 +369,7 @@ diff -Naur ruby-2.0.0-p195-orig/ext/socket/extconf.rb ruby-2.0.0-p195/ext/socket
test_func = "socket"
when /beos/
test_func = "socket"
@@ -35,7 +35,7 @@
@@ -41,7 +41,7 @@
end
ipv6 = false
@@ -378,7 +378,7 @@ diff -Naur ruby-2.0.0-p195-orig/ext/socket/extconf.rb ruby-2.0.0-p195/ext/socket
if enable_config("ipv6", default_ipv6)
if checking_for("ipv6") {try_link(<<EOF)}
#include <sys/types.h>
@@ -110,7 +110,7 @@
@@ -116,7 +116,7 @@
$defs[-1] = "-DHAVE_SA_LEN "
end
@@ -387,10 +387,10 @@ diff -Naur ruby-2.0.0-p195-orig/ext/socket/extconf.rb ruby-2.0.0-p195/ext/socket
have_header("netinet/udp.h")
if !have_macro("IPPROTO_IPV6", headers) && have_const("IPPROTO_IPV6", headers)
diff -Naur ruby-2.0.0-p195-orig/ext/tk/extconf.rb ruby-2.0.0-p195/ext/tk/extconf.rb
--- ruby-2.0.0-p195-orig/ext/tk/extconf.rb 2013-01-10 07:47:20.000000000 +0000
+++ ruby-2.0.0-p195/ext/tk/extconf.rb 2013-05-22 06:29:49.268554700 +0000
@@ -106,7 +106,7 @@
diff -Naur ruby-2.0.0-p353/ext/tk/extconf.rb ruby-2.0.0-p353-msys2/ext/tk/extconf.rb
--- ruby-2.0.0-p353/ext/tk/extconf.rb 2013-08-04 05:30:46.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/tk/extconf.rb 2013-11-24 19:28:43.478624000 +0400
@@ -107,7 +107,7 @@
# fuctions
##############################################################
def is_win32?
@@ -399,7 +399,7 @@ diff -Naur ruby-2.0.0-p195-orig/ext/tk/extconf.rb ruby-2.0.0-p195/ext/tk/extconf
end
def is_macosx?
@@ -602,7 +602,7 @@
@@ -605,7 +605,7 @@
#puts "check #{file} #{$1} #{tclfunc} #{tcldir}"
#find_library($1, tclfunc, tcldir)
if (tclconf && tclconf["TCL_SHARED_BUILD"] == "0") ||
@@ -408,7 +408,7 @@ diff -Naur ruby-2.0.0-p195-orig/ext/tk/extconf.rb ruby-2.0.0-p195/ext/tk/extconf
# static link
tcllibs = $libs + " -DSTATIC_BUILD " + file.quote
@@ -645,7 +645,7 @@
@@ -648,7 +648,7 @@
#puts "check #{file} #{$1} #{tkfunc} #{tkdir}"
# find_library($1, tkfunc, tkdir)
if (tkconf && tkconf["TCL_SHARED_BUILD"] == "0") ||
@@ -417,7 +417,7 @@ diff -Naur ruby-2.0.0-p195-orig/ext/tk/extconf.rb ruby-2.0.0-p195/ext/tk/extconf
# static link
tklibs = " -DSTATIC_BUILD " + file.quote
@@ -1784,7 +1784,6 @@
@@ -1787,7 +1787,6 @@
print("\n") # progress
end
$CPPFLAGS ||= ""
@@ -425,9 +425,9 @@ diff -Naur ruby-2.0.0-p195-orig/ext/tk/extconf.rb ruby-2.0.0-p195/ext/tk/extconf
# Does ruby have nativethread ?
TkLib_Config["ruby_with_thread"] =
diff -Naur ruby-2.0.0-p195-orig/ext/tk/lib/tk.rb ruby-2.0.0-p195/ext/tk/lib/tk.rb
--- ruby-2.0.0-p195-orig/ext/tk/lib/tk.rb 2011-05-26 23:36:33.000000000 +0000
+++ ruby-2.0.0-p195/ext/tk/lib/tk.rb 2013-05-22 06:32:23.815429700 +0000
diff -Naur ruby-2.0.0-p353/ext/tk/lib/tk.rb ruby-2.0.0-p353-msys2/ext/tk/lib/tk.rb
--- ruby-2.0.0-p353/ext/tk/lib/tk.rb 2011-05-27 03:36:33.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/tk/lib/tk.rb 2013-11-24 19:28:43.496625000 +0400
@@ -1180,7 +1180,7 @@
if WITH_RUBY_VM ### check Ruby 1.9 !!!!!!!
# *** NEED TO FIX ***
@@ -437,9 +437,9 @@ diff -Naur ruby-2.0.0-p195-orig/ext/tk/lib/tk.rb ruby-2.0.0-p195/ext/tk/lib/tk.r
RUN_EVENTLOOP_ON_MAIN_THREAD = true
when /darwin/ # MacOS X
=begin
diff -Naur ruby-2.0.0-p195-orig/ext/tk/old-extconf.rb ruby-2.0.0-p195/ext/tk/old-extconf.rb
--- ruby-2.0.0-p195-orig/ext/tk/old-extconf.rb 2009-07-13 02:43:44.000000000 +0000
+++ ruby-2.0.0-p195/ext/tk/old-extconf.rb 2013-05-22 06:32:23.815429700 +0000
diff -Naur ruby-2.0.0-p353/ext/tk/old-extconf.rb ruby-2.0.0-p353-msys2/ext/tk/old-extconf.rb
--- ruby-2.0.0-p353/ext/tk/old-extconf.rb 2009-07-13 06:43:44.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/tk/old-extconf.rb 2013-11-24 19:28:43.508625700 +0400
@@ -2,7 +2,7 @@
require 'mkmf'
@@ -458,9 +458,9 @@ diff -Naur ruby-2.0.0-p195-orig/ext/tk/old-extconf.rb ruby-2.0.0-p195/ext/tk/old
if tcltk_framework
if tcl_framework_header
diff -Naur ruby-2.0.0-p195-orig/ext/tk/stubs.c ruby-2.0.0-p195/ext/tk/stubs.c
--- ruby-2.0.0-p195-orig/ext/tk/stubs.c 2012-07-09 15:52:49.000000000 +0000
+++ ruby-2.0.0-p195/ext/tk/stubs.c 2013-05-22 06:29:49.284179700 +0000
diff -Naur ruby-2.0.0-p353/ext/tk/stubs.c ruby-2.0.0-p353-msys2/ext/tk/stubs.c
--- ruby-2.0.0-p353/ext/tk/stubs.c 2012-07-09 19:52:49.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/tk/stubs.c 2013-11-24 19:28:43.512625900 +0400
@@ -71,7 +71,7 @@
#if defined USE_TCL_STUBS && defined USE_TK_STUBS
@@ -481,9 +481,9 @@ diff -Naur ruby-2.0.0-p195-orig/ext/tk/stubs.c ruby-2.0.0-p195/ext/tk/stubs.c
#endif
static DL_HANDLE tcl_dll = (DL_HANDLE)0;
diff -Naur ruby-2.0.0-p195-orig/ext/win32ole/extconf.rb ruby-2.0.0-p195/ext/win32ole/extconf.rb
--- ruby-2.0.0-p195-orig/ext/win32ole/extconf.rb 2013-01-18 02:23:37.000000000 +0000
+++ ruby-2.0.0-p195/ext/win32ole/extconf.rb 2013-05-22 06:32:23.831054700 +0000
diff -Naur ruby-2.0.0-p353/ext/win32ole/extconf.rb ruby-2.0.0-p353-msys2/ext/win32ole/extconf.rb
--- ruby-2.0.0-p353/ext/win32ole/extconf.rb 2013-01-18 06:23:37.000000000 +0400
+++ ruby-2.0.0-p353-msys2/ext/win32ole/extconf.rb 2013-11-24 19:28:43.516626200 +0400
@@ -5,7 +5,7 @@
require 'mkmf'
@@ -493,9 +493,9 @@ diff -Naur ruby-2.0.0-p195-orig/ext/win32ole/extconf.rb ruby-2.0.0-p195/ext/win3
inc = nil
lib = '/usr/lib/w32api'
end
diff -Naur ruby-2.0.0-p195-orig/file.c ruby-2.0.0-p195/file.c
--- ruby-2.0.0-p195-orig/file.c 2013-04-24 15:43:05.000000000 +0000
+++ ruby-2.0.0-p195/file.c 2013-05-22 06:31:57.424804700 +0000
diff -Naur ruby-2.0.0-p353/file.c ruby-2.0.0-p353-msys2/file.c
--- ruby-2.0.0-p353/file.c 2013-04-24 19:43:05.000000000 +0400
+++ ruby-2.0.0-p353-msys2/file.c 2013-11-24 19:28:43.521626400 +0400
@@ -4181,7 +4181,6 @@
#ifdef __CYGWIN__
@@ -504,9 +504,9 @@ diff -Naur ruby-2.0.0-p195-orig/file.c ruby-2.0.0-p195/file.c
#endif
static VALUE
diff -Naur ruby-2.0.0-p195-orig/lib/fileutils.rb ruby-2.0.0-p195/lib/fileutils.rb
--- ruby-2.0.0-p195-orig/lib/fileutils.rb 2013-04-11 17:00:49.000000000 +0000
+++ ruby-2.0.0-p195/lib/fileutils.rb 2013-05-22 06:32:23.831054700 +0000
diff -Naur ruby-2.0.0-p353/lib/fileutils.rb ruby-2.0.0-p353-msys2/lib/fileutils.rb
--- ruby-2.0.0-p353/lib/fileutils.rb 2013-07-13 18:32:56.000000000 +0400
+++ ruby-2.0.0-p353-msys2/lib/fileutils.rb 2013-11-24 19:28:43.535627200 +0400
@@ -539,7 +539,7 @@
OPT_TABLE['move'] = [:force, :noop, :verbose, :secure]
@@ -516,18 +516,19 @@ diff -Naur ruby-2.0.0-p195-orig/lib/fileutils.rb ruby-2.0.0-p195/lib/fileutils.r
end
private_module_function :rename_cannot_overwrite_file?
diff -Naur ruby-2.0.0-p195-orig/lib/mkmf.rb ruby-2.0.0-p195/lib/mkmf.rb
--- ruby-2.0.0-p195-orig/lib/mkmf.rb 2013-04-14 14:55:53.000000000 +0000
+++ ruby-2.0.0-p195/lib/mkmf.rb 2013-05-22 06:32:23.831054700 +0000
@@ -121,6 +121,7 @@
diff -Naur ruby-2.0.0-p353/lib/mkmf.rb ruby-2.0.0-p353-msys2/lib/mkmf.rb
--- ruby-2.0.0-p353/lib/mkmf.rb 2013-08-03 18:08:18.000000000 +0400
+++ ruby-2.0.0-p353-msys2/lib/mkmf.rb 2013-11-24 19:39:11.633552400 +0400
@@ -120,7 +120,7 @@
$mswin = /mswin/ =~ RUBY_PLATFORM
$bccwin = /bccwin/ =~ RUBY_PLATFORM
$mingw = /mingw/ =~ RUBY_PLATFORM
$cygwin = /cygwin/ =~ RUBY_PLATFORM
+ $cygwin = /msys/ =~ RUBY_PLATFORM
- $cygwin = /cygwin/ =~ RUBY_PLATFORM
+ $cygwin = /cygwin|msys/ =~ RUBY_PLATFORM
$netbsd = /netbsd/ =~ RUBY_PLATFORM
$os2 = /os2/ =~ RUBY_PLATFORM
$beos = /beos/ =~ RUBY_PLATFORM
@@ -1761,6 +1762,12 @@
@@ -1774,6 +1774,12 @@
IO.popen(["cygpath", "-u", path], &:read).chomp
end
end
@@ -540,7 +541,7 @@ diff -Naur ruby-2.0.0-p195-orig/lib/mkmf.rb ruby-2.0.0-p195/lib/mkmf.rb
end
end
unless method_defined?(:mkintpath)
@@ -1777,7 +1784,7 @@
@@ -1790,7 +1796,7 @@
SHELL = /bin/sh
# V=0 quiet, V=1 verbose. other values don't work.
@@ -549,9 +550,9 @@ diff -Naur ruby-2.0.0-p195-orig/lib/mkmf.rb ruby-2.0.0-p195/lib/mkmf.rb
Q1 = $(V:1=)
Q = $(Q1:0=@)
ECHO1 = $(V:1=@#{CONFIG['NULLCMD']})
diff -Naur ruby-2.0.0-p195-orig/lib/rake/application.rb ruby-2.0.0-p195/lib/rake/application.rb
--- ruby-2.0.0-p195-orig/lib/rake/application.rb 2012-11-29 19:16:46.000000000 +0000
+++ ruby-2.0.0-p195/lib/rake/application.rb 2013-05-22 06:32:23.846679700 +0000
diff -Naur ruby-2.0.0-p353/lib/rake/application.rb ruby-2.0.0-p353-msys2/lib/rake/application.rb
--- ruby-2.0.0-p353/lib/rake/application.rb 2012-11-29 23:16:46.000000000 +0400
+++ ruby-2.0.0-p353-msys2/lib/rake/application.rb 2013-11-24 19:28:43.555628400 +0400
@@ -291,7 +291,7 @@
end
@@ -561,9 +562,9 @@ diff -Naur ruby-2.0.0-p195-orig/lib/rake/application.rb ruby-2.0.0-p195/lib/rake
end
def windows?
diff -Naur ruby-2.0.0-p195-orig/lib/resolv.rb ruby-2.0.0-p195/lib/resolv.rb
--- ruby-2.0.0-p195-orig/lib/resolv.rb 2011-10-31 12:03:49.000000000 +0000
+++ ruby-2.0.0-p195/lib/resolv.rb 2013-05-22 06:32:23.846679700 +0000
diff -Naur ruby-2.0.0-p353/lib/resolv.rb ruby-2.0.0-p353-msys2/lib/resolv.rb
--- ruby-2.0.0-p353/lib/resolv.rb 2011-10-31 16:03:49.000000000 +0400
+++ ruby-2.0.0-p353-msys2/lib/resolv.rb 2013-11-24 19:28:43.558628600 +0400
@@ -923,7 +923,7 @@
if File.exist? filename
config_hash = Config.parse_resolv_conf(filename)
@@ -573,9 +574,9 @@ diff -Naur ruby-2.0.0-p195-orig/lib/resolv.rb ruby-2.0.0-p195/lib/resolv.rb
require 'win32/resolv'
search, nameserver = Win32::Resolv.get_resolv_info
config_hash = {}
diff -Naur ruby-2.0.0-p195-orig/lib/rubygems/platform.rb ruby-2.0.0-p195/lib/rubygems/platform.rb
--- ruby-2.0.0-p195-orig/lib/rubygems/platform.rb 2012-11-29 06:52:18.000000000 +0000
+++ ruby-2.0.0-p195/lib/rubygems/platform.rb 2013-05-22 06:32:23.846679700 +0000
diff -Naur ruby-2.0.0-p353/lib/rubygems/platform.rb ruby-2.0.0-p353-msys2/lib/rubygems/platform.rb
--- ruby-2.0.0-p353/lib/rubygems/platform.rb 2013-07-22 20:33:18.000000000 +0400
+++ ruby-2.0.0-p353-msys2/lib/rubygems/platform.rb 2013-11-24 19:28:43.561628700 +0400
@@ -68,6 +68,7 @@
@os, @version = case os
when /aix(\d+)?/ then [ 'aix', $1 ]
@@ -584,9 +585,9 @@ diff -Naur ruby-2.0.0-p195-orig/lib/rubygems/platform.rb ruby-2.0.0-p195/lib/rub
when /darwin(\d+)?/ then [ 'darwin', $1 ]
when /^macruby$/ then [ 'macruby', nil ]
when /freebsd(\d+)?/ then [ 'freebsd', $1 ]
diff -Naur ruby-2.0.0-p195-orig/lib/rubygems.rb ruby-2.0.0-p195/lib/rubygems.rb
--- ruby-2.0.0-p195-orig/lib/rubygems.rb 2013-03-17 15:07:00.000000000 +0000
+++ ruby-2.0.0-p195/lib/rubygems.rb 2013-05-22 06:32:23.862304700 +0000
diff -Naur ruby-2.0.0-p353/lib/rubygems.rb ruby-2.0.0-p353-msys2/lib/rubygems.rb
--- ruby-2.0.0-p353/lib/rubygems.rb 2013-11-13 06:59:08.000000000 +0400
+++ ruby-2.0.0-p353-msys2/lib/rubygems.rb 2013-11-24 19:28:43.566629000 +0400
@@ -120,6 +120,7 @@
WIN_PATTERNS = [
/bccwin/i,
@@ -595,9 +596,9 @@ diff -Naur ruby-2.0.0-p195-orig/lib/rubygems.rb ruby-2.0.0-p195/lib/rubygems.rb
/djgpp/i,
/mingw/i,
/mswin/i,
diff -Naur ruby-2.0.0-p195-orig/test/dbm/test_dbm.rb ruby-2.0.0-p195/test/dbm/test_dbm.rb
--- ruby-2.0.0-p195-orig/test/dbm/test_dbm.rb 2012-02-19 14:44:36.000000000 +0000
+++ ruby-2.0.0-p195/test/dbm/test_dbm.rb 2013-05-22 06:32:23.862304700 +0000
diff -Naur ruby-2.0.0-p353/test/dbm/test_dbm.rb ruby-2.0.0-p353-msys2/test/dbm/test_dbm.rb
--- ruby-2.0.0-p353/test/dbm/test_dbm.rb 2012-02-19 18:44:36.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/dbm/test_dbm.rb 2013-11-24 19:28:43.572629400 +0400
@@ -21,6 +21,13 @@
raise 'cannot get system name' if uname.call(utsname) == -1
@@ -612,9 +613,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/dbm/test_dbm.rb ruby-2.0.0-p195/test/dbm/te
else
RbConfig::CONFIG['target_os']
end
diff -Naur ruby-2.0.0-p195-orig/test/dl/test_base.rb ruby-2.0.0-p195/test/dl/test_base.rb
--- ruby-2.0.0-p195-orig/test/dl/test_base.rb 2012-11-29 02:58:34.000000000 +0000
+++ ruby-2.0.0-p195/test/dl/test_base.rb 2013-05-22 06:32:23.877929700 +0000
diff -Naur ruby-2.0.0-p353/test/dl/test_base.rb ruby-2.0.0-p353-msys2/test/dl/test_base.rb
--- ruby-2.0.0-p353/test/dl/test_base.rb 2013-10-09 19:20:42.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/dl/test_base.rb 2013-11-24 19:28:43.575629500 +0400
@@ -9,6 +9,9 @@
when /cygwin/
libc_so = "cygwin1.dll"
@@ -625,9 +626,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/dl/test_base.rb ruby-2.0.0-p195/test/dl/tes
when /x86_64-linux/
libc_so = "/lib64/libc.so.6"
libm_so = "/lib64/libm.so.6"
diff -Naur ruby-2.0.0-p195-orig/test/fiddle/helper.rb ruby-2.0.0-p195/test/fiddle/helper.rb
--- ruby-2.0.0-p195-orig/test/fiddle/helper.rb 2012-11-27 19:54:50.000000000 +0000
+++ ruby-2.0.0-p195/test/fiddle/helper.rb 2013-05-22 06:32:23.877929700 +0000
diff -Naur ruby-2.0.0-p353/test/fiddle/helper.rb ruby-2.0.0-p353-msys2/test/fiddle/helper.rb
--- ruby-2.0.0-p353/test/fiddle/helper.rb 2013-10-09 19:20:42.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/fiddle/helper.rb 2013-11-24 19:28:43.578629700 +0400
@@ -10,6 +10,9 @@
when /cygwin/
libc_so = "cygwin1.dll"
@@ -638,9 +639,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/fiddle/helper.rb ruby-2.0.0-p195/test/fiddl
when /x86_64-linux/
libc_so = "/lib64/libc.so.6"
libm_so = "/lib64/libm.so.6"
diff -Naur ruby-2.0.0-p195-orig/test/gdbm/test_gdbm.rb ruby-2.0.0-p195/test/gdbm/test_gdbm.rb
--- ruby-2.0.0-p195-orig/test/gdbm/test_gdbm.rb 2012-07-25 06:49:35.000000000 +0000
+++ ruby-2.0.0-p195/test/gdbm/test_gdbm.rb 2013-05-22 06:32:23.877929700 +0000
diff -Naur ruby-2.0.0-p353/test/gdbm/test_gdbm.rb ruby-2.0.0-p353-msys2/test/gdbm/test_gdbm.rb
--- ruby-2.0.0-p353/test/gdbm/test_gdbm.rb 2012-07-25 10:49:35.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/gdbm/test_gdbm.rb 2013-11-24 19:28:43.581629900 +0400
@@ -21,6 +21,13 @@
raise 'cannot get system name' if uname.call(utsname) == -1
@@ -655,9 +656,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/gdbm/test_gdbm.rb ruby-2.0.0-p195/test/gdbm
else
RbConfig::CONFIG['target_os']
end
diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_argf.rb ruby-2.0.0-p195/test/ruby/test_argf.rb
--- ruby-2.0.0-p195-orig/test/ruby/test_argf.rb 2012-12-24 00:45:26.000000000 +0000
+++ ruby-2.0.0-p195/test/ruby/test_argf.rb 2013-05-22 06:32:23.877929700 +0000
diff -Naur ruby-2.0.0-p353/test/ruby/test_argf.rb ruby-2.0.0-p353-msys2/test/ruby/test_argf.rb
--- ruby-2.0.0-p353/test/ruby/test_argf.rb 2012-12-24 04:45:26.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/ruby/test_argf.rb 2013-11-24 19:28:43.584630100 +0400
@@ -54,7 +54,7 @@
end
@@ -667,9 +668,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_argf.rb ruby-2.0.0-p195/test/ruby
end
def assert_src_expected(line, src, args = nil)
diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p195/test/ruby/test_file_exhaustive.rb
--- ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb 2013-04-11 16:47:45.000000000 +0000
+++ ruby-2.0.0-p195/test/ruby/test_file_exhaustive.rb 2013-05-22 06:32:23.909179700 +0000
diff -Naur ruby-2.0.0-p353/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p353-msys2/test/ruby/test_file_exhaustive.rb
--- ruby-2.0.0-p353/test/ruby/test_file_exhaustive.rb 2013-10-17 21:09:07.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/ruby/test_file_exhaustive.rb 2013-11-24 19:28:43.589630300 +0400
@@ -128,7 +128,7 @@
assert_nothing_raised { File.stat(File.basename(prefix)) }
end
@@ -796,7 +797,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
assert_equal(@file, File.expand_path(@file + " "))
assert_equal(@file, File.expand_path(@file + "."))
assert_equal(@file, File.expand_path(@file + "::$DATA"))
@@ -715,7 +715,7 @@
@@ -742,7 +742,7 @@
assert_equal("foo", File.basename("foo", ".ext"))
assert_equal("foo", File.basename("foo.ext", ".ext"))
assert_equal("foo", File.basename("foo.ext", ".*"))
@@ -805,7 +806,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
basename = File.basename(@file)
assert_equal(basename, File.basename(@file + " "))
assert_equal(basename, File.basename(@file + "."))
@@ -764,7 +764,7 @@
@@ -791,7 +791,7 @@
infixes = ["", " ", "."]
infixes2 = infixes + [".ext "]
appendixes = [""]
@@ -814,7 +815,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
appendixes << " " << "." << "::$DATA" << "::$DATA.bar"
end
prefixes.each do |prefix|
@@ -898,7 +898,7 @@
@@ -925,7 +925,7 @@
assert_equal(true, test(?=, @file, @file))
assert_equal(false, test(?>, @file, @file))
assert_equal(false, test(?<, @file, @file))
@@ -823,7 +824,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
assert_equal(false, test(?=, @file, @file + "2"))
assert_equal(false, test(?>, @file, @file + "2"))
assert_equal(true, test(?>, @file + "2", @file))
@@ -992,7 +992,7 @@
@@ -1019,7 +1019,7 @@
end
def test_stat_readable_p
@@ -832,7 +833,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
return if Process.euid == 0
File.chmod(0200, @file)
assert(!(File::Stat.new(@file).readable?))
@@ -1001,7 +1001,7 @@
@@ -1028,7 +1028,7 @@
end
def test_stat_readable_real_p
@@ -841,7 +842,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
return if Process.euid == 0
File.chmod(0200, @file)
assert(!(File::Stat.new(@file).readable_real?))
@@ -1010,7 +1010,7 @@
@@ -1037,7 +1037,7 @@
end
def test_stat_world_readable_p
@@ -850,7 +851,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
File.chmod(0006, @file)
assert(File::Stat.new(@file).world_readable?)
File.chmod(0060, @file)
@@ -1020,7 +1020,7 @@
@@ -1047,7 +1047,7 @@
end
def test_stat_writable_p
@@ -859,7 +860,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
return if Process.euid == 0
File.chmod(0400, @file)
assert(!(File::Stat.new(@file).writable?))
@@ -1029,7 +1029,7 @@
@@ -1056,7 +1056,7 @@
end
def test_stat_writable_real_p
@@ -868,7 +869,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
return if Process.euid == 0
File.chmod(0400, @file)
assert(!(File::Stat.new(@file).writable_real?))
@@ -1038,7 +1038,7 @@
@@ -1065,7 +1065,7 @@
end
def test_stat_world_writable_p
@@ -877,7 +878,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
File.chmod(0006, @file)
assert(File::Stat.new(@file).world_writable?)
File.chmod(0060, @file)
@@ -1048,7 +1048,7 @@
@@ -1075,7 +1075,7 @@
end
def test_stat_executable_p
@@ -886,7 +887,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
File.chmod(0100, @file)
assert(File::Stat.new(@file).executable?)
File.chmod(0600, @file)
@@ -1056,7 +1056,7 @@
@@ -1083,7 +1083,7 @@
end
def test_stat_executable_real_p
@@ -895,7 +896,7 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
File.chmod(0100, @file)
assert(File::Stat.new(@file).executable_real?)
File.chmod(0600, @file)
@@ -1081,7 +1081,7 @@
@@ -1108,7 +1108,7 @@
end
def test_stat_owned_p ## xxx
@@ -904,9 +905,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_file_exhaustive.rb ruby-2.0.0-p19
assert(File::Stat.new(@file).owned?)
assert(File::Stat.new(@file).grpowned?)
end
diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_path.rb ruby-2.0.0-p195/test/ruby/test_path.rb
--- ruby-2.0.0-p195-orig/test/ruby/test_path.rb 2011-10-26 06:24:29.000000000 +0000
+++ ruby-2.0.0-p195/test/ruby/test_path.rb 2013-05-22 06:32:23.909179700 +0000
diff -Naur ruby-2.0.0-p353/test/ruby/test_path.rb ruby-2.0.0-p353-msys2/test/ruby/test_path.rb
--- ruby-2.0.0-p353/test/ruby/test_path.rb 2011-10-26 10:24:29.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/ruby/test_path.rb 2013-11-24 19:28:43.609631500 +0400
@@ -47,7 +47,7 @@
end
@@ -943,9 +944,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/ruby/test_path.rb ruby-2.0.0-p195/test/ruby
# DOSISH_UNC
assert_equal('/', File.basename('//'))
assert_equal('/', File.basename('//a'))
diff -Naur ruby-2.0.0-p195-orig/test/rubygems/test_gem_platform.rb ruby-2.0.0-p195/test/rubygems/test_gem_platform.rb
--- ruby-2.0.0-p195-orig/test/rubygems/test_gem_platform.rb 2012-11-29 06:52:18.000000000 +0000
+++ ruby-2.0.0-p195/test/rubygems/test_gem_platform.rb 2013-05-22 06:32:23.909179700 +0000
diff -Naur ruby-2.0.0-p353/test/rubygems/test_gem_platform.rb ruby-2.0.0-p353-msys2/test/rubygems/test_gem_platform.rb
--- ruby-2.0.0-p353/test/rubygems/test_gem_platform.rb 2012-11-29 10:52:18.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/rubygems/test_gem_platform.rb 2013-11-24 19:28:43.612631700 +0400
@@ -45,6 +45,7 @@
'universal-darwin9' => ['universal', 'darwin', '9'],
'universal-macruby' => ['universal', 'macruby', nil],
@@ -954,9 +955,9 @@ diff -Naur ruby-2.0.0-p195-orig/test/rubygems/test_gem_platform.rb ruby-2.0.0-p1
'i686-darwin' => ['x86', 'darwin', nil],
'i686-darwin8.4.1' => ['x86', 'darwin', '8'],
'i386-freebsd4.11' => ['x86', 'freebsd', '4'],
diff -Naur ruby-2.0.0-p195-orig/test/socket/test_addrinfo.rb ruby-2.0.0-p195/test/socket/test_addrinfo.rb
--- ruby-2.0.0-p195-orig/test/socket/test_addrinfo.rb 2012-10-30 00:40:54.000000000 +0000
+++ ruby-2.0.0-p195/test/socket/test_addrinfo.rb 2013-05-22 06:32:23.909179700 +0000
diff -Naur ruby-2.0.0-p353/test/socket/test_addrinfo.rb ruby-2.0.0-p353-msys2/test/socket/test_addrinfo.rb
--- ruby-2.0.0-p353/test/socket/test_addrinfo.rb 2012-10-30 04:40:54.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/socket/test_addrinfo.rb 2013-11-24 19:28:43.615631800 +0400
@@ -6,7 +6,7 @@
require "test/unit"
@@ -966,24 +967,24 @@ diff -Naur ruby-2.0.0-p195-orig/test/socket/test_addrinfo.rb ruby-2.0.0-p195/tes
def tcp_unspecified_to_loopback(addrinfo)
if addrinfo.ipv4? && addrinfo.ip_address == "0.0.0.0"
diff -Naur ruby-2.0.0-p195-orig/test/socket/test_unix.rb ruby-2.0.0-p195/test/socket/test_unix.rb
--- ruby-2.0.0-p195-orig/test/socket/test_unix.rb 2013-01-31 04:59:31.000000000 +0000
+++ ruby-2.0.0-p195/test/socket/test_unix.rb 2013-05-22 06:32:23.924804700 +0000
diff -Naur ruby-2.0.0-p353/test/socket/test_unix.rb ruby-2.0.0-p353-msys2/test/socket/test_unix.rb
--- ruby-2.0.0-p353/test/socket/test_unix.rb 2013-01-31 08:59:31.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/socket/test_unix.rb 2013-11-24 19:28:43.618632000 +0400
@@ -598,4 +598,4 @@
assert(s0.closed?)
end
-end if defined?(UNIXSocket) && /cygwin/ !~ RUBY_PLATFORM
+end if defined?(UNIXSocket) && /cygwin|msys/ !~ RUBY_PLATFORM
diff -Naur ruby-2.0.0-p195-orig/test/webrick/test_cgi.rb ruby-2.0.0-p195/test/webrick/test_cgi.rb
--- ruby-2.0.0-p195-orig/test/webrick/test_cgi.rb 2012-11-06 00:49:57.000000000 +0000
+++ ruby-2.0.0-p195/test/webrick/test_cgi.rb 2013-05-22 06:32:23.940429700 +0000
diff -Naur ruby-2.0.0-p353/test/webrick/test_cgi.rb ruby-2.0.0-p353-msys2/test/webrick/test_cgi.rb
--- ruby-2.0.0-p353/test/webrick/test_cgi.rb 2013-08-16 19:39:43.000000000 +0400
+++ ruby-2.0.0-p353-msys2/test/webrick/test_cgi.rb 2013-11-24 19:31:24.031807100 +0400
@@ -20,7 +20,7 @@
end
},
}
- if RUBY_PLATFORM =~ /mswin32|mingw|cygwin|bccwin32/
+ if RUBY_PLATFORM =~ /mswin32|mingw|cygwin|msys|bccwin32/
- if RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/
+ if RUBY_PLATFORM =~ /mswin|mingw|cygwin|msys|bccwin32/
config[:CGIPathEnv] = ENV['PATH'] # runtime dll may not be in system dir.
end
TestWEBrick.start_httpserver(config){|server, addr, port, log|
@@ -991,14 +992,14 @@ diff -Naur ruby-2.0.0-p195-orig/test/webrick/test_cgi.rb ruby-2.0.0-p195/test/we
req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2")
# Path info of res.body is passed via ENV.
# ENV[] returns different value on Windows depending on locale.
- unless RUBY_PLATFORM =~ /mswin32|mingw|cygwin|bccwin32/ &&
+ unless RUBY_PLATFORM =~ /mswin32|mingw|cygwin|msys|bccwin32/ &&
- unless RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/ &&
+ unless RUBY_PLATFORM =~ /mswin|mingw|cygwin|msys|bccwin32/ &&
Encoding.find("locale") != Encoding.find("filesystem")
http.request(req){|res|
assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body, log.call)}
diff -Naur ruby-2.0.0-p195-orig/tool/config.guess ruby-2.0.0-p195/tool/config.guess
--- ruby-2.0.0-p195-orig/tool/config.guess 2012-01-29 13:50:18.000000000 +0000
+++ ruby-2.0.0-p195/tool/config.guess 2013-05-22 06:32:23.940429700 +0000
diff -Naur ruby-2.0.0-p353/tool/config.guess ruby-2.0.0-p353-msys2/tool/config.guess
--- ruby-2.0.0-p353/tool/config.guess 2012-01-29 17:50:18.000000000 +0400
+++ ruby-2.0.0-p353-msys2/tool/config.guess 2013-11-24 19:28:43.627632500 +0400
@@ -846,6 +846,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
@@ -1009,9 +1010,9 @@ diff -Naur ruby-2.0.0-p195-orig/tool/config.guess ruby-2.0.0-p195/tool/config.gu
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
diff -Naur ruby-2.0.0-p195-orig/win32/mkexports.rb ruby-2.0.0-p195/win32/mkexports.rb
--- ruby-2.0.0-p195-orig/win32/mkexports.rb 2012-11-12 05:29:52.000000000 +0000
+++ ruby-2.0.0-p195/win32/mkexports.rb 2013-05-22 06:32:23.940429700 +0000
diff -Naur ruby-2.0.0-p353/win32/mkexports.rb ruby-2.0.0-p353-msys2/win32/mkexports.rb
--- ruby-2.0.0-p353/win32/mkexports.rb 2012-11-12 09:29:52.000000000 +0400
+++ ruby-2.0.0-p353-msys2/win32/mkexports.rb 2013-11-24 19:28:43.633632900 +0400
@@ -158,6 +158,30 @@
end
end