Mercurial > hg > easyhg

diff deploy/linux/docker/Dockerfile_deb.in @ 725:48e746f45bde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include the kdiff3 executable
author Chris Cannam
date Mon, 17 Dec 2018 09:25:11 +0000
parents 6fb20633da00
children 720595a8fa10
line wrap: on
line diff
--- a/deploy/linux/docker/Dockerfile_deb.in	Fri Dec 14 17:28:31 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_deb.in	Mon Dec 17 09:25:11 2018 +0000
@@ -39,5 +39,12 @@
 RUN qmake -r
 RUN make
 
+RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3
+WORKDIR easyhg-kdiff3/kdiff3/src-QT4
+RUN qmake -r kdiff3.pro
+RUN make
+RUN cp kdiff3 ../../../easyhg-kdiff3
+
+WORKDIR /easyhg
 RUN deploy/linux/deploy-deb.sh [[RELEASE]] amd64
 RUN tar cvf output-deb.tar *.deb && cp output-deb.tar ..