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
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
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
cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 21
CPU=`uname -m`
-basefilename=citadel-`date +%s`
+basefilename=citadel-`cat ../release_version.txt`
if [ $CPU == x86_64 ] ; then
export ARCH=x86_64
elif [ $CPU == armv7l ] ; then
- export ARCH=ARM
+ export ARCH=armhf
+elif [ $CPU == aarch64 ] ; then
+ export ARCH=aarch64
fi
echo ARCH: $ARCH
echo CPU: $CPU