48e746f45bde — Chris Cannam 2 years ago
Include the kdiff3 executable
M deploy/linux/deploy-appimage.sh +14 -1
@@ 3,6 3,11 @@ 
 set -eu
 
 program=EasyMercurial
+kdiff=easyhg-kdiff3
+merge=easyhg-merge.sh
+extdiff=easyhg-extdiff.sh
+
+programs="$program $kdiff $merge $extdiff"
 
 get_id() {
     if [ -d .hg ]; then

          
@@ 22,6 27,13 @@ if [ ! -x ./appimagetool-x86_64.AppImage
     exit 2
 fi
 
+for p in $programs; do
+    if [ ! -x "$p" ]; then
+        echo "Failed to find executable ./$p, please build and check"
+        exit 2
+    fi
+done
+
 targetdir="${program}.AppDir"
 
 echo "Target dir is $targetdir"

          
@@ 36,7 48,7 @@ mkdir "$targetdir"
 mkdir -p "$targetdir"/usr/bin
 mkdir -p "$targetdir"/usr/lib
 
-cp "$program" "$targetdir"/usr/bin/
+cp $programs "$targetdir"/usr/bin/
 
 add_dependencies() {
 

          
@@ 71,6 83,7 @@ add_dependencies() {
 }
 
 add_dependencies "$program"
+add_dependencies "$kdiff"
 
 qtplugins="gif icns ico jpeg tga tiff wbmp webp cocoa minimal offscreen xcb"
 qtlibdirs="/usr/lib/x86_64-linux-gnu/qt5 /usr/lib/x86_64-linux-gnu/qt /usr/lib/qt5 /usr/lib/qt"

          
M deploy/linux/deploy-deb.sh +14 -1
@@ 23,6 23,12 @@ fi
 set -eu
 
 program=EasyMercurial
+kdiff=easyhg-kdiff3
+merge=easyhg-merge.sh
+extdiff=easyhg-extdiff.sh
+
+programs="$program $kdiff $merge $extdiff"
+
 package=easymercurial
 depdir=deploy/linux
 

          
@@ 35,6 41,13 @@ if [ -d "$targetdir" ]; then
     exit
 fi
 
+for p in $programs; do
+    if [ ! -x "$p" ]; then
+        echo "Failed to find executable ./$p, please build and check"
+        exit 2
+    fi
+done
+
 mkdir "$targetdir"
 
 mkdir "$targetdir/DEBIAN"

          
@@ 43,7 56,7 @@ cp "$depdir"/control "$targetdir"/DEBIAN
 
 mkdir -p "$targetdir"/usr/bin "$targetdir"/usr/share/pixmaps "$targetdir"/usr/share/applications "$targetdir"/usr/share/doc/"$package"
 
-cp "$program" "$targetdir"/usr/bin/
+cp $programs "$targetdir"/usr/bin/
 
 cp images/icon/scalable/easyhg-icon.svg "$targetdir"/usr/share/pixmaps/
 cp images/icon/128/easyhg-icon.png "$targetdir"/usr/share/pixmaps/

          
M deploy/linux/docker/Dockerfile_appimage.in +7 -0
@@ 47,5 47,12 @@ ENV PATH /opt/qt510/bin:$PATH
 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-appimage.sh
 RUN tar cvf output-appimage.tar *.AppImage && cp output-appimage.tar ..

          
M deploy/linux/docker/Dockerfile_deb.in +7 -0
@@ 39,5 39,12 @@ WORKDIR /easyhg
 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 ..