X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fbuild_appimage.sh;h=8680bd711541cfa0036d0784395a4a90774dc330;hb=4397e5ac9918708106a00cd2bde21c46ece9e191;hp=a1675de11e03ee95c51b753b88aff27add487cac;hpb=a4889715724de08aca6ff61df5250b5b74e43a1c;p=citadel.git

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index a1675de11..8680bd711 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -15,6 +15,14 @@ make || exit 4
 make install || exit 5
 popd
 
+# Build the text mode client
+pushd ../textclient || exit 22
+make distclean 2>/dev/null
+./bootstrap || exit 23
+./configure --prefix=`pwd` || exit 24
+make || exit 25
+popd
+
 # Build the Citadel server
 pushd ../citadel || exit 6
 make distclean 2>/dev/null
@@ -39,12 +47,24 @@ mkdir -p citadel.AppDir/usr/bin
 mkdir -p citadel.AppDir/usr/lib
 
 # Copy over all the libraries we used
-for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate `which gdb`
+for bin in \
+	$CITADEL_BUILD_DIR/citserver \
+	$WEBCIT_BUILD_DIR/webcit \
+	$CITADEL_BUILD_DIR/ctdlmigrate \
+	../textclient/citadel \
+	`which gdb`
 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
-		cp -v -L $x citadel.AppDir/usr/lib/
-	done
+	ldd $bin
+done | sort | while read libname junk libpath
+do
+	if [ ! -e ${libpath} 2>/dev/null ] ; then
+		echo -e \\033[31m ${libname} was not found and will not be packaged. \\033[0m
+	elif grep ^${libname}$ excludelist >/dev/null 2>/dev/null ; then
+		echo -e \\033[33m ${libname} is in the exclude list and will not be packaged. \\033[0m
+	else
+		echo -e \\033[32m ${libname} will be packaged. \\033[0m
+		cp -L ${libpath} citadel.AppDir/usr/lib/ 2>/dev/null
+	fi
 done
 ldconfig -v citadel.AppDir/usr/lib
 
@@ -54,6 +74,10 @@ do
 	cp `which $bin` citadel.AppDir/usr/bin/	|| exit 16
 done
 
+# Copy over the client
+cp ../textclient/citadel citadel.AppDir/usr/bin/ || exit 26
+cp ../textclient/citadel.rc citadel.AppDir/ || exit 27
+
 # 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