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

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 4391afc8d..b52ee9a28 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -1,56 +1,80 @@
 #!/bin/bash
 
-rm -fr /usr/local/citadel /usr/local/webcit
+rm -vf citadel-*appimage
 
-# Build libcitadel
+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
-./bootstrap || exit 1
-./configure || exit 1
-make || exit 1
-make install || exit 1
+make distclean 2>/dev/null
+./bootstrap || exit 2
+./configure || exit 3
+make || exit 4
+make install || exit 5
 popd
 
 # Build the Citadel server
-pushd ../citadel || exit 1
-./bootstrap || exit 1
-./configure --prefix=/usr/local/citadel || exit 1
-make || exit 1
-make install || exit 1
+pushd ../citadel || exit 6
+make distclean 2>/dev/null
+./bootstrap || exit 7
+./configure --prefix=$CITADEL_BUILD_DIR || exit 8
+make || exit 9
+make install || exit 10
 popd
 
 # Build WebCit
-pushd ../webcit || exit 1
-./bootstrap || exit 1
-./configure --prefix=/usr/local/webcit || exit 1
-make || exit 1
-make install || exit 1
+pushd ../webcit || exit 11
+make distclean 2>/dev/null
+./bootstrap || exit 12
+./configure --prefix=$WEBCIT_BUILD_DIR || exit 13
+make || exit 14
+make install || exit 15
 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 $CITADEL_BUILD_DIR/ctdlmigrate
 do
-	for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
+	#for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
+	for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' `
 	do
 		cp -v -L $x citadel.AppDir/usr/lib/
 	done
 done
 ldconfig -v citadel.AppDir/usr/lib
 
-# Copy over our application trees
-for x in citadel webcit
+# Copy over some utilities
+for bin in db_dump db_load db_recover
 do
-	mkdir -p citadel.AppDir/usr/local/$x
-	rsync -va /usr/local/$x/ ./citadel.AppDir/usr/local/$x/
+	cp `which $bin` citadel.AppDir/usr/bin/	|| exit 16
 done
 
-cp ctdlvisor citadel.AppDir/usr/bin/
-ARCH=x86_64 appimagetool citadel.AppDir/
-rm -fr /usr/local/citadel /usr/local/webcit
+# Install the Citadel Server application tree
+mkdir -p citadel.AppDir/usr/local/citadel || exit 17
+rsync -va $CITADEL_BUILD_DIR/ ./citadel.AppDir/usr/local/citadel/ || exit 18
+
+# Install the WebCit application tree
+mkdir -p citadel.AppDir/usr/local/webcit || exit 19
+rsync -va $WEBCIT_BUILD_DIR/ ./citadel.AppDir/usr/local/webcit/ || exit 20
+
+# Remove the build directories
+rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
+
+cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 21
+
+CPU=`uname -m`
+basefilename=citadel-`date +%s`
+if [ $CPU == x86_64 ] ; then
+	export ARCH=x86_64
+elif [ $CPU == armv7l ] ; then
+	export ARCH=ARM
+fi
+echo ARCH: $ARCH
+echo CPU: $CPU
+appimagetool citadel.AppDir/ ${basefilename}-${CPU}.appimage