From b5e1aadef231f96035bae61384a1d9a1660b569e Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 1 Oct 2015 18:16:21 +0300 Subject: [PATCH] build script updated --- Telegram/Build.sh | 20 ++++++++++++++++++++ Telegram/Telegram.pro | 2 -- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Telegram/Build.sh b/Telegram/Build.sh index 808004fd21..4f1b7f324a 100755 --- a/Telegram/Build.sh +++ b/Telegram/Build.sh @@ -26,11 +26,17 @@ if [ "$BuildTarget" == "linux" ]; then echo "Building version $AppVersionStrFull for Linux 64bit.." UpdateFile="tlinuxupd$AppVersion" SetupFile="tsetup.$AppVersionStrFull.tar.xz" + WorkPath="./../Linux" + HomePath="./../../Telegram" + FixScript="$HomePath/FixMake.sh" ReleasePath="./../Linux/Release" elif [ "$BuildTarget" == "linux32" ]; then echo "Building version $AppVersionStrFull for Linux 32bit.." UpdateFile="tlinux32upd$AppVersion" SetupFile="tsetup32.$AppVersionStrFull.tar.xz" + WorkPath="./../Linux" + HomePath="./../../Telegram" + FixScript="$HomePath/FixMake32.sh" ReleasePath="./../Linux/Release" elif [ "$BuildTarget" == "mac" ]; then echo "Building version $AppVersionStrFull for OS X 10.8+.." @@ -75,6 +81,20 @@ fi #fi if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then + mkdir -p "$WorkPath/ReleaseIntermediateUpdater" + cd "$WorkPath/ReleaseIntermediateUpdater" + /usr/local/Qt-5.5.0/bin/qmake "$HomePath/Updater.pro" + make + echo "Updater build complete!" + cd "$HomePath" + + mkdir -p "$WorkPath/ReleaseIntermediate" + cd "$WorkPath/ReleaseIntermediate" + /usr/local/Qt-5.5.0/bin/qmake "$HomePath/Telegram.pro" + eval "$FixScript" + make + echo "Telegram build complete!" + cd "$HomePath" if [ ! -f "$ReleasePath/Telegram" ]; then echo "Telegram not found!" exit 1 diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index 015f65eca4..dce252d797 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -73,10 +73,8 @@ unix { linux-g++-64:QMAKE_TARGET.arch = x86_64 contains(QMAKE_TARGET.arch, x86_64) { - CONFIG(release,debug|release):QMAKE_PRE_LINK = ./../../Telegram/FixMake.sh DEFINES += Q_OS_LINUX64 } else { - CONFIG(release,debug|release):QMAKE_PRE_LINK = ./../../Telegram/FixMake32.sh DEFINES += Q_OS_LINUX32 } }