Adjusted DEB build to handle dynamic library compilation

This commit is contained in:
Heather Anderson 2020-02-23 04:13:53 +00:00
parent d2a2687e6c
commit 9b54a97912
2 changed files with 11 additions and 3 deletions

View file

@ -1,8 +1,11 @@
#!/bin/sh
ATHENA=`realpath ../..`
GITDATE=`git log -n 1 --format=raw | grep author | cut -d' ' -f 4 | xargs -I {} date -d @{} +"%Y%m%d"`
GITCOMMIT=`git rev-parse HEAD | cut -c 1-7`
if [ "$ATHENA" = "" ]; then
ATHENA=`realpath ../..`
fi
GITDATE=`git -C $ATHENA/source log -n 1 --format=raw | grep author | cut -d">" -f 2 | cut -d" " -f 2 | xargs -I {} date -d @{} +"%Y%m%d"`
GITCOMMIT=`git -C $ATHENA/source rev-parse HEAD | cut -c 1-7`
VERSION=0.86.0-k1-$GITDATE-$GITCOMMIT
sudo apt-get install chrpath binutils
@ -15,6 +18,7 @@ mkdir -p $DEB_BUILD_ROOT
cp $ATHENA/build/assignment-client/assignment-client $DEB_BUILD_ROOT
cp $ATHENA/build/domain-server/domain-server $DEB_BUILD_ROOT
cp $ATHENA/build/tools/oven/oven $DEB_BUILD_ROOT
cp $ATHENA/build/libraries/*/*.so $DEB_BUILD_ROOT
#cp $ATHENA/build/ice-server/ice-server $DEB_BUILD_ROOT
chrpath -d $DEB_BUILD_ROOT/*
cp $ATHENA/qt5-install/lib/libQt5Network.so.*.*.* $DEB_BUILD_ROOT
@ -69,6 +73,9 @@ echo new-server opt/athena >> debian/install
for so in *.so.*.*.*; do
echo $so opt/athena/lib >> debian/install
done
for so in *.so; do
echo $so opt/athena/lib >> debian/install
done
#for service in *.service; do
# echo $service opt/athena/systemd >> debian/install
#done

View file

@ -29,6 +29,7 @@ fi
mkdir -p /var/lib/athena/$1/.local/share
ln -s ../.. /var/lib/athena/$1/.local/share/Project\ Athena\ -\ dev
ln -s ../.. /var/lib/athena/$1/.local/share/Project\ Athena
mkdir -p /var/lib/athena/$1/domain-server
echo "{\"metaverse\": {\"local_port\": $(($2 + 2))},\"version\": 2.4}" > /var/lib/athena/$1/domain-server/config.json
chown -R athena.athena /var/lib/athena/$1