Merge branch 'develop' of github.com:OpenEducationFoundation/OpenBoard into develop

preferencesAboutTextFull
-f 11 years ago
commit d4d5d38cd8
  1. 9
      buildDebianPackage.sh

@ -40,6 +40,7 @@ initializeVariables()
GUI_TRANSLATIONS_DIRECTORY_PATH="../Qt-4.8/translations" GUI_TRANSLATIONS_DIRECTORY_PATH="../Qt-4.8/translations"
QT_LIBRARY_DEST_PATH="$PRODUCT_PATH/qtlib" QT_LIBRARY_DEST_PATH="$PRODUCT_PATH/qtlib"
QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib" QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib"
if [ -z $ARCHITECTURE ]; then
ARCHITECTURE=`uname -m` ARCHITECTURE=`uname -m`
if [ "$ARCHITECTURE" == "x86_64" ]; then if [ "$ARCHITECTURE" == "x86_64" ]; then
ARCHITECTURE="amd64" ARCHITECTURE="amd64"
@ -47,7 +48,7 @@ initializeVariables()
if [ "$ARCHITECTURE" == "i686" ]; then if [ "$ARCHITECTURE" == "i686" ]; then
ARCHITECTURE="i386" ARCHITECTURE="i386"
fi fi
fi
NOTIFY_CMD=`which notify-send` NOTIFY_CMD=`which notify-send`
QMAKE_PATH="$QT_PATH/bin/qmake" QMAKE_PATH="$QT_PATH/bin/qmake"
LRELEASES="$QT_PATH/bin/lrelease" LRELEASES="$QT_PATH/bin/lrelease"
@ -114,7 +115,7 @@ buildWithStandardQt(){
STANDARD_QT_USED=true STANDARD_QT_USED=true
QMAKE_PATH=$STANDARD_QT QMAKE_PATH=$STANDARD_QT
LRELEASES=`which lrelease` LRELEASES=`which lrelease`
if [ "`arch`" == "i686" ]; then if [ "`arch`" == "i686" ] || [ "$ARCHITECTURE" == "i386" ]; then
QT_PATH="/usr/lib/i386-linux-gnu" QT_PATH="/usr/lib/i386-linux-gnu"
else else
QT_PATH="/usr/lib/`arch`-linux-gnu" QT_PATH="/usr/lib/`arch`-linux-gnu"
@ -148,8 +149,6 @@ buildImporter(){
# script # script
#********************** #**********************
checkUser checkUser
initializeVariables
buildWithStandardQt
for var in "$@" for var in "$@"
do do
@ -165,6 +164,8 @@ do
fi fi
done done
initializeVariables
buildWithStandardQt
alertIfPreviousVersionInstalled alertIfPreviousVersionInstalled

Loading…
Cancel
Save