cleanup build process and document package deps

Author: Mike Jerris

.drone.yml

@@ -10,11 +10,8 @@ steps:
       image: signalwire/freeswitch-public-base
       pull: true
       commands:
-      - apt-get update && apt-get install -y clang-tools-7 libjansson-dev libcurl-ocaml-dev libjwt-dev libks
-      - autoreconf -i
-      - automake --add-missing
-      - libtoolize
-      - autoreconf
+      - apt-get update && apt-get install -y clang-tools-7 libcurl4-openssl-dev libjwt-dev libks
+      - ./bootstrap.sh
       - ./configure --enable-address-sanitizer
       - mkdir -p scan-build
       - echo '#!/bin/bash\nscan-build-7 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
@@ -47,6 +44,6 @@ trigger:
   - push
 ---
 kind: signature
-hmac: 819345d4900a92433c08880af7dd12f668f502a6a8f84a0596130741c90b5d8d
+hmac: 700f49ce871925296c00888ff8842aba8f5d1660ccea1784b07a20ab8619ec22
 
 ...

Dockerfile

@@ -1,5 +1,5 @@
 FROM signalwire/freeswitch-public-base
-RUN apt-get update && apt-get install -y clang-tools-7 libjansson-dev libcurl-ocaml-dev libjwt-dev libks
+RUN apt-get update && apt-get install -y clang-tools-7 automake autoconf libtool libcurl4-openssl-dev libjwt-dev libks
 COPY . /usr/local/src/libstirshaken
 WORKDIR /usr/local/src/libstirshaken
 

README.txt

@@ -13,7 +13,6 @@ FOLDERS
 ======
 / - main folder
 	README.txt	- this file
-	.do_install.sh	- installation script
 	src/		- library sources
 	include/	- library headers
 	util/		- helper programs (stirshaken tool for running multiple commands, see below)
@@ -23,33 +22,32 @@ FOLDERS
 COMPILATION
 ============
 
-NOTE: the latest libjwt is required.
-  debian packages: https://files.freeswitch.org/repo/deb/debian-unstable/pool/main/libj/libjwt/
-  RPM: https://files.freeswitch.org/repo/yum/centos-dev/7/x86_64/libjwt-devel-1.12.0-0.sdl7.x86_64.rpm
-  source: https://github.com/benmcollins/libjwt
-
-If you just want to get on with it, then please run
-./do_install.sh
-This will install dependencies as well as tools needed to make build, and will build and install it.
-If there are problems with dependencies, then install them manually and rerun ./do_install.sh.
-This will build all Shaken targets if packages are installed.
-
 Dependencies:
 
-LIBS += -lcurl -lcrypto -lssl -ljwt -pthread -lks
 CURL: https://github.com/curl/curl
-OpenSSL: https://github.com/openssl/openssl
-LibJWT: https://github.com/benmcollins/libjwt
+OpenSSL: https://github.com/openssl/openssl version 1.1 or later
+LibJWT: https://github.com/benmcollins/libjwt version 1.12 or later
 LibKS: https://github.com/signalwire/libks
 
+packages for latest libks and libjwt which are required are available in the freeswitch package repositories:
+
+Debian 10:
+       apt-get update && apt-get install -y gnupg2 wget lsb-release
+       wget -O - https://files.freeswitch.org/repo/deb/debian-release/fsstretch-archive-keyring.asc | apt-key add -
+       echo "deb http://files.freeswitch.org/repo/deb/debian-release/ `lsb_release -sc` main" > /etc/apt/sources.list.d/freeswitch.list
+       echo "deb-src http://files.freeswitch.org/repo/deb/debian-release/ `lsb_release -sc` main" >> /etc/apt/sources.list.d/freeswitch.list
+       apt-get update && apt-get install -y automake autoconf libtool libcurl4-openssl-dev libjwt-dev libks
+
+If you just want to get on with it, then please run
+./do_install.sh
+This will install dependencies as well as tools needed to make build, and will build and install it on debian buster
+If there are problems with dependencies, then install them manually and rerun ./do_install.sh.
+This will build all Shaken targets if packages are installed.
 
-Please run ./install.sh or perform these manual steps:
+Please run ./do_install.sh (debian specific) or perform these manual steps:
 
-autoreconf -i
-automake --add-missing
-libtoolize
-autoreconf
-configure
+./bootstrap.sh
+./configure
 make
 sudo make install
 

bootstrap.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+autoreconf -i

do_install.sh

@@ -1,14 +1,11 @@
-tools="automake autoconf libtool"
-libs="libjansson-dev libcurl-ocaml-dev libjwt-dev libks"
+sudo apt-get update && sudo apt install --yes gnupg2 wget lsb-release
+wget -O - https://files.freeswitch.org/repo/deb/debian-release/fsstretch-archive-keyring.asc | apt-key add -
+echo "deb http://files.freeswitch.org/repo/deb/debian-release/ `lsb_release -sc` main" > /etc/apt/sources.list.d/freeswitch-stir-deps.list
+echo "deb-src http://files.freeswitch.org/repo/deb/debian-release/ `lsb_release -sc` main" >> /etc/apt/sources.list.d/freeswitch-stir-deps.list
+sudo apt-get update && sudo apt install --yes automake autoconf libtool libcurl4-openssl-dev libjwt-dev libks
 
-sudo apt install --yes $tools
-sudo apt install --yes $libs
-
-autoreconf -i
-automake --add-missing
-libtoolize
-autoreconf
+./bootstrap.sh
 ./configure
-make && sudo make install
-make stirshaken
+make
 make check
+sudo make install