doozer: sort targets, add Fedora 29

diff --git a/.doozer.json b/.doozer.json
index 418898c3a186e13c826c5a48175c4a69e795373e..00f8bd642a825ad40b75f307ffb5af9024a577dc 100644 (file)
--- a/.doozer.json
+++ b/.doozer.json
@@ -108,10 +108,9 @@
         "support/bintray.py publish filelist.txt"
       ]
     },
-    "jessie-i386": {
-      "buildenv": "jessie-i386",
+    "xenial-arm64": {
+      "buildenv": "xenial-arm64",
       "builddeps": [
-        "lsb-release",
         "cmake",
         "git",
         "build-essential",
@@ -124,24 +123,21 @@
         "bzip2",
         "git-core",
         "liburiparser-dev",
-        "libpcre3-dev",
+        "libpcre2-dev",
         "libdvbcsa-dev",
         "python",
         "python-requests",
         "debhelper",
-        "ccache",
-        "sudo",
+        "ccache"
       ],
       "buildcmd": [
-        "sudo wget -O /usr/lib/python2.7/dist-packages/urllib3/contrib/pyopenssl.py https://raw.githubusercontent.com/urllib3/urllib3/master/src/urllib3/contrib/pyopenssl.py",
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
     },
-    "jessie-amd64": {
-      "buildenv": "jessie-amd64",
+    "xenial-armhf": {
+      "buildenv": "xenial-armhf",
       "builddeps": [
-        "lsb-release",
         "cmake",
         "git",
         "build-essential",
@@ -154,24 +150,21 @@
         "bzip2",
         "git-core",
         "liburiparser-dev",
-        "libpcre3-dev",
+        "libpcre2-dev",
         "libdvbcsa-dev",
         "python",
         "python-requests",
         "debhelper",
-        "ccache",
-        "sudo",
+        "ccache"
       ],
       "buildcmd": [
-        "sudo wget -O /usr/lib/python2.7/dist-packages/urllib3/contrib/pyopenssl.py https://raw.githubusercontent.com/urllib3/urllib3/master/src/urllib3/contrib/pyopenssl.py",
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
     },
-    "stretch-i386": {
-      "buildenv": "stretch-i386",
+    "bionic-amd64": {
+      "buildenv": "docker:ubuntu:bionic",
       "builddeps": [
-        "lsb-release",
         "cmake",
         "git",
         "build-essential",
@@ -184,7 +177,7 @@
         "bzip2",
         "git-core",
         "liburiparser-dev",
-        "libpcre3-dev",
+        "libpcre2-dev",
         "libdvbcsa-dev",
         "python",
         "python-requests",
@@ -193,13 +186,12 @@
       ],
       "buildcmd": [
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
-        "support/bintray.py publish filelist.txt"
+        "support/bintray.py publish filelist.txt",
       ]
     },
-    "stretch-amd64": {
-      "buildenv": "stretch-amd64",
+    "bionic-i386": {
+      "buildenv": "docker:i386/ubuntu:bionic",
       "builddeps": [
-        "lsb-release",
         "cmake",
         "git",
         "build-essential",
@@ -212,7 +204,7 @@
         "bzip2",
         "git-core",
         "liburiparser-dev",
-        "libpcre3-dev",
+        "libpcre2-dev",
         "libdvbcsa-dev",
         "python",
         "python-requests",
@@ -221,11 +213,11 @@
       ],
       "buildcmd": [
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
-        "support/bintray.py publish filelist.txt"
+        "support/bintray.py publish filelist.txt",
       ]
     },
-    "xenial-armhf": {
-      "buildenv": "xenial-armhf",
+    "cosmic-amd64": {
+      "buildenv": "docker:ubuntu:cosmic",
       "builddeps": [
         "cmake",
         "git",
@@ -247,13 +239,71 @@
         "ccache"
       ],
       "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
+        "support/bintray.py publish filelist.txt",
+      ]
+    },
+    "cosmic-i386": {
+      "buildenv": "docker:i386/ubuntu:cosmic",
+      "builddeps": [
+        "cmake",
+        "git",
+        "build-essential",
+        "pkg-config",
+        "gettext",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev",
+        "libpcre2-dev",
+        "libdvbcsa-dev",
+        "python",
+        "python-requests",
+        "debhelper",
+        "ccache"
+      ],
+      "buildcmd": [
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
+        "support/bintray.py publish filelist.txt",
+      ]
+    },
+    "jessie-amd64": {
+      "buildenv": "jessie-amd64",
+      "builddeps": [
+        "lsb-release",
+        "cmake",
+        "git",
+        "build-essential",
+        "pkg-config",
+        "gettext",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev",
+        "libpcre3-dev",
+        "libdvbcsa-dev",
+        "python",
+        "python-requests",
+        "debhelper",
+        "ccache",
+        "sudo",
+      ],
+      "buildcmd": [
+        "sudo wget -O /usr/lib/python2.7/dist-packages/urllib3/contrib/pyopenssl.py https://raw.githubusercontent.com/urllib3/urllib3/master/src/urllib3/contrib/pyopenssl.py",
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
     },
-    "raspbian-jessie": {
-      "buildenv": "raspbian-jessie",
+    "jessie-i386": {
+      "buildenv": "jessie-i386",
       "builddeps": [
+        "lsb-release",
         "cmake",
         "git",
         "build-essential",
@@ -275,13 +325,15 @@
         "sudo",
       ],
       "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t raspbianjessie-armhf -j ${PARALLEL} -w ${WORKDIR}",
+        "sudo wget -O /usr/lib/python2.7/dist-packages/urllib3/contrib/pyopenssl.py https://raw.githubusercontent.com/urllib3/urllib3/master/src/urllib3/contrib/pyopenssl.py",
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
     },
-    "raspbian-stretch": {
-      "buildenv": "raspbian-stretch",
+    "stretch-amd64": {
+      "buildenv": "stretch-amd64",
       "builddeps": [
+        "lsb-release",
         "cmake",
         "git",
         "build-essential",
@@ -294,7 +346,7 @@
         "bzip2",
         "git-core",
         "liburiparser-dev",
-        "libpcre2-dev",
+        "libpcre3-dev",
         "libdvbcsa-dev",
         "python",
         "python-requests",
@@ -302,12 +354,68 @@
         "ccache"
       ],
       "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t raspbianstretch-armhf -j ${PARALLEL} -w ${WORKDIR}",
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
     },
-    "xenial-arm64": {
-      "buildenv": "xenial-arm64",
+    "stretch-i386": {
+      "buildenv": "stretch-i386",
+      "builddeps": [
+        "lsb-release",
+        "cmake",
+        "git",
+        "build-essential",
+        "pkg-config",
+        "gettext",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev",
+        "libpcre3-dev",
+        "libdvbcsa-dev",
+        "python",
+        "python-requests",
+        "debhelper",
+        "ccache"
+      ],
+      "buildcmd": [
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
+        "support/bintray.py publish filelist.txt"
+      ]
+    },
+    "raspbian-jessie": {
+      "buildenv": "raspbian-jessie",
+      "builddeps": [
+        "cmake",
+        "git",
+        "build-essential",
+        "pkg-config",
+        "gettext",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev",
+        "libpcre3-dev",
+        "libdvbcsa-dev",
+        "python",
+        "python-requests",
+        "debhelper",
+        "ccache",
+        "sudo",
+      ],
+      "buildcmd": [
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t raspbianjessie-armhf -j ${PARALLEL} -w ${WORKDIR}",
+        "support/bintray.py publish filelist.txt"
+      ]
+    },
+    "raspbian-stretch": {
+      "buildenv": "raspbian-stretch",
       "builddeps": [
         "cmake",
         "git",
@@ -329,7 +437,7 @@
         "ccache"
       ],
       "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
+        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t raspbianstretch-armhf -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
     },
@@ -393,10 +501,10 @@
         "support/bintray.py publish filelist.txt"
       ]
     },
-    "centos7-x86_64": {
-      "buildenv": "docker:centos:7",
+    "fedora29-x86_64": {
+      "buildenv": "docker:fedora:29",
       "builddeps": [
-        ["https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm"],
+        ["https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-29.noarch.rpm"],
         "gcc-c++",
         "which",
         "rpm-build",
@@ -420,116 +528,37 @@
       ],
       "buildcmd": [
         "./configure --disable-dvbscan && make -C rpm build-doozer",
-        "BINTRAY_REPO=centos support/bintray.py publish filelist.txt",
-      ]
-    },
-    "bionic-amd64": {
-      "buildenv": "docker:ubuntu:bionic",
-      "builddeps": [
-        "cmake",
-        "git",
-        "build-essential",
-        "pkg-config",
-        "gettext",
-        "libavahi-client-dev",
-        "libssl-dev",
-        "zlib1g-dev",
-        "wget",
-        "bzip2",
-        "git-core",
-        "liburiparser-dev",
-        "libpcre2-dev",
-        "libdvbcsa-dev",
-        "python",
-        "python-requests",
-        "debhelper",
-        "ccache"
-      ],
-      "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
-        "support/bintray.py publish filelist.txt",
-      ]
-    },
-    "bionic-i386": {
-      "buildenv": "docker:i386/ubuntu:bionic",
-      "builddeps": [
-        "cmake",
-        "git",
-        "build-essential",
-        "pkg-config",
-        "gettext",
-        "libavahi-client-dev",
-        "libssl-dev",
-        "zlib1g-dev",
-        "wget",
-        "bzip2",
-        "git-core",
-        "liburiparser-dev",
-        "libpcre2-dev",
-        "libdvbcsa-dev",
-        "python",
-        "python-requests",
-        "debhelper",
-        "ccache"
-      ],
-      "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
-        "support/bintray.py publish filelist.txt",
+        "support/bintray.py publish filelist.txt"
       ]
     },
-    "cosmic-amd64": {
-      "buildenv": "docker:ubuntu:cosmic",
+    "centos7-x86_64": {
+      "buildenv": "docker:centos:7",
       "builddeps": [
-        "cmake",
+        ["https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm"],
+        "gcc-c++",
+        "which",
+        "rpm-build",
+        "rpmdevtools",
         "git",
-        "build-essential",
-        "pkg-config",
-        "gettext",
-        "libavahi-client-dev",
-        "libssl-dev",
-        "zlib1g-dev",
-        "wget",
-        "bzip2",
-        "git-core",
-        "liburiparser-dev",
-        "libpcre2-dev",
-        "libdvbcsa-dev",
-        "python",
-        "python-requests",
-        "debhelper",
-        "ccache"
-      ],
-      "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
-        "support/bintray.py publish filelist.txt",
-      ]
-    },
-    "cosmic-i386": {
-      "buildenv": "docker:i386/ubuntu:cosmic",
-      "builddeps": [
+        "make",
         "cmake",
-        "git",
-        "build-essential",
-        "pkg-config",
-        "gettext",
-        "libavahi-client-dev",
-        "libssl-dev",
-        "zlib1g-dev",
+        "gettext-devel",
+        "dbus-devel",
+        "avahi-devel",
+        "openssl-devel",
+        "zlib-devel",
+        "libdvbcsa-devel",
         "wget",
         "bzip2",
-        "git-core",
-        "liburiparser-dev",
-        "libpcre2-dev",
-        "libdvbcsa-dev",
+        "uriparser-devel",
+        "pcre2-devel",
         "python",
         "python-requests",
-        "debhelper",
         "ccache"
       ],
       "buildcmd": [
-        "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
-        "support/bintray.py publish filelist.txt",
+        "./configure --disable-dvbscan && make -C rpm build-doozer",
+        "BINTRAY_REPO=centos support/bintray.py publish filelist.txt",
       ]
     },
-  }
 }