X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fbuild_appimage.sh;h=87a2111f4cfb6d53d629a1e67ae1be39e3b47dde;hb=d728ef40502b1a9665c3bda11a437e8f3638adf7;hp=4391afc8d4b262e9e3c3f2b886c9d870b190ce73;hpb=adf43282ea4be8bf6ca4e7b71ce342fffc5f171d;p=citadel.git

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 4391afc8d..87a2111f4 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 
-rm -fr /usr/local/citadel /usr/local/webcit
+export CITADEL_BUILD_DIR=/tmp/citadel-build-$$
+export WEBCIT_BUILD_DIR=/tmp/webcit-build-$$
+rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 
-# Build libcitadel
+# 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
@@ -12,30 +15,29 @@ popd
 
 # Build the Citadel server
 pushd ../citadel || exit 1
+make distclean 2>/dev/null
 ./bootstrap || exit 1
-./configure --prefix=/usr/local/citadel || 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=/usr/local/webcit || exit 1
+./configure --prefix=$WEBCIT_BUILD_DIR || exit 1
 make || exit 1
 make install || exit 1
 popd
 
-# Build the appimage supervisor
-cc ctdlvisor.c -o ctdlvisor || exit 1
-
-# Clear out our build directories
+# 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
 
 # Copy over all the libraries we used
-for bin in /usr/local/citadel/citserver /usr/local/webcit/webcit
+for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit
 do
 	for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
 	do
@@ -44,13 +46,23 @@ do
 done
 ldconfig -v citadel.AppDir/usr/lib
 
-# Copy over our application trees
-for x in citadel webcit
-do
-	mkdir -p citadel.AppDir/usr/local/$x
-	rsync -va /usr/local/$x/ ./citadel.AppDir/usr/local/$x/
-done
+# 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
 
-cp ctdlvisor citadel.AppDir/usr/bin/
-ARCH=x86_64 appimagetool citadel.AppDir/
-rm -fr /usr/local/citadel /usr/local/webcit
+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 ${basefilename}.AppDir/ ${basefilename}-arm32.appimage
+fi