Skip to content

Commit

Permalink
Set version and min ocaml version from a VERSION file.
Browse files Browse the repository at this point in the history
  • Loading branch information
toots committed Aug 3, 2019
1 parent 943a761 commit e3a15dc
Show file tree
Hide file tree
Showing 8 changed files with 162 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ src/test/is_url
src/test/timezone
*.conflicts
liquidsoap.config
doc/liquidsoap.1.md
6 changes: 3 additions & 3 deletions RELEASING
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
[] Run tests! We have too few, but we do have some: "make test".
[] Update copyright years in headers and check that all files have license
headers.
[] Check version in configure.ac, README and INSTALL.
[] Check version and contents in the man pages (mainly doc/liquidsoap.1).
[] Update dependencies in INSTALL.
[] Check version in VERSION
[] Check contents in the man pages (mainly doc/liquidsoap.1.md).
[] Update dependencies in doc/content/install.md.in
[] Fill-in CHANGES, with the release date.
[] make clean
[] make tarball
Expand Down
4 changes: 4 additions & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
1.4.0

# Minimum OCaml version:
4.08.0
11 changes: 9 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ dnl $libdir/liquidsoap/$libs_dir_version
# Set git_snapshot to false before releasing
# Do not use $version below before the next line, since we grep
# for the literal version there
AC_INIT([liquidsoap],[1.4.0])
AC_INIT([liquidsoap],
m4_esyscmd([head -n1 VERSION | tr -d '\r\n']),
[[email protected]],
[liquidsoap],
[https://github.com/savonet/liquidsoap])
git_snapshot=true
version="$PACKAGE_VERSION"
min_ocaml_version=4.08.0
min_ocaml_version=m4_esyscmd([tail -n1 VERSION | tr -d '\r\n'])
git_commit=`git rev-parse --short HEAD || true`

if test $git_snapshot != "false"; then
Expand All @@ -26,6 +30,7 @@ else
fi

AC_SUBST(version)
AC_SUBST(min_ocaml_version)
AC_SUBST(libs_dir_version)

AC_PREREQ(2.61)
Expand Down Expand Up @@ -910,8 +915,10 @@ echo

AC_CONFIG_FILES([doc/content/install.md])
AC_CONFIG_FILES([doc/content/build.md])
AC_CONFIG_FILES([doc/liquidsoap.1.md])
AC_CONFIG_FILES([Makefile.defs],[chmod a-w Makefile.defs])
AC_CONFIG_FILES([src/META],[chmod a-w src/META])
AC_CONFIG_FILES([liquidsoap.opam])
AC_OUTPUT
$MAKE finish-configure

Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: md doc upload all-subdirs

SUBDIRS = content
DISTFILES = liquidsoap.1 Makefile template.html snippet.html
DISTFILES = liquidsoap.1.md.in Makefile template.html snippet.html
DISTDIRS = orig
LIQUIDSOAP = ../src/liquidsoap
PANDOC = pandoc --syntax-definition=liquidsoap.xml --highlight=pygments
Expand Down
6 changes: 3 additions & 3 deletions doc/liquidsoap.1.md → doc/liquidsoap.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
title: LIQUIDSOAP
section: 1
date: Jul 24, 2019
header: Liquidsoap 1.4.0
footer: Liquidsoap 1.4.0
header: Liquidsoap @version@
footer: Liquidsoap @version@
...

<!-- .TH LIQUIDSOAP 1 "Jul 1, 2016" "Liquidsoap 1.4.0" -->
<!-- .TH LIQUIDSOAP 1 "Jul 1, 2016" "Liquidsoap @version@" -->

# NAME

Expand Down
2 changes: 1 addition & 1 deletion liquidsoap.opam
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ be able to use any HTTPS feature. You might want to install one of ssl or
osx-secure-transport package." {success & !ssl-enabled & !secure-transport-enabled}
]
depends: [
"ocaml" {>= "4.08"}
"ocaml" {>= "4.08.0"}
"camomile" {>= "1.0.0"}
"dtools" {>= "0.4.1"}
"duppy" {>= "0.8.0"}
Expand Down
140 changes: 140 additions & 0 deletions liquidsoap.opam.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
opam-version: "2.0"
name: "liquidsoap"
version: "@PACKAGE_VERSION@"
maintainer: "[email protected]"
homepage: "https://github.com/savonet/liquidsoap"
authors: "The Savonet Team <[email protected]>"
build: [
["./bootstrap"] {dev}
["./configure" "--prefix" prefix "--sbindir=%{lib}%/liquidsoap/sbin" "--libexecdir=%{lib}%/liquidsoap/libexec" "--sysconfdir=%{lib}%/liquidsoap/etc" "--sharedstatedir=%{lib}%/liquidsoap/com" "--localstatedir=%{lib}%/liquidsoap/var" "--libdir=%{lib}%/liquidsoap/lib" "--includedir=%{lib}%/liquidsoap/include" "--datarootdir=%{lib}%/liquidsoap/share" "--disable-graphics" "--with-user=dummy" "--with-group=dummy"]
[make "clean"] {dev}
[make]
]
install: [
[make "install"]
]
remove: [
["rm" "-rf" "%{lib}%/liquidsoap" "%{prefix}%/bin/liquidsoap"]
]
post-messages: [
"We're sorry that your liquidsoap install failed. Check out our installation
instructions at: https://www.liquidsoap.info/doc-%{version}%/install.html#opam
for more information." {failure}

"✨ Congratulations on installing liquidsoap! ✨" {success}

"We noticed that you did not install any mp3 decoder. This is a feature most
users want. You might need to install the mad or ffmpeg package." {success & !mad-enabled & !ffmpeg-enabled}

"We noticed that you did not install any mp3 encoder. This is a feature most
users want. You might need to install the lame or shine package." {success & !lame-enabled & !shine-enabled}

"We noticed that you did not install the taglib package that provides support
for reading metatadata in audio files. This is a feature most users want." {success & !taglib-enabled}

"We noticed that you did not install the samplerate package. We stronly
recommend this package for audio samplerate conversion." {success & !samperate-enabled}

"We noticed that you did not install the cry package that provides icecast
output. This is a feature most users want." {success & !cry-enabled}

"We noticed that you did not install any ssl support package. Liquidsoap won't
be able to use any HTTPS feature. You might want to install one of ssl or
osx-secure-transport package." {success & !ssl-enabled & !secure-transport-enabled}
]
depends: [
"ocaml" {>= "@min_ocaml_version@"}
"camomile" {>= "1.0.0"}
"dtools" {>= "0.4.1"}
"duppy" {>= "0.8.0"}
"menhir"
"mm" {>= "0.5.0"}
"ocamlfind" {build}
"pcre"
"sedlex" {>= "2.0"}
]
depopts: [
"alsa"
"ao"
"bjack"
"camlimages"
"cry"
"dssi"
"faad"
"fdkaac"
"ffmpeg"
"flac"
"frei0r"
"gavl"
"gd"
"graphics"
"gstreamer"
"inotify"
"ladspa"
"lame"
"lastfm"
"lo"
"mad"
"magic"
"sdl-liquidsoap"
"ogg"
"opus"
"osx-secure-transport"
"portaudio"
"pulseaudio"
"samplerate"
"shine"
"soundtouch"
"speex"
"ssl"
"taglib"
"theora"
"vorbis"
"xmlplaylist"
"yojson"
]
conflicts: [
"alsa" {< "0.2.1"}
"ao" {< "0.2.0"}
"bjack" {< "0.1.3"}
"cry" {< "0.6.0"}
"dssi" {< "0.1.1"}
"faad" {< "0.4.0"}
"fdkaac" {< "0.3.0"}
"ffmpeg" {< "0.2.0"}
"flac" {< "0.1.5"}
"frei0r" {< "0.1.0"}
"gavl" {< "0.1.4"}
"gstreamer" {< "0.3.0"}
"inotify" {< "1.0"}
"ladspa" {< "0.1.4"}
"lame" {< "0.3.2"}
"lastfm" {< "0.3.0"}
"lo" {< "0.1.2"}
"mad" {< "0.1.4"}
"magic" {< "0.6"}
"ogg" {< "0.5.0"}
"opus" {< "0.1.1"}
"portaudio" {< "0.2.0"}
"pulseaudio" {< "0.1.2"}
"samplerate" {< "0.1.1"}
"shine" {< "0.2.0"}
"soundtouch" {< "0.1.7"}
"speex" {< "0.2.1"}
"ssl" {< "0.5.2"}
"taglib" {< "0.3.0"}
"theora" {< "0.3.1"}
"vorbis" {< "0.7.0"}
"xmlplaylist" {< "0.1.3"}
]
bug-reports: "https://github.com/savonet/liquidsoap/issues"
dev-repo: "git+https://github.com/savonet/liquidsoap.git"
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."""
flags: light-uninstall

0 comments on commit e3a15dc

Please sign in to comment.