Changeset 7135

Timestamp:

02/05/10 00:08:16 (7 months ago)

Author:

metamorph68

Message:

• Add a disclaimer when building a svn snapshot.
• Move some part of utils.liq that are not yet available in current SVN.

Location:

trunk/liquidsoap

Files:

• configure.ac (modified) (3 diffs)
• scripts/external.liq (modified) (1 diff)
• scripts/utils.liq (modified) (1 diff)
• src/configure.mli (modified) (1 diff)
• src/main.ml (modified) (1 diff)

trunk/liquidsoap/configure.ac

@@ -6 +6 @@
 dnl $libdir/liquidsoap/$libs_dir_version
 
+# Remove +svn and set svn_snapshot to false
+# before releasing
 AC_INIT([liquidsoap],[0.9.2+svn])
-version="0.9.2+svn"
-libs_dir_version="svn"
+svn_snapshot=true
+version=0.9.2
+
+if test $svn_snapshot != "false"; then
+  version="$version+svn"
+  libs_dir_version="svn"
+else
+  libs_dir_version="$version"
+fi
 AC_SUBST(version)
 AC_SUBST(libs_dir_version)
@@ -41 +50 @@
 cat > src/configure.ml << _BLAH_
 let version = "$version"
+let svn_snapshot = $svn_snapshot
 let conf = Dtools.Conf.void "Liquidsoap configuration"
 let var_script = ref "default"
@@ -1702 +1712 @@
 fi
 
-AC_PATH_PROG(TEXT2WAVE,text2wave$(EXEEXT),false)
-AC_PATH_PROG(SOX,sox,false)
-AC_PATH_PROG(NORMALIZE,normalize,false)
+if test $OS_TYPE != "Win32"; then
+  AC_PATH_PROG(TEXT2WAVE,text2wave,false)
+  AC_PATH_PROG(SOX,sox,false)
+  AC_PATH_PROG(NORMALIZE,normalize,false)
+fi
 
 if test "$TEXT2WAVE" = false ; then

trunk/liquidsoap/scripts/external.liq

@@ -420 +420 @@
                     -vc null -vo null #{quote(s)} 2>/dev/null")
 end
+
+# Enable replay gain metadata resolver. This resolver will
+# process any file decoded by liquidsoap and add a @replay_gain@
+# metadata when this value could be computed. For a finer-grained
+# replay gain processing, use the @replay_gain@ protocol.
+# @category Liquidsoap
+# @param ~extract_replaygain The extraction program
+def enable_replaygain_metadata(
+       ~extract_replaygain="#{configure.libdir}/extract-replaygain")
+  def replaygain_metadata(~format,file)
+    x = get_process_lines("#{extract_replaygain} \
+                              #{quote(file)}")
+    if list.hd(x) != "" then
+      [("replay_gain",list.hd(x))]
+    else
+      []
+    end
+  end
+  add_metadata_resolver("replay_gain", replaygain_metadata)
+end

trunk/liquidsoap/scripts/utils.liq

@@ -477 +477 @@
 add_protocol("replay_gain", replaygain_protocol)
 
-# Enable replay gain metadata resolver. This resolver will 
-# process any file decoded by liquidsoap and add a @replay_gain@ 
-# metadata when this value could be computed. For a finer-grained 
-# replay gain processing, use the @replay_gain@ protocol.
-# @category Liquidsoap
-# @param ~extract_replaygain The extraction program
-def enable_replaygain_metadata(
-       ~extract_replaygain="#{configure.libdir}/extract-replaygain") 
-  def replaygain_metadata(~format,file)
-    x = get_process_lines("#{extract_replaygain} \
-                              #{quote(file)}")
-    if list.hd(x) != "" then
-      [("replay_gain",list.hd(x))]
-    else
-      []
-    end
-  end
-  add_metadata_resolver("replay_gain", replaygain_metadata)
-end

trunk/liquidsoap/src/configure.mli

@@ -3 +3 @@
 (** String describing the version. *)
 val version : string
+
+(** Is this build a SVN snapshot ? *)
+val svn_snapshot : bool
 
 (** Substitution of configured variables *)

trunk/liquidsoap/src/main.ml

@@ -390 +390 @@
 let log = Log.make ["main"]
 
-let () =
-  log#f 3 "Liquidsoap %s%s" Configure.version SVN.rev
+let () = 
+  log#f 1 "Liquidsoap %s%s" Configure.version SVN.rev ;
+  if Configure.svn_snapshot then
+    List.iter (log#f 1 "%s")
+      ["DISCLAIMER: This version of Liquidsoap was";
+       "compiled from a snapshot of the developpement";
+       "code. As such, it should not be used in production";
+       "unless you know what you are doing !";
+       "";
+       "We are, however, very interested in any feedback";
+       "about our developpement code and commited to fix";
+       "issues as soon as possible.";
+       "";
+       "If you are interested into collaborating with";
+       "the developpement of Liquidsoap, feel free to";
+       "drop us a mail at: savonet-devl@lists.sf.net";
+       "or to join our #savonet IRC channel on Freenode";
+       "";
+       "Please send any bug report of feature request";
+       "using our trac system at: http://savonet.rastageeks.org";
+       "";
+       "We hope you will enjoy the use of this snapshot";
+       "build of Liquidsoap !"]
 
 (** Just like Arg.parse_argv but with Arg.parse's behavior on errors.. *)