Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/appimage/README.txt b/appimage/README.txt
index 418c402a1411524807b29a50724291fe2d116e1e..5443d2a9896ba2e2d44146ffd9b184bed591cb01 100644 (file)
--- a/appimage/README.txt
+++ b/appimage/README.txt
@@ -7,8 +7,8 @@ distributed as a single binary file.  Visit https://appimage.org/ to learn more
 AppImage format and how it works.
 
 Again, do NOT try to run this on your production machine.  For that matter, don't try to
-run it on anything other than a dedicated build host.  It will ERASE /usr/local/citadel
-and /usr/local/webcit during the build process.
+run it on anything other than a dedicated build host.  It may ERASE data you intended to
+keep.
 
 If you're an end user you shouldn't have any need to do this at all.  The whole point of
 this is that we can supply ready-to-run binaries that will run on any Linux/Linux system
@@ -39,5 +39,5 @@ You should be running this build on the OLDEST version of Linux/Linux on which y
 binary should be able to run.  The distribution does not matter -- for example, a
 binary built on Debian should run fine on Ubuntu or Red Hat or whatever -- but the C
 library and other very base system libraries are only upward compatible, not downward
-compatible.  For example, at the time of this writing, I am building on Ubuntu 14 and
+compatible.  For example, at the time of this writing, I am building on Ubuntu 16 and
 it's early 2021.

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 6df62a4cec403daae84b9b9321dff5060bdca4b8..87a2111f4cfb6d53d629a1e67ae1be39e3b47dde 100755 (executable)
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -6,6 +6,7 @@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 
 # libcitadel has to be built in a "real" library directory
 pushd ../libcitadel || exit 1
+make distclean 2>/dev/null
 ./bootstrap || exit 1
 ./configure || exit 1
 make || exit 1
@@ -14,6 +15,7 @@ popd
 
 # Build the Citadel server
 pushd ../citadel || exit 1
+make distclean 2>/dev/null
 ./bootstrap || exit 1
 ./configure --prefix=$CITADEL_BUILD_DIR || exit 1
 make || exit 1
@@ -22,6 +24,7 @@ popd
 
 # Build WebCit
 pushd ../webcit || exit 1
+make distclean 2>/dev/null
 ./bootstrap || exit 1
 ./configure --prefix=$WEBCIT_BUILD_DIR || exit 1
 make || exit 1
@@ -57,12 +60,9 @@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 1
 
 cpu=`uname -p`
+basefilename=citadel-`date +%s`
 if [ $cpu == x86_64 ] ; then
-       ARCH=x86_64 appimagetool citadel.AppDir/
-       md5sum Citadel-x86_64.AppImage | awk ' { print $1 } ' >Citadel-x86_64.AppImage.md5
+       ARCH=x86_64 appimagetool citadel.AppDir/ ${basefilename}-x64.appimage
 else
-       ARCH=ARM appimagetool citadel.AppDir/
-       md5sum Citadel-armhf.AppImage | awk ' { print $1 } ' >Citadel-armhf.AppImage.md5
+       ARCH=ARM appimagetool ${basefilename}.AppDir/ ${basefilename}-arm32.appimage
 fi
-
-