Move pcre to stdlib to make sure we never link on pcre. (#3835)

savonet · Apr 26, 2024 · 485d746 · 485d746
1 parent ccc5483
commit 485d746
Show file tree

Hide file tree

Showing 38 changed files with 10 additions and 51 deletions.
diff --git a/.github/opam/liquidsoap-core-windows.opam b/.github/opam/liquidsoap-core-windows.opam
@@ -20,7 +20,7 @@ depends: [
   "camomile-windows" {>= "2.0.0"}
   "camomile" {>= "2.0.0"}
   "dtools-windows" {>= "0.4.5"}
-  "duppy-windows" {>= "0.9.3"}
+  "duppy-windows" {>= "0.9.4"}
   "mm-windows" {>= "0.8.4"}
   "re-windows" {>= "1.11.0"}
   "cry-windows" {>= "1.0.1"}

diff --git a/.github/scripts/build-win32.sh b/.github/scripts/build-win32.sh
@@ -47,6 +47,7 @@ opam repository set-url windows https://github.com/ocaml-cross/opam-cross-window
 opam update windows
 # shellcheck disable=SC2046
 opam upgrade -y $(echo "$OPAM_DEPS" | sed -e 's#,# #g') ffmpeg-windows ffmpeg-avutil-windows
+opam remove -y pcre-windows
 
 # Debug
 opam reinstall -y cry-windows

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -510,7 +510,7 @@ jobs:
       image: savonet/liquidsoap-win32-ocaml-5-deps-${{ matrix.system }}
       options: --user root -v ${{ github.workspace }}/${{ github.run_number }}:/tmp/${{ github.run_number }}
     env:
-      OPAM_DEPS: ao-windows,lastfm-windows,camomile-windows,cry-windows,dtools-windows,duppy-windows,ffmpeg-windows,ffmpeg-avutil-windows,mm-windows,pcre-windows,portaudio-windows,samplerate-windows,sedlex-windows,ssl-windows,srt-windows,winsvc-windows,mem_usage-windows
+      OPAM_DEPS: ao-windows,lastfm-windows,camomile-windows,cry-windows,dtools-windows,duppy-windows,ffmpeg-windows,ffmpeg-avutil-windows,mm-windows,re-windows,portaudio-windows,samplerate-windows,sedlex-windows,ssl-windows,srt-windows,winsvc-windows,mem_usage-windows
       IS_SNAPSHOT: ${{ needs.build_details.outputs.is_snapshot == 'true' }}
     steps:
       - name: Get number of CPU cores

diff --git a/doc/gen_dune.ml b/doc/gen_dune.ml
@@ -1,5 +1,3 @@
-module Pcre = Re.Pcre
-
 let generated_md =
   [
     ("protocols.md", "--list-protocols-md", None);

diff --git a/doc/subst_md.ml b/doc/subst_md.ml
@@ -1,5 +1,3 @@
-module Pcre = Re.Pcre
-
 let variables = [("LIQUIDSOAP_VERSION", Liquidsoap_lang.Build_config.version)]
 
 let () =

diff --git a/dune-project b/dune-project
@@ -124,7 +124,7 @@
     (inotify (< 1.0))
     (ladspa (< 0.2.0))
     (lame (< 0.3.7))
-    (lastfm (< 0.3.0))
+    (lastfm (< 0.3.4))
     (lo (< 0.2.0))
     (mad (< 0.5.0))
     (magic (< 0.6))

diff --git a/liquidsoap-core.opam b/liquidsoap-core.opam
@@ -92,7 +92,7 @@ conflicts: [
   "inotify" {< "1.0"}
   "ladspa" {< "0.2.0"}
   "lame" {< "0.3.7"}
-  "lastfm" {< "0.3.0"}
+  "lastfm" {< "0.3.4"}
   "lo" {< "0.2.0"}
   "mad" {< "0.5.0"}
   "magic" {< "0.6"}

diff --git a/src/core/builtins/builtins_files.ml b/src/core/builtins/builtins_files.ml
@@ -1,5 +1,3 @@
-module Pcre = Re.Pcre
-
 module Filename = struct
   include Filename
 

diff --git a/src/core/builtins/builtins_server.ml b/src/core/builtins/builtins_server.ml
@@ -20,8 +20,6 @@
 
   *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let _ =
   Lang.add_builtin ~base:Modules.server "register" ~category:`Interaction
     ~descr:

diff --git a/src/core/builtins/builtins_sqlite.ml b/src/core/builtins/builtins_sqlite.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let error fmt =
   Printf.ksprintf
     (fun message -> Runtime_error.raise ~pos:[] ~message "sqlite")

diff --git a/src/core/builtins/builtins_sys.ml b/src/core/builtins/builtins_sys.ml
@@ -21,7 +21,6 @@
  *****************************************************************************)
 
 open Extralib
-module Pcre = Re.Pcre
 
 let configure = Modules.configure
 

diff --git a/src/core/encoder/formats/ffmpeg_format.ml b/src/core/encoder/formats/ffmpeg_format.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 type opt_val =
   [ `String of string | `Int of int | `Int64 of int64 | `Float of float ]
 

diff --git a/src/core/encoder/lang/lang_ffmpeg.ml b/src/core/encoder/lang/lang_ffmpeg.ml
@@ -22,7 +22,6 @@
 
 open Value
 open Ground
-module Pcre = Re.Pcre
 
 type decode_type = [ `Raw | `Internal ]
 type content_type = [ `Audio | `Video ]

diff --git a/src/core/harbor/harbor.ml b/src/core/harbor/harbor.ml
@@ -21,7 +21,6 @@
   *****************************************************************************)
 
 open Harbor_base
-module Pcre = Re.Pcre
 module Monad = Duppy.Monad
 module Type = Liquidsoap_lang.Type
 module Http_base = Http

diff --git a/src/core/io/ffmpeg_io.ml b/src/core/io/ffmpeg_io.ml
@@ -22,8 +22,6 @@
 
 exception Not_connected
 
-module Pcre = Re.Pcre
-
 module Metadata = struct
   include Map.Make (struct
     type t = string

diff --git a/src/core/io/srt_io.ml b/src/core/io/srt_io.ml
@@ -22,8 +22,6 @@
 
 (** SRT input *)
 
-module Pcre = Re.Pcre
-
 exception Done
 exception Not_connected
 

diff --git a/src/core/operators/chord.ml b/src/core/operators/chord.ml
@@ -22,7 +22,6 @@
 
 open Mm
 open Source
-module Pcre = Re.Pcre
 
 let chan = 0
 

diff --git a/src/core/operators/frei0r_op.ml b/src/core/operators/frei0r_op.ml
@@ -23,7 +23,6 @@
 open Mm
 open Source
 open Extralib
-module Pcre = Re.Pcre
 
 let video_frei0r = Lang.add_module ~base:Modules.video "frei0r"
 

diff --git a/src/core/operators/ladspa_op.ml b/src/core/operators/ladspa_op.ml
@@ -23,7 +23,6 @@
 open Mm
 open Source
 open Ladspa
-module Pcre = Re.Pcre
 
 module String = struct
   include String

diff --git a/src/core/outputs/pipe_output.ml b/src/core/outputs/pipe_output.ml
@@ -22,8 +22,6 @@
 
 (** base class *)
 
-module Pcre = Re.Pcre
-
 let output = Modules.output
 
 let encoder_factory ?format format_val =

diff --git a/src/core/playlists/playlist_basic.ml b/src/core/playlists/playlist_basic.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let log = Log.make ["playlist"; "basic"]
 let split_lines buf = Pcre.split ~rex:(Pcre.regexp "[\r\n]+") buf
 

diff --git a/src/core/request.ml b/src/core/request.ml
@@ -23,8 +23,6 @@
 (** Plug for resolving, that is obtaining a file from an URI. [src/protocols]
     plugins provide ways to resolve URIs: fetch, generate, ... *)
 
-module Pcre = Re.Pcre
-
 let conf =
   Dtools.Conf.void ~p:(Configure.conf#plug "request") "requests configuration"
 

diff --git a/src/core/source.ml b/src/core/source.ml
@@ -21,7 +21,6 @@
  *****************************************************************************)
 
 open Mm
-module Pcre = Re.Pcre
 
 exception Unavailable
 

diff --git a/src/core/sources/harbor_input.ml b/src/core/sources/harbor_input.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let address_resolver s =
   let s = Harbor.file_descr_of_socket s in
   Utils.name_of_sockaddr ~rev_dns:Harbor_base.conf_revdns#get

diff --git a/src/core/stream/ffmpeg_raw_content.ml b/src/core/stream/ffmpeg_raw_content.ml
@@ -21,7 +21,6 @@
  *****************************************************************************)
 
 open Avutil
-module Pcre = Re.Pcre
 
 type 'a frame = {
   stream_idx : Int64.t;

diff --git a/src/core/synth/dssi_op.ml b/src/core/synth/dssi_op.ml
@@ -23,7 +23,6 @@
 open Mm
 open Source
 open Dssi
-module Pcre = Re.Pcre
 
 let log = Log.make ["DSSI synthesizer"]
 

diff --git a/src/core/tools/http.ml b/src/core/tools/http.ml
@@ -1,5 +1,3 @@
-module Pcre = Re.Pcre
-
 type uri = {
   protocol : string;
   host : string;

diff --git a/src/core/tools/liqcurl.ml b/src/core/tools/liqcurl.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let () = Curl.global_init Curl.CURLINIT_GLOBALALL
 
 let string_of_curl_code = function

diff --git a/src/core/tools/sandbox.ml b/src/core/tools/sandbox.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let log = Log.make ["sandbox"]
 
 let conf_sandbox =

diff --git a/src/core/tools/server.ml b/src/core/tools/server.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let ( let* ) = Duppy.Monad.bind
 
 exception Bind_error of string

diff --git a/src/core/tools/tutils.ml b/src/core/tools/tutils.ml
@@ -20,8 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
-
 let conf_scheduler =
   Dtools.Conf.void
     ~p:(Configure.conf#plug "scheduler")

diff --git a/src/core/tools/utils.ml b/src/core/tools/utils.ml
@@ -20,7 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
 include Liquidsoap_lang.Utils
 
 let select = if Sys.win32 then Unix.select else Duppy.poll

diff --git a/src/runtime/dune b/src/runtime/dune
@@ -4,6 +4,7 @@
   (pps ppx_string))
  (libraries
   liquidsoap_core
+  liquidsoap_stdlib
   liquidsoap_optionals
   liquidsoap_builtins
   (select

diff --git a/src/runtime/main.ml b/src/runtime/main.ml
@@ -20,7 +20,6 @@
 
  *****************************************************************************)
 
-module Pcre = Re.Pcre
 module Runtime = Liquidsoap_lang.Runtime
 module Doc = Liquidsoap_lang.Doc
 module Environment = Liquidsoap_lang.Environment

diff --git a/src/stdlib/pcre.ml b/src/stdlib/pcre.ml
@@ -0,0 +1 @@
+include Re.Pcre
diff --git a/src/stdlib/pcre.mli b/src/stdlib/pcre.mli
@@ -0,0 +1 @@
+include module type of Re.Pcre
diff --git a/tests/check_output.ml b/tests/check_output.ml
@@ -26,7 +26,7 @@ let () =
   let stdout = Unix.open_process_in process in
   let output = read_all stdout in
   ignore (Unix.close_process_in stdout);
-  if not (Pcre.pmatch ~pat:expected output) then (
+  if not (Pcre.pmatch ~rex:(Pcre.regexp expected) output) then (
     Printf.eprintf
       {|Error running command: %s %s
 - Expected output:

diff --git a/tests/dune b/tests/dune
@@ -6,7 +6,7 @@
 (executable
  (name check_output)
  (modules check_output)
- (libraries unix pcre liquidsoap-lang))
+ (libraries unix liquidsoap_stdlib liquidsoap-lang))
 
 (executable
  (name run_test)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,8 +20,6 @@ @@
       *****************************************************************************)
-    module Pcre = Re.Pcre
     let _ =
       Lang.add_builtin ~base:Modules.server "register" ~category:`Interaction
         ~descr:
@@ Expand Down @@