diff --git a/release_scripts/linux/build.sh b/release_scripts/linux/build.sh index 8379c738..e882f622 100755 --- a/release_scripts/linux/build.sh +++ b/release_scripts/linux/build.sh @@ -17,7 +17,7 @@ initializeVariables() { APPLICATION_NAME="OpenBoard" - STANDARD_QT_USED=false + STANDARD_QT_USED=true # Root directory SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -26,7 +26,7 @@ initializeVariables() PRODUCT_PATH="$BUILD_DIR/product" # Qt installation path. This may vary across machines - QT_PATH="/home/dev/Qt/5.15.0/gcc_64" + QT_PATH="/usr/lib/x86_64-linux-gnu/qt5" PLUGINS_PATH="$QT_PATH/plugins" GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations" QMAKE_PATH="$QT_PATH/bin/qmake" @@ -39,8 +39,7 @@ initializeVariables() ARCHITECTURE=`uname -m` if [ $ARCHITECTURE == "x86_64" ]; then ARCHITECTURE="amd64" - fi - if [$ARCHITECTURE == "armv7l" ]; then + elif [$ARCHITECTURE == "armv7l" ]; then $ARCHITECTURE="armhf" QT_PATH="/usr/lib/arm-linux-gnueabihf/qt5" fi diff --git a/release_scripts/linux/package.sh b/release_scripts/linux/package.sh index 25d07230..2014c3c7 100755 --- a/release_scripts/linux/package.sh +++ b/release_scripts/linux/package.sh @@ -85,13 +85,13 @@ initializeVariables() # Include Qt libraries and plugins in the package, or not # (this is necessary if the target system doesn't provide Qt 5.5.1) - BUNDLE_QT=true + BUNDLE_QT=false # Qt installation path. This may vary across machines - QT_PATH="/home/dev/Qt/5.15.0/gcc_64" + QT_PATH="/usr/lib/x86_64-linux-gnu/qt5" QT_PLUGINS_SOURCE_PATH="$QT_PATH/plugins" GUI_TRANSLATIONS_DIRECTORY_PATH="/usr/share/qt5/translations" - QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib" + QT_LIBRARY_SOURCE_PATH="$QT_PATH/.." NOTIFY_CMD=`which notify-send` ZIP_PATH=`which zip`