Remove extra packages.

.github/opam/liquidsoap-core-windows.opam → .github/opam/liquidsoap-windows.opam

@@ -137,7 +137,7 @@ build: [
     "-x"
     "windows"
     "-p"
-    "liquidsoap-lang,liquidsoap-core"
+    "liquidsoap-lang,liquidsoap"
     "@install"
     "-j"
     jobs

.github/scripts/add-local-opam-packages.sh

@@ -10,8 +10,8 @@ eval "$(opam config env)"
 
 cd "${BASE_DIR}"
 
-mkdir -p "./.github/opam/packages/liquidsoap-core-windows/liquidsoap-core-windows.${RELEASE}"
-cp ./.github/opam/liquidsoap-core-windows.opam "./.github/opam/packages/liquidsoap-core-windows/liquidsoap-core-windows.${RELEASE}/opam"
-sed -e "s#@COMMIT_SHORT@#$RELEASE#g" -i "./.github/opam/packages/liquidsoap-core-windows/liquidsoap-core-windows.${RELEASE}/opam"
+mkdir -p "./.github/opam/packages/liquidsoap-windows/liquidsoap-windows.${RELEASE}"
+cp ./.github/opam/liquidsoap-windows.opam "./.github/opam/packages/liquidsoap-windows/liquidsoap-windows.${RELEASE}/opam"
+sed -e "s#@COMMIT_SHORT@#$RELEASE#g" -i "./.github/opam/packages/liquidsoap-windows/liquidsoap-windows.${RELEASE}/opam"
 
 opam remote add liquidsoap-devel ./.github/opam

.github/scripts/build-win32.sh

@@ -59,7 +59,7 @@ opam install -y srt-windows.0.3.3
 echo "::endgroup::"
 
 echo "::group::Install liquidsoap-windows"
-opam install -y liquidsoap-core-windows
+opam install -y liquidsoap-windows
 echo "::endgroup::"
 
 echo "::group::Save build config"

.github/workflows/ci.yml

@@ -87,7 +87,7 @@ jobs:
           opam update
           opam pin -yn .
           opam install -y saturn_lockfree.0.5.0 ppx_hash
-          opam info -f "depopts:" liquidsoap-core | grep -v osx-secure-transport | xargs opam remove -y inotify ffmpeg-avutil cohttp-lwt-unix prometheus-app ${{ needs.build_details.outputs.minimal_exclude_deps }}
+          opam info -f "depopts:" liquidsoap | grep -v osx-secure-transport | xargs opam remove -y inotify ffmpeg-avutil cohttp-lwt-unix prometheus-app ${{ needs.build_details.outputs.minimal_exclude_deps }}
           opam install -y mem_usage
           echo "::endgroup::"
           cd liquidsoap

doc/content/build.md

@@ -69,7 +69,6 @@ Then, ask `opam` to list all the dependencies for `liquidsoap`:
 
 ```shell
 opam info liquidsoap
-opam info liquidsoap-core
 opam info liquidsoap-lang
 ```
 

dune-project

@@ -15,37 +15,7 @@
 
 (package
   (name liquidsoap)
-  (depends
-    (liquidsoap-core (= :version))
-    (liquidsoap-libs (and (>= 2.3.1) (< 2.3.2)))
-    (liquidsoap-libs-extra (and (>= 2.3.1) (< 2.3.2)))
-    (pandoc :with-doc)
-    (pandoc-include :with-doc))
-  (synopsis "Swiss-army knife for multimedia streaming")
-  (description
-"\| Liquidsoap is a powerful and flexible language for describing your
-"\| streams. It offers a rich collection of operators that you can combine
-"\| at will, giving you more power than you need for creating or
-"\| transforming streams. But liquidsoap is still very light and easy to
-"\| use, in the Unix tradition of simple strong components working
-"\| together.
-  ))
-
-(package
-   (name liquidsoap-libs-extra)
    (depends
-      (liquidsoap-libs (= :version))
-      (liquidsoap-lang :build))
-   (synopsis "Liquidosap standard library -- extra functionalities"))
-
-(package
-   (name liquidsoap-libs)
-   (depends (liquidsoap-lang :build))
-   (synopsis "Liquidosap standard library"))
-
-(package
-  (name liquidsoap-core)
-  (depends
     (ocaml (>= 4.14))
     (dtools (>= 0.4.5))
     (duppy (>= 0.9.4))
@@ -142,8 +112,18 @@
     (sdl-liquidsoap (< 2))
     (theora (< 1.0.0))
     (vorbis (< 1.0.0))
-    (xmlplaylist (< 0.1.3)))
-  (synopsis "Liquidsoap core library and binary"))
+    (xmlplaylist (< 0.1.3))
+    (pandoc :with-doc)
+    (pandoc-include :with-doc))
+  (synopsis "Swiss-army knife for multimedia streaming")
+  (description
+"\| Liquidsoap is a powerful and flexible language for describing your
+"\| streams. It offers a rich collection of operators that you can combine
+"\| at will, giving you more power than you need for creating or
+"\| transforming streams. But liquidsoap is still very light and easy to
+"\| use, in the Unix tradition of simple strong components working
+"\| together.
+  ))
 
 (package
   (name liquidsoap-lang)

liquidsoap-js.opam

@@ -35,3 +35,4 @@ build: [
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/savonet/liquidsoap.git"
+x-maintenance-intent: ["(latest)"]

liquidsoap-js.opam.template

@@ -0,0 +1 @@
+x-maintenance-intent: ["(latest)"]

liquidsoap-lang.opam

@@ -37,3 +37,4 @@ build: [
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/savonet/liquidsoap.git"
+x-maintenance-intent: ["(latest)"]

liquidsoap-lang.opam.template

@@ -0,0 +1 @@
+x-maintenance-intent: ["(latest)"]