more updates to meson: new option binary_c_install_legacy to install binary_c...

more updates to meson: new option binary_c_install_legacy to install binary_c and libbinary_c in the src tree (the legacy location)

docker/Dockerfile

@@ -182,9 +182,7 @@ 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
 RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && meson builddir -Dgeneric=true --buildtype release
 WORKDIR /home/binary_c/progs/stars/binary_c/builddir
-RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ninja
-RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ninja libbinary_c.so
-RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ninja binary_c_symlink
+RUN export LD_LIBRARY_PATH=$HOME/lib LIBRARY_PATH=$HOME/lib && ninja binary_c_install_legacy
 
 ############################################################
 # install perl modules for binary_grid
@@ -240,7 +238,7 @@ USER binary_c
 ############################################################
 
 WORKDIR /home/binary_c/progs/stars/binary_c
-RUN make clean || true
+RUN rm -rf builddir
 
 ############################################################
 # Leave in /home/binary_c

docker/build.sh

@@ -19,8 +19,7 @@ GIT_BRANCH=izzard-discs
 
 # TMPDIR is our temporary space : usually mktemp is good enough
 # but you may want to change this location manually
-#TMPDIR=$(mktemp -d -t ci-XXXXXXXXXX)
-TMPDIR=/tmp/dockerbuildtmp
+TMPDIR=$(mktemp -d -t ci-XXXXXXXXXX)
 
 ############################################################
 # get binary_c version string

meson.build

@@ -550,3 +550,19 @@ binary_c_symlink = custom_target('symlink_binary_c',
                                  command: [ 'sh', '-c', '../meson/symlink_binary_c.sh' ],
                                  depends : [ binary_c_executable ],
               )
+
+
+############################################################
+# install both binary_c and libbinary_c.so in their legacy
+# locations
+binary_c_install_legacy = custom_target('binary_c_install_legacy',
+                                        build_by_default: false,
+                                        output: ['binary_c_install_legacy'],
+                                        command: [
+                                                   'cp','--remove-destination','binary_c','../',
+                                                   '&&',
+                                                   'cp','--remove-destination','libbinary_c.so','../src/'
+                                                   ],
+                                        depends : [ binary_c_executable, binary_c_shared_library ],
+                                        )
+