Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modifications to make-deb-server to account for new location for qt5-install libraries

Browse source 
Some attempts to handle use of system-qt (but not tested)
This commit is contained in:
Ubuntu 2021-09-21 07:15:40 +00:00
parent 542e070d2d
commit e5e2872a42
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg-scripts/README.md
View file

@ -16,7 +16,7 @@ and that the base folder can be reached by going to `../..`. This may not work i
## Ubuntu ## Ubuntu
``` ```
DEBVERSION="Semver e.g. 2021.1.0" DEBEMAIL="your-email@somewhere.com" DEBFULLNAME="Your Full Name" ./make-deb-server DEBVERSION="Semver e.g. 2021.1.3" DEBEMAIL="your-email@somewhere.com" DEBFULLNAME="Your Full Name" ./make-deb-server
``` ```
This script will retrieve the current git commit date and hash and append it to your specified version. This script will retrieve the current git commit date and hash and append it to your specified version.
@ -30,7 +30,7 @@ sudo yum install rpm-build
``` ```
Then, run the build script. Then, run the build script.
``` ```
RPMVERSION="Semver e.g. 2021.1.0" ./make-rpm-server RPMVERSION="Semver e.g. 2021.1.3" ./make-rpm-server
``` ```
This script will retrieve the current git commit date and hash and append it to your specified version. This script will retrieve the current git commit date and hash and append it to your specified version.

35
pkg-scripts/make-deb-server
View file

@ -2,6 +2,7 @@
if [ "$VIRCADIA" = "" ]; then if [ "$VIRCADIA" = "" ]; then
VIRCADIA=`realpath ../..` VIRCADIA=`realpath ../..`
QT5_LIBS=`realpath ../../../vircadia-files/qt/qt5-install/lib`
fi fi
GITDATE=`git -C $VIRCADIA/source log -n 1 --format=raw | grep author | cut -d">" -f 2 | cut -d" " -f 2 | xargs -I {} date -d @{} +"%Y%m%d"` GITDATE=`git -C $VIRCADIA/source log -n 1 --format=raw | grep author | cut -d">" -f 2 | cut -d" " -f 2 | xargs -I {} date -d @{} +"%Y%m%d"`
@ -21,15 +22,17 @@ cp $VIRCADIA/build/tools/oven/oven $DEB_BUILD_ROOT
cp $VIRCADIA/build/libraries/*/*.so $DEB_BUILD_ROOT cp $VIRCADIA/build/libraries/*/*.so $DEB_BUILD_ROOT
#cp $VIRCADIA/build/ice-server/ice-server $DEB_BUILD_ROOT #cp $VIRCADIA/build/ice-server/ice-server $DEB_BUILD_ROOT
chrpath -d $DEB_BUILD_ROOT/* chrpath -d $DEB_BUILD_ROOT/*
cp $VIRCADIA/qt5-install/lib/libQt5Network.so.*.*.* $DEB_BUILD_ROOT if [ "$VIRCADIA_USE_SYSTEM_QT" = "" ]; then
cp $VIRCADIA/qt5-install/lib/libQt5Core.so.*.*.* $DEB_BUILD_ROOT cp $QT5_LIBS/libQt5Network.so.*.*.* $DEB_BUILD_ROOT
cp $VIRCADIA/qt5-install/lib/libQt5Widgets.so.*.*.* $DEB_BUILD_ROOT cp $QT5_LIBS/libQt5Core.so.*.*.* $DEB_BUILD_ROOT
cp $VIRCADIA/qt5-install/lib/libQt5Gui.so.*.*.* $DEB_BUILD_ROOT cp $QT5_LIBS/libQt5Widgets.so.*.*.* $DEB_BUILD_ROOT
cp $VIRCADIA/qt5-install/lib/libQt5Script.so.*.*.* $DEB_BUILD_ROOT cp $QT5_LIBS/libQt5Gui.so.*.*.* $DEB_BUILD_ROOT
cp $VIRCADIA/qt5-install/lib/libQt5WebSockets.so.*.*.* $DEB_BUILD_ROOT cp $QT5_LIBS/libQt5Script.so.*.*.* $DEB_BUILD_ROOT
cp $VIRCADIA/qt5-install/lib/libQt5Qml.so.*.*.* $DEB_BUILD_ROOT cp $QT5_LIBS/libQt5WebSockets.so.*.*.* $DEB_BUILD_ROOT
cp $VIRCADIA/qt5-install/lib/libQt5ScriptTools.so.*.*.* $DEB_BUILD_ROOT cp $QT5_LIBS/libQt5Qml.so.*.*.* $DEB_BUILD_ROOT
chmod +x $DEB_BUILD_ROOT/*.so.*.*.* cp $QT5_LIBS/libQt5ScriptTools.so.*.*.* $DEB_BUILD_ROOT
chmod +x $DEB_BUILD_ROOT/*.so.*.*.*
fi
strip --strip-all $DEB_BUILD_ROOT/* strip --strip-all $DEB_BUILD_ROOT/*
cp $VIRCADIA/source/pkg-scripts/new-server $DEB_BUILD_ROOT cp $VIRCADIA/source/pkg-scripts/new-server $DEB_BUILD_ROOT
cp -a $VIRCADIA/source/domain-server/resources $DEB_BUILD_ROOT cp -a $VIRCADIA/source/domain-server/resources $DEB_BUILD_ROOT
@ -71,9 +74,11 @@ echo domain-server opt/vircadia >> debian/install
echo oven opt/vircadia >> debian/install echo oven opt/vircadia >> debian/install
#echo ice-server opt/vircadia >> debian/install #echo ice-server opt/vircadia >> debian/install
echo new-server opt/vircadia >> debian/install echo new-server opt/vircadia >> debian/install
for so in *.so.*.*.*; do if [ "$VIRCADIA_USE_SYSTEM_QT" = "" ]; then
echo $so opt/vircadia/lib >> debian/install for so in *.so.*.*.*; do
done echo $so opt/vircadia/lib >> debian/install
done
fi
for so in *.so; do for so in *.so; do
echo $so opt/vircadia/lib >> debian/install echo $so opt/vircadia/lib >> debian/install
done done
@ -86,7 +91,11 @@ done
find resources -type f -exec sh -c 'echo {} opt/vircadia/$(dirname "{}") >> debian/install' \; find resources -type f -exec sh -c 'echo {} opt/vircadia/$(dirname "{}") >> debian/install' \;
find plugins -type f -exec sh -c 'echo {} opt/vircadia/$(dirname "{}") >> debian/install' \; find plugins -type f -exec sh -c 'echo {} opt/vircadia/$(dirname "{}") >> debian/install' \;
SOFILES=`ls *.so *.so.*.*.* | grep -Po '^(.+\.so(\.\d+)?)' | sed 's/\./\\\./g' | paste -d'|' -s` if [ "$VIRCADIA_USE_SYSTEM_QT" = "" ]; then
SOFILES=`ls *.so *.so.*.*.* | grep -Po '^(.+\.so(\.\d+)?)' | sed 's/\./\\\./g' | paste -d'|' -s`
else
SOFILES=`ls *.so | grep -Po '^(.+\.so(\.\d+)?)' | sed 's/\./\\\./g' | paste -d'|' -s`
fi
DEPENDS=`find * -path debian -prune -o -type f -executable -exec sh -c 'objdump -p {} | grep NEEDED' \; \ DEPENDS=`find * -path debian -prune -o -type f -executable -exec sh -c 'objdump -p {} | grep NEEDED' \; \
| awk '{print $2}' | sort | uniq | egrep -v "^($SOFILES)$" \ | awk '{print $2}' | sort | uniq | egrep -v "^($SOFILES)$" \