The following commit has been merged in the master branch:
commit 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169
Author: Romain Beauxis <to...@rastageeks.org>
Date:   Wed May 8 18:55:47 2013 -0500

    Imported Upstream version 0.5.1

diff --git a/CHANGES b/CHANGES
index 87fd795..8519488 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.5.1 (05-08-2013)
+=====
+* Removed win32 select work-around: patch applied upstream.
+
 0.5.0 (04-03-2013)
 =====
 * Remove Panic exception and let original exception bubble through.
diff --git a/configure b/configure
index d2503fe..d18d7a1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ocaml-duppy 0.5.0.
+# Generated by GNU Autoconf 2.69 for ocaml-duppy 0.5.1.
 #
 # Report bugs to <savonet-us...@lists.sourceforge.net>.
 #
@@ -639,8 +639,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ocaml-duppy'
 PACKAGE_TARNAME='ocaml-duppy'
-PACKAGE_VERSION='0.5.0'
-PACKAGE_STRING='ocaml-duppy 0.5.0'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='ocaml-duppy 0.5.1'
 PACKAGE_BUGREPORT='savonet-us...@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -673,9 +673,11 @@ OCAMLLEXDOTOPT
 OCAMLLEX
 CAMLIDL
 OCAMLBUILD
+OCAMLDOCOPT
 OCAMLDOC
 OCAMLMKLIB
 OCAMLMKTOP
+OCAMLDEPOPT
 OCAMLDEP
 OCAML
 OCAMLOPTDOTOPT
@@ -1309,7 +1311,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ocaml-duppy 0.5.0 to adapt to many kinds of systems.
+\`configure' configures ocaml-duppy 0.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1374,7 +1376,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ocaml-duppy 0.5.0:";;
+     short | recursive ) echo "Configuration of ocaml-duppy 0.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1478,7 +1480,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ocaml-duppy configure 0.5.0
+ocaml-duppy configure 0.5.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1564,7 +1566,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ocaml-duppy $as_me 0.5.0, which was
+It was created by ocaml-duppy $as_me 0.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3956,6 +3958,48 @@ fi
 
   if test "$OCAMLDEP" = "no"; then
     as_fn_error $? "Cannot find ocamlmklib." "$LINENO" 5
+  else
+    # Extract the first word of "${ac_tool_prefix}ocamldep.opt", so it can be 
a program name with args.
+set dummy ${ac_tool_prefix}ocamldep.opt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OCAMLDEPOPT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OCAMLDEPOPT"; then
+  ac_cv_prog_OCAMLDEPOPT="$OCAMLDEPOPT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OCAMLDEPOPT="${ac_tool_prefix}ocamldep.opt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_OCAMLDEPOPT" && ac_cv_prog_OCAMLDEPOPT="no"
+fi
+fi
+OCAMLDEPOPT=$ac_cv_prog_OCAMLDEPOPT
+if test -n "$OCAMLDEPOPT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEPOPT" >&5
+$as_echo "$OCAMLDEPOPT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    if test "$OCAMLDEPOPT" != "no"; then
+      OCAMLDEP=$OCAMLDEPOPT
+    fi
   fi
 
 
@@ -4140,6 +4184,103 @@ else
   OCAMLDOC="$ac_cv_prog_OCAMLDOC"
 fi
 
+  if test "$OCAMLDOC" != "no"; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ocamldoc.opt", so it can be a 
program name with args.
+set dummy ${ac_tool_prefix}ocamldoc.opt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OCAMLDOCOPT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OCAMLDOCOPT"; then
+  ac_cv_prog_OCAMLDOCOPT="$OCAMLDOCOPT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OCAMLDOCOPT="${ac_tool_prefix}ocamldoc.opt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OCAMLDOCOPT=$ac_cv_prog_OCAMLDOCOPT
+if test -n "$OCAMLDOCOPT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDOCOPT" >&5
+$as_echo "$OCAMLDOCOPT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OCAMLDOCOPT"; then
+  ac_ct_OCAMLDOCOPT=$OCAMLDOCOPT
+  # Extract the first word of "ocamldoc.opt", so it can be a program name with 
args.
+set dummy ocamldoc.opt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OCAMLDOCOPT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OCAMLDOCOPT"; then
+  ac_cv_prog_ac_ct_OCAMLDOCOPT="$ac_ct_OCAMLDOCOPT" # Let the user override 
the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OCAMLDOCOPT="ocamldoc.opt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OCAMLDOCOPT=$ac_cv_prog_ac_ct_OCAMLDOCOPT
+if test -n "$ac_ct_OCAMLDOCOPT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLDOCOPT" >&5
+$as_echo "$ac_ct_OCAMLDOCOPT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OCAMLDOCOPT" = x; then
+    OCAMLDOCOPT="no"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
>&2;}
+ac_tool_warned=yes ;;
+esac
+    OCAMLDOCOPT=$ac_ct_OCAMLDOCOPT
+  fi
+else
+  OCAMLDOCOPT="$ac_cv_prog_OCAMLDOCOPT"
+fi
+
+    if test "$OCAMLDOCOPT" != "no"; then
+      OCAMLDOC=$OCAMLDOCOPT
+    fi
+  fi
 
 
 
@@ -6006,7 +6147,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ocaml-duppy $as_me 0.5.0, which was
+This file was extended by ocaml-duppy $as_me 0.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6059,7 +6200,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ocaml-duppy config.status 0.5.0
+ocaml-duppy config.status 0.5.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3af9b79..36794bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ocaml-duppy],[0.5.0],[savonet-us...@lists.sourceforge.net])
+AC_INIT([ocaml-duppy],[0.5.1],[savonet-us...@lists.sourceforge.net])
 
 VERSION=$PACKAGE_VERSION
 AC_SUBST(VERSION)
diff --git a/m4/ocaml.m4 b/m4/ocaml.m4
index cd53c6d..14e7948 100644
--- a/m4/ocaml.m4
+++ b/m4/ocaml.m4
@@ -97,6 +97,11 @@ AC_DEFUN([AC_PROG_OCAML],
   AC_CHECK_TOOL_STRICT([OCAMLDEP],[ocamldep],[no])
   if test "$OCAMLDEP" = "no"; then
     AC_MSG_ERROR(Cannot find ocamlmklib.)
+  else
+    AC_CHECK_TOOL_STRICT([OCAMLDEPOPT],[ocamldep.opt],[no])
+    if test "$OCAMLDEPOPT" != "no"; then
+      OCAMLDEP=$OCAMLDEPOPT
+    fi
   fi
 
   AC_SUBST([OCAMLDEP])
@@ -116,6 +121,12 @@ AC_DEFUN([AC_PROG_OCAML],
 
   # checking for ocamldoc
   AC_CHECK_TOOL([OCAMLDOC],[ocamldoc],[no])
+  if test "$OCAMLDOC" != "no"; then
+    AC_CHECK_TOOL([OCAMLDOCOPT],[ocamldoc.opt],[no])
+    if test "$OCAMLDOCOPT" != "no"; then
+      OCAMLDOC=$OCAMLDOCOPT
+    fi
+  fi
 
   AC_SUBST([OCAMLDOC])
 
diff --git a/src/duppy.ml b/src/duppy.ml
index 0c02f5a..1ef8696 100644
--- a/src/duppy.ml
+++ b/src/duppy.ml
@@ -157,30 +157,9 @@ let stop s =
 
 let tmp = String.create 1024
 
-(* There seems to be an issue under win32 where
- * some sockets are left in non-blocking mode
- * after Unix.select. Since we do not use non-blocking mode at all
- * in duppy, this wrapper ensures that all socket are set back to
- * blocking mode after a call to select under win32.. *)
-let select r w e t =
-  let ret = Unix.select r w e t in
-  if Sys.os_type <> "Win32" then
-    ret
-  else
-   begin
-    let f x =
-       try
-        Unix.clear_nonblock x
-       with _ -> ()
-    in
-    let f = List.iter f in
-    f r; f w; f e;
-    ret
-   end
-
-  (** There should be only one call of #process at a time.
-    * Process waits for tasks to become ready, and moves ready tasks
-    * to the ready queue. *)
+(** There should be only one call of #process at a time.
+  * Process waits for tasks to become ready, and moves ready tasks
+  * to the ready queue. *)
 let process s log = 
   (* Compute the union of all events. *)
   let e =
@@ -199,7 +178,7 @@ let process s log =
         log (Printf.sprintf "Enter select at %f, timeout %f (%d/%d/%d)."
              (time ()) timeout
            (List.length e.r) (List.length e.w) (List.length e.x)) ;
-        let r,w,x = select e.r e.w e.x timeout in
+        let r,w,x = Unix.select e.r e.w e.x timeout in
         log (Printf.sprintf "Left select at %f (%d/%d/%d)." (time ())
                (List.length r) (List.length w) (List.length x)) ;
         r,w,x

-- 
ocaml-duppy packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to