From 1656d237d2f83f30a599dde6baddcb6dec6c1cbf Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Sun, 2 Feb 2025 17:43:23 +0100 Subject: [PATCH] Remove extra packages. --- ...e-windows.opam => liquidsoap-windows.opam} | 2 +- .github/scripts/add-local-opam-packages.sh | 6 +- .github/scripts/build-win32.sh | 2 +- .github/workflows/ci.yml | 2 +- doc/content/build.md | 1 - dune-project | 44 ++---- liquidsoap-core.opam | 129 ------------------ liquidsoap-libs-extra.opam | 32 ----- liquidsoap-libs.opam | 31 ----- liquidsoap.opam | 104 +++++++++++++- src/bin/dune | 2 +- src/libs/dune | 4 +- 12 files changed, 121 insertions(+), 238 deletions(-) rename .github/opam/{liquidsoap-core-windows.opam => liquidsoap-windows.opam} (99%) delete mode 100644 liquidsoap-core.opam delete mode 100644 liquidsoap-libs-extra.opam delete mode 100644 liquidsoap-libs.opam diff --git a/.github/opam/liquidsoap-core-windows.opam b/.github/opam/liquidsoap-windows.opam similarity index 99% rename from .github/opam/liquidsoap-core-windows.opam rename to .github/opam/liquidsoap-windows.opam index 56743f4143..f788553590 100644 --- a/.github/opam/liquidsoap-core-windows.opam +++ b/.github/opam/liquidsoap-windows.opam @@ -137,7 +137,7 @@ build: [ "-x" "windows" "-p" - "liquidsoap-lang,liquidsoap-core" + "liquidsoap-lang,liquidsoap" "@install" "-j" jobs diff --git a/.github/scripts/add-local-opam-packages.sh b/.github/scripts/add-local-opam-packages.sh index 8054ad4fe6..fea5cd0f65 100755 --- a/.github/scripts/add-local-opam-packages.sh +++ b/.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 diff --git a/.github/scripts/build-win32.sh b/.github/scripts/build-win32.sh index 79f274a27e..cbdcc491b4 100755 --- a/.github/scripts/build-win32.sh +++ b/.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" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02a095e553..35fb59eb42 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/doc/content/build.md b/doc/content/build.md index 6e108a04c4..9b956a9f4f 100644 --- a/doc/content/build.md +++ b/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 ``` diff --git a/dune-project b/dune-project index fc77f1224d..21276caaf8 100644 --- a/dune-project +++ b/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) diff --git a/liquidsoap-core.opam b/liquidsoap-core.opam deleted file mode 100644 index ba3a9b8091..0000000000 --- a/liquidsoap-core.opam +++ /dev/null @@ -1,129 +0,0 @@ -# This file is generated by dune, edit dune-project instead -opam-version: "2.0" -version: "2.3.1" -synopsis: "Liquidsoap core library and binary" -maintainer: ["The Savonet Team "] -authors: ["The Savonet Team "] -license: "GPL-2.0-or-later" -homepage: "https://github.com/savonet/liquidsoap" -bug-reports: "https://github.com/savonet/liquidsoap/issues" -depends: [ - "dune" {>= "3.6"} - "ocaml" {>= "4.14"} - "dtools" {>= "0.4.5"} - "duppy" {>= "0.9.4"} - "mm" {>= "0.8.6"} - "re" {>= "1.11.0"} - "ocurl" {>= "0.9.2"} - "cry" {>= "1.0.3"} - "camomile" {>= "2.0.0"} - "uri" - "fileutils" - "menhirLib" - "mem_usage" {>= "0.1.1"} - "metadata" {>= "0.3.0"} - "magic-mime" - "dune-build-info" - "liquidsoap-lang" {= version} - "ppx_string" {build} - "odoc" {with-doc} -] -depopts: [ - "alsa" - "ao" - "bjack" - "camlimages" - "ctypes-foreign" - "dssi" - "faad" - "fdkaac" - "ffmpeg" - "flac" - "frei0r" - "gd" - "graphics" - "imagelib" - "inotify" - "irc-client-unix" - "jemalloc" - "ladspa" - "lame" - "lilv" - "lo" - "mad" - "memtrace" - "ogg" - "opus" - "osc-unix" - "portaudio" - "posix-time2" - "posix-socket" - "pulseaudio" - "prometheus-liquidsoap" - "samplerate" - "shine" - "soundtouch" - "speex" - "sqlite3" - "srt" - "ssl" - "tls-liquidsoap" - "theora" - "sdl-liquidsoap" - "vorbis" - "yaml" - "xmlplaylist" -] -conflicts: [ - "alsa" {< "0.3.0"} - "ao" {< "0.2.0"} - "bjack" {< "0.1.3"} - "camomile" {< "1.0.0"} - "dssi" {< "0.1.3"} - "faad" {< "0.5.0"} - "fdkaac" {< "0.3.1"} - "ffmpeg" {< "1.2.0"} - "ffmpeg-avutil" {< "1.2.0"} - "flac" {< "1.0.0"} - "frei0r" {< "0.1.0"} - "inotify" {< "1.0"} - "ladspa" {< "0.2.0"} - "lame" {< "0.3.7"} - "lo" {< "0.2.0"} - "mad" {< "0.5.0"} - "magic" {< "0.6"} - "ogg" {< "1.0.0"} - "opus" {< "0.2.0"} - "portaudio" {< "0.2.0"} - "posix-time2" {< "2.0.2"} - "posix-socket" {< "2.1.0"} - "pulseaudio" {< "0.1.4"} - "samplerate" {< "0.1.5"} - "shine" {< "0.2.0"} - "soundtouch" {< "0.1.9"} - "speex" {< "1.0.0"} - "srt" {< "0.3.2"} - "ssl" {< "0.7.0"} - "tls" {< "1.0.2"} - "sdl-liquidsoap" {< "2"} - "theora" {< "1.0.0"} - "vorbis" {< "1.0.0"} - "xmlplaylist" {< "0.1.3"} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "--promote-install-files=false" - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] - ["dune" "install" "-p" name "--create-install-files" name] -] -dev-repo: "git+https://github.com/savonet/liquidsoap.git" diff --git a/liquidsoap-libs-extra.opam b/liquidsoap-libs-extra.opam deleted file mode 100644 index 4abde234f6..0000000000 --- a/liquidsoap-libs-extra.opam +++ /dev/null @@ -1,32 +0,0 @@ -# This file is generated by dune, edit dune-project instead -opam-version: "2.0" -version: "2.3.1" -synopsis: "Liquidosap standard library -- extra functionalities" -maintainer: ["The Savonet Team "] -authors: ["The Savonet Team "] -license: "GPL-2.0-or-later" -homepage: "https://github.com/savonet/liquidsoap" -bug-reports: "https://github.com/savonet/liquidsoap/issues" -depends: [ - "dune" {>= "3.6"} - "liquidsoap-libs" {= version} - "liquidsoap-lang" {build} - "odoc" {with-doc} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "--promote-install-files=false" - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] - ["dune" "install" "-p" name "--create-install-files" name] -] -dev-repo: "git+https://github.com/savonet/liquidsoap.git" diff --git a/liquidsoap-libs.opam b/liquidsoap-libs.opam deleted file mode 100644 index 0ab9b54126..0000000000 --- a/liquidsoap-libs.opam +++ /dev/null @@ -1,31 +0,0 @@ -# This file is generated by dune, edit dune-project instead -opam-version: "2.0" -version: "2.3.1" -synopsis: "Liquidosap standard library" -maintainer: ["The Savonet Team "] -authors: ["The Savonet Team "] -license: "GPL-2.0-or-later" -homepage: "https://github.com/savonet/liquidsoap" -bug-reports: "https://github.com/savonet/liquidsoap/issues" -depends: [ - "dune" {>= "3.6"} - "liquidsoap-lang" {build} - "odoc" {with-doc} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "--promote-install-files=false" - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] - ["dune" "install" "-p" name "--create-install-files" name] -] -dev-repo: "git+https://github.com/savonet/liquidsoap.git" diff --git a/liquidsoap.opam b/liquidsoap.opam index f29c300ca2..795a9a7d34 100644 --- a/liquidsoap.opam +++ b/liquidsoap.opam @@ -17,12 +17,108 @@ homepage: "https://github.com/savonet/liquidsoap" bug-reports: "https://github.com/savonet/liquidsoap/issues" depends: [ "dune" {>= "3.6"} - "liquidsoap-core" {= version} - "liquidsoap-libs" {>= "2.3.1" & < "2.3.2"} - "liquidsoap-libs-extra" {>= "2.3.1" & < "2.3.2"} + "ocaml" {>= "4.14"} + "dtools" {>= "0.4.5"} + "duppy" {>= "0.9.4"} + "mm" {>= "0.8.6"} + "re" {>= "1.11.0"} + "ocurl" {>= "0.9.2"} + "cry" {>= "1.0.3"} + "camomile" {>= "2.0.0"} + "uri" + "fileutils" + "menhirLib" + "mem_usage" {>= "0.1.1"} + "metadata" {>= "0.3.0"} + "magic-mime" + "dune-build-info" + "liquidsoap-lang" {= version} + "ppx_string" {build} + "odoc" {with-doc} +] +depopts: [ + "alsa" + "ao" + "bjack" + "camlimages" + "ctypes-foreign" + "dssi" + "faad" + "fdkaac" + "ffmpeg" + "flac" + "frei0r" + "gd" + "graphics" + "imagelib" + "inotify" + "irc-client-unix" + "jemalloc" + "ladspa" + "lame" + "lilv" + "lo" + "mad" + "memtrace" + "ogg" + "opus" + "osc-unix" + "portaudio" + "posix-time2" + "posix-socket" + "pulseaudio" + "prometheus-liquidsoap" + "samplerate" + "shine" + "soundtouch" + "speex" + "sqlite3" + "srt" + "ssl" + "tls-liquidsoap" + "theora" + "sdl-liquidsoap" + "vorbis" + "yaml" + "xmlplaylist" +] +conflicts: [ + "alsa" {< "0.3.0"} + "ao" {< "0.2.0"} + "bjack" {< "0.1.3"} + "camomile" {< "1.0.0"} + "dssi" {< "0.1.3"} + "faad" {< "0.5.0"} + "fdkaac" {< "0.3.1"} + "ffmpeg" {< "1.2.0"} + "ffmpeg-avutil" {< "1.2.0"} + "flac" {< "1.0.0"} + "frei0r" {< "0.1.0"} + "inotify" {< "1.0"} + "ladspa" {< "0.2.0"} + "lame" {< "0.3.7"} + "lo" {< "0.2.0"} + "mad" {< "0.5.0"} + "magic" {< "0.6"} + "ogg" {< "1.0.0"} + "opus" {< "0.2.0"} + "portaudio" {< "0.2.0"} + "posix-time2" {< "2.0.2"} + "posix-socket" {< "2.1.0"} + "pulseaudio" {< "0.1.4"} + "samplerate" {< "0.1.5"} + "shine" {< "0.2.0"} + "soundtouch" {< "0.1.9"} + "speex" {< "1.0.0"} + "srt" {< "0.3.2"} + "ssl" {< "0.7.0"} + "tls" {< "1.0.2"} + "sdl-liquidsoap" {< "2"} + "theora" {< "1.0.0"} + "vorbis" {< "1.0.0"} + "xmlplaylist" {< "0.1.3"} "pandoc" {with-doc} "pandoc-include" {with-doc} - "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} diff --git a/src/bin/dune b/src/bin/dune index 667bbe82c1..a3b15b38b9 100644 --- a/src/bin/dune +++ b/src/bin/dune @@ -1,7 +1,7 @@ (executable (name liquidsoap) (public_name liquidsoap) - (package liquidsoap-core) + (package liquidsoap) (link_flags -cclib %{env:LIQ_LDFLAGS=}) (libraries liquidsoap_runtime) (modules liquidsoap)) diff --git a/src/libs/dune b/src/libs/dune index a599104f57..b0818d7131 100644 --- a/src/libs/dune +++ b/src/libs/dune @@ -2,7 +2,7 @@ (section (site (liquidsoap-lang libs))) - (package liquidsoap-libs) + (package liquidsoap) (files (glob_files *.liq))) @@ -10,6 +10,6 @@ (section (site (liquidsoap-lang libs))) - (package liquidsoap-libs-extra) + (package liquidsoap) (files (glob_files extra/*.liq)))