updated building/packaging to qt5.13

preferencesAboutTextFull
Clément Fauconnier 5 years ago
parent 978a03a601
commit 7998ab58d2
  1. 2
      release_scripts/linux/build.sh
  2. 25
      release_scripts/linux/package.sh

@ -26,7 +26,7 @@ initializeVariables()
PRODUCT_PATH="$BUILD_DIR/product" PRODUCT_PATH="$BUILD_DIR/product"
# Qt installation path. This may vary across machines # Qt installation path. This may vary across machines
QT_PATH="/usr/lib/x86_64-linux-gnu/qt5" QT_PATH="/home/dev/Qt/5.13.2/gcc_64"
PLUGINS_PATH="$QT_PATH/plugins" PLUGINS_PATH="$QT_PATH/plugins"
GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations" GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations"
QMAKE_PATH="$QT_PATH/bin/qmake" QMAKE_PATH="$QT_PATH/bin/qmake"

@ -85,13 +85,13 @@ initializeVariables()
# Include Qt libraries and plugins in the package, or not # Include Qt libraries and plugins in the package, or not
# (this is necessary if the target system doesn't provide Qt 5.5.1) # (this is necessary if the target system doesn't provide Qt 5.5.1)
BUNDLE_QT=false BUNDLE_QT=true
# Qt installation path. This may vary across machines # Qt installation path. This may vary across machines
QT_PATH="/usr/lib/x86_64-linux-gnu/qt5" QT_PATH="/home/dev/Qt/5.13.2/gcc_64"
QT_PLUGINS_SOURCE_PATH="$QT_PATH/plugins" QT_PLUGINS_SOURCE_PATH="$QT_PATH/plugins"
GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations" GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations"
QT_LIBRARY_SOURCE_PATH="$QT_PATH/.." QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib"
NOTIFY_CMD=`which notify-send` NOTIFY_CMD=`which notify-send`
ZIP_PATH=`which zip` ZIP_PATH=`which zip`
@ -131,12 +131,11 @@ notifyProgress(){
copyQtLibrary(){ copyQtLibrary(){
echo -e "\t $1" echo -e "\t $1"
if ls "$QT_LIBRARY_SOURCE_PATH/$1.so" &> /dev/null; then if ls "$QT_LIBRARY_SOURCE_PATH/$1.so" &> /dev/null; then
cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.? "$QT_LIBRARY_DEST_PATH/" cp -P $QT_LIBRARY_SOURCE_PATH/$1.so "$QT_LIBRARY_DEST_PATH/"
cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.?.? "$QT_LIBRARY_DEST_PATH/" cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.* "$QT_LIBRARY_DEST_PATH/"
cp -P $QT_LIBRARY_SOURCE_PATH/$1.so.?.?.? "$QT_LIBRARY_DEST_PATH/"
strip $QT_LIBRARY_DEST_PATH/$1.so.?.?.? strip $QT_LIBRARY_DEST_PATH/$1.so
chmod 644 $QT_LIBRARY_DEST_PATH/$1.so.?.?.? # 644 = rw-r-r chmod 644 $QT_LIBRARY_DEST_PATH/$1.so.* # 644 = rw-r-r
else else
notifyError "$1 library not found in path: $QT_LIBRARY_SOURCE_PATH" notifyError "$1 library not found in path: $QT_LIBRARY_SOURCE_PATH"
fi fi
@ -209,7 +208,7 @@ if $BUNDLE_QT; then
copyQtPlugin platformthemes copyQtPlugin platformthemes
copyQtPlugin position copyQtPlugin position
copyQtPlugin printsupport copyQtPlugin printsupport
copyQtPlugin qtwebengine #copyQtPlugin qtwebengine
copyQtPlugin sceneparsers copyQtPlugin sceneparsers
copyQtPlugin xcbglintegrations copyQtPlugin xcbglintegrations
@ -219,6 +218,7 @@ if $BUNDLE_QT; then
copyQtLibrary libQt5DBus copyQtLibrary libQt5DBus
copyQtLibrary libQt5Gui copyQtLibrary libQt5Gui
copyQtLibrary libQt5Multimedia copyQtLibrary libQt5Multimedia
copyQtLibrary libQt5MultimediaGstTools
copyQtLibrary libQt5MultimediaWidgets copyQtLibrary libQt5MultimediaWidgets
copyQtLibrary libQt5Network copyQtLibrary libQt5Network
copyQtLibrary libQt5OpenGL copyQtLibrary libQt5OpenGL
@ -238,7 +238,9 @@ if $BUNDLE_QT; then
copyQtLibrary libQt5XcbQpa copyQtLibrary libQt5XcbQpa
copyQtLibrary libQt5Xml copyQtLibrary libQt5Xml
copyQtLibrary libQt5XmlPatterns copyQtLibrary libQt5XmlPatterns
copyQtLibrary libqgsttools_p copyQtLibrary libicuuc
copyQtLibrary libicui18n
copyQtLibrary libicudata
fi fi
notifyProgress "Copying Qt translations" notifyProgress "Copying Qt translations"
@ -325,9 +327,12 @@ if $BUNDLE_QT; then
for lib in `dpkg -S $l | grep -v "libqt5" | grep -v "qt55" | awk -F":" '{ print $1 }'`; do for lib in `dpkg -S $l | grep -v "libqt5" | grep -v "qt55" | awk -F":" '{ print $1 }'`; do
presence=`echo ${tab[*]} | grep -c "$lib"`; presence=`echo ${tab[*]} | grep -c "$lib"`;
if [ "$presence" == "0" ]; then if [ "$presence" == "0" ]; then
if [ "$lib" != "openboard" ]; then
echo "adding $lib to tab"
tab[$count]=$lib; tab[$count]=$lib;
((count++)); ((count++));
fi; fi;
fi;
done; done;
done; done;
else else

Loading…
Cancel
Save