update docs and Dockerfile for Meson builds

doc/binary_c2.lyx

@@ -5059,7 +5059,7 @@ status open
 
 \begin_layout Plain Layout
 
-meson -Daccurate=true
+meson builddir -Daccurate=true
 \end_layout
 
 \end_inset
@@ -5127,7 +5127,7 @@ status open
 
 \begin_layout Plain Layout
 
-meson -Dgeneric=true
+meson builddir -Dgeneric=true
 \end_layout
 
 \end_inset

docker/Dockerfile

-# Dockerfile for binary_c (2.1) and binary_grid2
+# Dockerfile for binary_c (2.1.4) and binary_grid2 (2.1.4)
 # based on Ubuntu 18.04
 
 FROM ubuntu:18.04
@@ -34,6 +34,11 @@ RUN apt-get -y --no-install-recommends install make
 RUN apt-get -y --no-install-recommends install libc6-dev
 RUN apt-get -y --no-install-recommends install sudo
 RUN apt-get -y --no-install-recommends install okular
+RUN apt-get -y --no-install-recommends install python3
+RUN apt-get -y --no-install-recommends install python3-pip
+RUN apt-get -y --no-install-recommends install meson
+RUN apt-get -y --no-install-recommends install ninja-build
+RUN pip3 install meson
 
 ############################################################
 # apt cleanup
@@ -161,9 +166,17 @@ COPY --chown=binary_c ./binary_c_master /home/binary_c/progs/stars/binary_c
 ############################################################
 
 WORKDIR /home/binary_c/progs/stars/binary_c
-RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && wc -c LICENCE |gawk "{print \$1}" > .lread && ./configure generic
-RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ./make
-RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ./make libbinary_c.so || true
+
+###### old configure/make 
+#RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && wc -c LICENCE |gawk "{print \$1}" > .lread && ./configure generic
+#RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ./make
+#RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ./make libbinary_c.so || true
+
+###### new meson/ninja
+RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && wc -c LICENCE |gawk "{print \$1}" > .lread && meson builddir -Dgeneric=true 
+RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && cd builddir && ninja
+RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && cd builddir && ninja libbinary_c.so
+RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && cd builddir && ninja binary_c_symlink
 
 ############################################################
 # install perl modules for binary_grid
@@ -186,7 +199,7 @@ RUN cpanm Sort::Key
 RUN perl ./install_all.pl
 RUN cpanm Proc::ProcessTable
 RUN cpanm Cpanel::JSON::XS
-RUN cpanm -v ./binary_grid-v2.1.3.tar.gz
+RUN cpanm -v ./binary_grid-v2.1.4.tar.gz
 
 ############################################################
 # cleanup: cpanm and build directories