Changeset 7111

Timestamp:

01/27/10 21:42:45 (7 weeks ago)

Author:

metamorph68

Message:

Ported liquidsoap and some bindings to Win32. Now liquidsoap should compile and run
using the native ocaml compiler (or the crosscompiler) !

Location:

trunk

Files:

• liquidsoap/Makefile (modified) (1 diff)
• liquidsoap/Makefile.defs.in (modified) (1 diff)
• liquidsoap/configure.ac (modified) (6 diffs)
• liquidsoap/src/Makefile (modified) (1 diff)
• liquidsoap/src/sources/playlist.ml (modified) (3 diffs)
• liquidsoap/src/sources/request_source.ml (modified) (1 diff)
• liquidsoap/src/tools/harbor.ml (modified) (1 diff)
• liquidsoap/src/tools/server.ml (modified) (1 diff)
• ocaml-dtools/CHANGES (modified) (1 diff)
• ocaml-dtools/src/dtools.ml (modified) (3 diffs)
• ocaml-duppy/CHANGES (modified) (1 diff)
• ocaml-duppy/src/duppy.ml (modified) (2 diffs)
• ocaml-taglib/CHANGES (modified) (1 diff)
• ocaml-taglib/configure.ac (modified) (4 diffs)
• ocaml-taglib/src/Makefile.in (modified) (1 diff)

trunk/liquidsoap/Makefile

@@ -2 +2 @@
 SUBDIRS= src examples doc gui scripts
 DISTFILES = CHANGES COPYING INSTALL README \
-        bootstrap configure.ac configure config.h.in \
+        bootstrap configure.ac configure config.h.in test_os.ml \
         Makefile Makefile.defs.in Makefile.rules install-sh
 

trunk/liquidsoap/Makefile.defs.in

@@ -26 +26 @@
 LIBS = @LIBS@
 LDFLAGS = @LDFLAGS@
+OS_EXEC_SUFFIX = @OS_EXEC_SUFFIX@
 
 _OCAML_CFLAGS= @ocamlcflags@

trunk/liquidsoap/configure.ac

@@ -60 +60 @@
 if test "x$prefix" = "xNONE" ; then
   prefix=/usr/local
+  default_prefix=/usr
 else
   # Add passed prefix to compilation variables.
@@ -65 +66 @@
   LDFLAGS="$LDFLAGS -L$prefix/lib"
   CPPFLAGS="$CPPFLAGS -I$prefix/include"
+  default_prefix=$prefix
 fi
 
@@ -97 +99 @@
   big endian]),[])
 
-# opal
-
-AC_ARG_WITH([opal-include],
-   AC_HELP_STRING(
-      [--with-opal-include=path],
-      [look for opal headers in path (defaults to /usr/include/opal)]))
-AC_ARG_ENABLE([opal],AC_HELP_STRING([--disable-opal],["don't use opal"]))
-
-W_OPAL=""
-w_OPAL=no
-if test "x$enable_opal" != "xno" ; then
-  AC_MSG_CHECKING(for libopal)
-
-  if test -z "$with_opal_include" ; then
-    OPAL_INCLUDE=/usr/include/opal
-  else
-    OPAL_INCLUDE=$with_opal_include
-  fi
-
-  if test \! -f ${OPAL_INCLUDE}/opal.h ; then
-    AC_MSG_RESULT(Header not found: ${OPAL_INCLUDE}/opal.h)
-    W_OPAL=""
-    w_OPAL=no
-  else
-    W_OPAL=yes
-    w_OPAL=yes
-    AC_MSG_RESULT(ok)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_SUBST(W_OPAL)
-AC_SUBST(OPAL_INCLUDE)
-
-# V4L
-
-AC_ARG_WITH([v4l-include],
-   AC_HELP_STRING(
-      [--with-v4l-include=path],
-      [look for v4l headers in path (defaults to /usr/include/linux)]))
-AC_ARG_ENABLE([v4l],AC_HELP_STRING([--disable-v4l],["don't use v4l"]))
-
-if test "x$enable_v4l" != "xno" ; then
-  AC_MSG_CHECKING(for v4l)
-
-  if test -z "$with_v4l_include" ; then
-    V4L_INCLUDE=/usr/include/linux
-  else
-    V4L_INCLUDE=$with_v4l_include
-  fi
-
-  if test \! -f ${V4L_INCLUDE}/videodev.h ; then
-    AC_MSG_RESULT(Header not found: ${V4L_INCLUDE}/videodev.h)
-    W_V4L=""
-    w_V4L=no
-  else
-    W_V4L=yes
-    w_V4L=yes
-    AC_MSG_RESULT(ok)
-  fi
-else
-    W_V4L=""
-    w_V4L=no
-fi
-
-AC_SUBST(W_V4L)
-AC_SUBST(V4L_INCLUDE)
-
 #
 # OCaml stuff
@@ -211 +144 @@
 fi
 
+# Check for OS
+OS_TYPE=`$OCAMLFIND ocamlc -config | grep os_type | tr -d ' ' | cut -d':' -f 2`
+if test "$OS_TYPE" \!= "Win32" ; then
+  OS_EXEC_SUFFIX=""
+else
+  OS_EXEC_SUFFIX=".exe"
+fi
+AC_SUBST(OS_EXEC_SUFFIX)
+
 # Add -fPIC to CFLAGS for compatibility with x86_64
-CFLAGS="$CFLAGS -fPIC"
+if test "$OS_TYPE" \!= "Win32" ; then
+  CFLAGS="$CFLAGS -fPIC"
+fi
+
 # Optimize for local machine
 AC_ARG_ENABLE([optimize],
@@ -297 +242 @@
 
 AC_SUBST(BYTE)
+
+# opal
+
+AC_ARG_WITH([opal-include],
+   AC_HELP_STRING(
+      [--with-opal-include=path],
+      [look for opal headers in path (defaults to /usr/include/opal)]))
+AC_ARG_ENABLE([opal],AC_HELP_STRING([--disable-opal],["don't use opal"]))
+
+W_OPAL=""
+w_OPAL=no
+if test "x$enable_opal" != "xno" ; then
+  AC_MSG_CHECKING(for libopal)
+
+  if test -z "$with_opal_include" ; then
+    OPAL_INCLUDE=$default_prefix/include/opal
+  else
+    OPAL_INCLUDE=$with_opal_include
+  fi
+
+  if test \! -f ${OPAL_INCLUDE}/opal.h ; then
+    AC_MSG_RESULT(Header not found: ${OPAL_INCLUDE}/opal.h)
+    W_OPAL=""
+    w_OPAL=no
+  else
+    W_OPAL=yes
+    w_OPAL=yes
+    AC_MSG_RESULT(ok)
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(W_OPAL)
+AC_SUBST(OPAL_INCLUDE)
+
+# V4L
+
+AC_ARG_WITH([v4l-include],
+   AC_HELP_STRING(
+      [--with-v4l-include=path],
+      [look for v4l headers in path (defaults to /usr/include/linux)]))
+AC_ARG_ENABLE([v4l],AC_HELP_STRING([--disable-v4l],["don't use v4l"]))
+
+if test "x$enable_v4l" != "xno" ; then
+  AC_MSG_CHECKING(for v4l)
+
+  if test -z "$with_v4l_include" ; then
+    V4L_INCLUDE=$default_prefix/include/linux
+  else
+    V4L_INCLUDE=$with_v4l_include
+  fi
+
+  if test \! -f ${V4L_INCLUDE}/videodev.h ; then
+    AC_MSG_RESULT(Header not found: ${V4L_INCLUDE}/videodev.h)
+    W_V4L=""
+    w_V4L=no
+  else
+    W_V4L=yes
+    w_V4L=yes
+    AC_MSG_RESULT(ok)
+  fi
+else
+    W_V4L=""
+    w_V4L=no
+fi
+
+AC_SUBST(W_V4L)
+AC_SUBST(V4L_INCLUDE)
 
 AC_ARG_ENABLE([graphics],
@@ -1791 +1805 @@
  Compiler       : $OCAMLC
  Version        : $OCAML_MAJOR.$OCAML_MINOR.$OCAML_REVISION
+ OS             : $OS_TYPE
  OCAML_CFLAGS   : $ocamlcflags
  OCAML_LFLAGS   : $ocamllflags

trunk/liquidsoap/src/Makefile

@@ -6 +6 @@
 DISTFILES = $(wildcard *.mli) Makefile $(wildcard *.ml) META.in
 
-ocaml_progs= liquidsoap
+ocaml_progs= liquidsoap$(OS_EXEC_SUFFIX)
 
 ogg_demuxer = \

trunk/liquidsoap/src/sources/playlist.ml

@@ -109 +109 @@
     * Must be called within mylock critical section. *)
   method randomize_playlist =
-    assert (not (Mutex.try_lock mylock)) ;
+    (* This assertion does not work on
+     * win32 because a thread can double-lock
+     * the same mutex.. *)
+    if Sys.os_type <> "Win32" then
+      assert (not (Mutex.try_lock mylock)) ;
     Utils.randomize !playlist
 
@@ -231 +235 @@
 
   method reload_playlist_internal new_playlist_uri =
-
-    assert (not (Mutex.try_lock reloading)) ;
+    
+    (* This assertion does not work on
+     * win32 because a thread can double-lock
+     * the same mutex.. *)
+    if Sys.os_type <> "Win32" then
+      assert (not (Mutex.try_lock reloading)) ;
 
     self#load_playlist ?uri:new_playlist_uri true ;
@@ -248 +256 @@
   method reload_update round_done =
     (* Must be called by somebody who owns [mylock] *)
-    assert (not (Mutex.try_lock mylock)) ;
+    (* This assertion does not work on
+     * win32 because a thread can double-lock
+     * the same mutex.. *)
+    if Sys.os_type <> "Win32" then
+      assert (not (Mutex.try_lock mylock)) ;
     match reload with
       | Never -> ()

trunk/liquidsoap/src/sources/request_source.ml

@@ -69 +69 @@
     * when there is no ready request. *)
   method private begin_track =
-    assert (not (Mutex.try_lock plock)) ;
+    (* This assertion does not work on
+     * win32 because a thread can double-lock
+     * the same mutex.. *)
+    if Sys.os_type <> "Win32" then
+      assert (not (Mutex.try_lock plock)) ;
     assert (current = None) ;
     match self#get_next_file with

trunk/liquidsoap/src/tools/harbor.ml

@@ -578 +578 @@
 
 let start () =
-  Sys.set_signal Sys.sigpipe Sys.Signal_ignore ;
+  if Sys.os_type <> "Win32" then
+    Sys.set_signal Sys.sigpipe Sys.Signal_ignore ;
   if Hashtbl.length sources > 0 then begin
     Tutils.need_non_blocking_queue () ;

trunk/liquidsoap/src/tools/server.ml

@@ -336 +336 @@
 
 let start () =
-  Sys.set_signal Sys.sigpipe Sys.Signal_ignore ;
+  if Sys.os_type <> "Win32" then
+    Sys.set_signal Sys.sigpipe Sys.Signal_ignore ;
   let telnet = conf_telnet#get in
   let socket = conf_socket#get in

trunk/ocaml-dtools/CHANGES

@@ +1 @@
+0.1.7 ()
+=====
+* Use Thread.join instead of Thread.wait_signal
+  under Win32 (Thread.wait_signal is not implemented
+  in this case). Also do not use sigmask since it is 
+  not implemented either.
+
 0.1.6 (15-04-2008)
 =====

trunk/ocaml-dtools/src/dtools.ml

@@ -502 +502 @@
   let main f () =
     begin try exec start with e -> raise (StartError e) end;
-    let quit pid = Unix.kill pid Sys.sigterm in
+    let quit pid = 
+      if Sys.os_type <> "Win32" then
+        Unix.kill pid Sys.sigterm 
+    in
     let thread pid =
       begin try f (); quit pid with
@@ -513 +516 @@
       end
     in
-    ignore (Thread.create thread (Unix.getpid ()));
-    wait_signal ();
+    let th = Thread.create thread (Unix.getpid ()) in
+    if Sys.os_type <> "Win32" then
+      wait_signal ()
+    else
+      Thread.join th ;
     begin try exec stop with e -> raise (StopError e) end
 
@@ -606 +612 @@
     Sys.set_signal Sys.sigint (Sys.Signal_handle signal_h);
     (* We want to block those signals. *)
-    ignore (Unix.sigprocmask Unix.SIG_BLOCK [Sys.sigterm; Sys.sigint]);
+    if Sys.os_type <> "Win32" then
+      ignore (Unix.sigprocmask Unix.SIG_BLOCK [Sys.sigterm; Sys.sigint]);
     if conf_daemon#get
     then daemonize (main f)

trunk/ocaml-duppy/CHANGES

@@ +1 @@
+0.3.2 ()
+=====
+* Switch from Thread.select to 
+  Unix.select. They are the same on 
+  POSIX and only Unix.select is available
+  on Win32..
+* Do not use assertions on Mutex.try_lock
+  on Win32: on this plateform, a thread can
+  double-lock a mutex, making the assertion 
+  inconsistent.
+
 0.3.1 (14-10-2009)
 =====

trunk/ocaml-duppy/src/duppy.ml

@@ -160 +160 @@
            (List.length e.r) (List.length e.w) (List.length e.x)) ;
     let r,w,x =
-      Thread.select e.r e.w e.x timeout
+      Unix.select e.r e.w e.x timeout
     in
       log (Printf.sprintf "Left select at %f (%d/%d/%d)." (time ())
@@ -198 +198 @@
     * if some task was processed. *) 
 let exec s (priorities:'a->bool) =
-  assert(not (Mutex.try_lock s.ready_m)) ;
+  (* This assertion does not work on
+   * win32 because a thread can double-lock
+   * the same mutex.. *)
+  if Sys.os_type <> "Win32" then
+    assert(not (Mutex.try_lock s.ready_m)) ;
   try
     let (_,task),remaining =

trunk/ocaml-taglib/CHANGES

@@ +1 @@
+0.1.4 ()
+=====
+* Reworked build system, now using pkg-config.
+
 0.1.3 (20-06-2009)
 =====

trunk/ocaml-taglib/configure.ac

@@ -1 +1 @@
 
 # check for one particular file of the sources 
-AC_INIT(ocaml-taglib, 0.1.3, savonet-users@lists.sourceforge.net)
+AC_INIT(ocaml-taglib, 0.1.4, savonet-users@lists.sourceforge.net)
 
 VERSION=$PACKAGE_VERSION
@@ -9 +9 @@
 # if passed
 if test "x$prefix" != "xNONE"; then
-        CFLAGS="$CFLAGS -I$prefix/include"
-        LDFLAGS="$LDFLAGS -L$prefix/lib"
-        CPPFLAGS="$CPPFLAGS -I$prefix/include"
+        CFLAGS="$CFLAGS -I$prefix/include"
+        LDFLAGS="$LDFLAGS -L$prefix/lib"
+        CPPFLAGS="$CPPFLAGS -I$prefix/include"
 fi
 
@@ -109 +109 @@
 
 AC_PROG_CC()
-AC_CHECK_HEADER(taglib/tag_c.h, [], [AC_MSG_ERROR([taglib/tag_c.h, please
-install the C taglib library, or put taglib/tag_c.h somewhere it can be found]);])
-AC_CHECK_LIB(tag_c, taglib_set_string_management_enabled, [], [AC_MSG_ERROR(Cannot find libtag_c.)])
-ACLIBS="-ltag_c $ACLIBS"
+PKG_PROG_PKG_CONFIG()
+#PKG_CHECK_MODULES(taglib, taglib_c, , [AC_MSG_ERROR(taglib not found.)])
+
+# PKG_CHECK_MODULES loses when you need --libs-only-[lL]
+if ! $PKG_CONFIG --exists taglib_c; then
+        AC_MSG_ERROR([taglib not found])
+fi
+taglib_CFLAGS=`$PKG_CONFIG --cflags taglib_c`
+AC_SUBST([taglib_CFLAGS])
+taglib_LIBS=`$PKG_CONFIG --libs-only-l taglib_c`
+AC_SUBST([taglib_LIBS])
+taglib_LDFLAGS=`$PKG_CONFIG --libs-only-L taglib_c`
+AC_SUBST([taglib_LDFLAGS])
 
 if test "$OCAMLOPT" = no ; then
@@ -137 +146 @@
 AC_SUBST(BEST)
 AC_SUBST(INC)
-AC_SUBST(ACLIBS)
 AC_SUBST(requires)
 

trunk/ocaml-taglib/src/Makefile.in

@@ -28 +28 @@
 OCAMLDOCFLAGS = -stars
 LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.cmx *.a *.so)
-ACLIBS = @LIBS@
-LDFLAGS = @LDFLAGS@
+ACLIBS = @LIBS@ @taglib_LIBS@
+LDFLAGS = @LDFLAGS@ @taglib_LDFLAGS@
 CLIBS = $(ACLIBS:-l%=%)
 LIBDIRS = $(LDFLAGS:-L%=%)
 CC = @CC@
-CFLAGS = @CFLAGS@ -Wall -DCAML_NAME_SPACE
+CFLAGS = @CFLAGS@ @taglib_CFLAGS@ -Wall -DCAML_NAME_SPACE
 CPPFLAGS = @CPPFLAGS@
 INCDIRS = @INC@