X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fbuild_appimage.sh;h=5a971c7c336bcdfd9e29c8886176253f17d5ddf2;hb=a112ae0472a232be5484c7a9aafc5a880a361c34;hp=1fcc7cea7cb4d6533ed324e04e6d7c1099ee42f5;hpb=168a9ec0fb1b47c3602804b8af26f28b207a953d;p=citadel.git

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 1fcc7cea7..5a971c7c3 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -1,18 +1,44 @@
 #!/bin/bash
 
-CTDLROOT=../citadel
+export CITADEL_BUILD_DIR=/tmp/citadel-build-$$
+export WEBCIT_BUILD_DIR=/tmp/webcit-build-$$
+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
+make install || exit 1
+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
+make install || exit 1
+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
+make install || exit 1
+popd
+
+# Clear out any old versions in the AppDir
 rm -frv citadel.AppDir/usr
 mkdir -p citadel.AppDir/usr/bin
 mkdir -p citadel.AppDir/usr/lib
 
-pushd citadel.AppDir
-cc ctdlvisor.c -o ctdlvisor || exit 1
-popd
-
-for bin in $CTDLROOT/citadel/citserver $CTDLROOT/webcit/webcit
+# Copy over all the libraries we used
+for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit
 do
-	cp -v $bin citadel.AppDir/usr/bin/
 	for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
 	do
 		cp -v -L $x citadel.AppDir/usr/lib/
@@ -20,7 +46,25 @@ do
 done
 ldconfig -v citadel.AppDir/usr/lib
 
-ARCH=x86_64 appimagetool citadel.AppDir/
+# Install the Citadel Server application tree
+mkdir -p citadel.AppDir/usr/local/citadel
+rsync -va $CITADEL_BUILD_DIR/ ./citadel.AppDir/usr/local/citadel/
+
+# Install the WebCit application tree
+mkdir -p citadel.AppDir/usr/local/webcit
+rsync -va $WEBCIT_BUILD_DIR/ ./citadel.AppDir/usr/local/webcit/
+
+# Remove the build directories
+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/ ${basefilename}-x64.appimage
+else
+	ARCH=ARM appimagetool citadel.AppDir/ ${basefilename}-arm32.appimage
+fi
+
 
-# Hint: do this on your build server first!
-# apt-get install make build-essential autoconf zlib1g-dev libldap2-dev libssl-dev gettext libical-dev libexpat1-dev libcurl4-openssl-dev