Changeset 7128

Timestamp:

02/01/10 18:37:23 (7 months ago)

Author:

metamorph68

Message:

Win32 specifics:

• Disable daemon option: Unix.fork is not implemented.
• Use local directory for pervasives and etc..

Also remove configure.ml in clean target..

Location:

trunk

Files:

• liquidsoap/Makefile (modified) (2 diffs)
• liquidsoap/Makefile.defs.in (modified) (1 diff)
• liquidsoap/Makefile.rules (modified) (1 diff)
• liquidsoap/configure.ac (modified) (2 diffs)
• liquidsoap/src/main.ml (modified) (1 diff)
• ocaml-dtools/src/dtools.ml (modified) (2 diffs)

trunk/liquidsoap/Makefile

@@ -27 +27 @@
 finish-configure:
         @echo Creating src/configure.ml
+ifneq ($(OS_TYPE),Win32)
         @echo let tts_program = \"$(libdir)/liquidsoap/$(libs_dir_version)/liquidtts\" >> src/configure.ml
         @echo let rundir = \"$(localstatedir)/run/liquidsoap\" >> src/configure.ml
@@ -34 +35 @@
         @echo let \(\) = add_subst \"\<sysrundir\>\" \"$(localstatedir)/run/liquidsoap\" >> src/configure.ml
         @echo let \(\) = add_subst \"\<syslogdir\>\" \"$(localstatedir)/log/liquidsoap\" >> src/configure.ml
+else
+        # In windows, we load everything from the current directory.
+        @echo let tts_program = \"liquidtts\" >> src/configure.ml
+        @echo let rundir = \"run\" >> src/configure.ml
+        @echo let logdir = \"logs\" >> src/configure.ml
+        @echo let libs_dir = \"libs\" >> src/configure.ml
+        @echo let \(\) = add_subst \"\<sysrundir\>\" \".\" >> src/configure.ml
+        @echo let \(\) = add_subst \"\<syslogdir\>\" \".\" >> src/configure.ml
+endif
+        @echo let display_types = ref false >> src/configure.ml
         @echo "(* Enable backtrace printing if possible, does nothing on ocaml<3.11 *)" >> src/configure.ml
         @echo "let record_backtrace _ = ()" >> src/configure.ml

trunk/liquidsoap/Makefile.defs.in

@@ -26 +26 @@
 LIBS = @LIBS@
 LDFLAGS = @LDFLAGS@
+OS_TYPE = @OS_TYPE@
 OS_EXEC_SUFFIX = @OS_EXEC_SUFFIX@
 

trunk/liquidsoap/Makefile.rules

@@ -12 +12 @@
 install: install-local install-subdirs
 clean: clean-subdirs clean-local clean-buildings
-        rm -f *.cmo *.cmi *.cmx *.cma *.cmxa *.o *.annot
+        rm -f *.cmo *.cmi *.cmx *.cma *.cmxa *.o *.annot configure.ml
 doc: doc-local doc-subdirs doc-auto
 

trunk/liquidsoap/configure.ac

@@ -146 +146 @@
 # Check for OS
 OS_TYPE=`$OCAMLFIND ocamlc -config | grep os_type | tr -d ' ' | cut -d':' -f 2`
+AC_SUBST(OS_TYPE)
+
 if test "$OS_TYPE" \!= "Unix" ; then
   OS_EXEC_SUFFIX=".exe"
@@ -1707 +1709 @@
 fi
 
-AC_PATH_PROG(TEXT2WAVE,text2wave,false)
+AC_PATH_PROG(TEXT2WAVE,text2wave$(OS_EXEC_SUFFIX),false)
 AC_PATH_PROG(SOX,sox,false)
 AC_PATH_PROG(NORMALIZE,normalize,false)

trunk/liquidsoap/src/main.ml

@@ -316 +316 @@
       ["--debug"],
       Arg.Unit (fun () -> Log.conf_level#set (max 4 Log.conf_level#get)),
-      "Print debugging log messages." ;
-
-      ["-d";"--daemon"],
-      Arg.Unit (fun f -> Init.conf_daemon#set true),
-      "Run in daemon mode." ;
-
-      ["-t";"--enable-telnet"],
+      "Print debugging log messages." ]
+      @
+      (* Unix.fork is not implemented in Win32. *) 
+      (if Sys.os_type <> "Win32" then
+        [["-d";"--daemon"],
+         Arg.Unit (fun f -> Init.conf_daemon#set true),
+         "Run in daemon mode."]
+       else [])
+      @
+      [["-t";"--enable-telnet"],
       Arg.Unit (fun _ -> Server.conf_telnet#set true),
       "Enable the telnet server." ;

trunk/ocaml-dtools/src/dtools.ml

@@ -383 +383 @@
   let conf =
     Conf.void "initialization configuration"
+  (* Unix.fork is not implemented in Win32. *)
+  let daemon_conf = 
+    if Sys.os_type <> "Win32" then conf
+    else Conf.void "dummy conf"
   let conf_daemon =
-    Conf.bool ~p:(conf#plug "daemon") ~d:false
+    Conf.bool ~p:(daemon_conf#plug "daemon") ~d:false
       "run in daemon mode"
   let conf_daemon_pidfile =
@@ -614 +618 @@
     if Sys.os_type <> "Win32" then
       ignore (Unix.sigprocmask Unix.SIG_BLOCK [Sys.sigterm; Sys.sigint]);
-    if conf_daemon#get
-    then daemonize (main f)
+      if conf_daemon#get && Sys.os_type <> "Win32"
+      then daemonize (main f)
     else catch (main f) (fun () -> ())
 
   let args =
-    [
-      ["--daemon";"-d"],
-      Arg.Unit (fun () -> conf_daemon#set true),
-      "run in daemon mode";
-    ]
+    if Sys.os_type <> "Win32" then
+      [
+        ["--daemon";"-d"],
+        Arg.Unit (fun () -> conf_daemon#set true),
+        "run in daemon mode";
+      ]
+    else []
 
 end