procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2015-10-01 20:15:39 +03:00
parent 425e2c2a81 b5e1aadef2
commit bd4d43daaf
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Telegram/Build.sh
View File

@ -1,3 +1,5 @@
set -e
while IFS='' read -r line || [[ -n "$line" ]]; do while IFS='' read -r line || [[ -n "$line" ]]; do
set $line set $line
eval $1="$2" eval $1="$2"
@ -24,11 +26,17 @@ if [ "$BuildTarget" == "linux" ]; then
echo "Building version $AppVersionStrFull for Linux 64bit.." echo "Building version $AppVersionStrFull for Linux 64bit.."
UpdateFile="tlinuxupd$AppVersion" UpdateFile="tlinuxupd$AppVersion"
SetupFile="tsetup.$AppVersionStrFull.tar.xz" SetupFile="tsetup.$AppVersionStrFull.tar.xz"
WorkPath="./../Linux"
HomePath="./../../Telegram"
FixScript="$HomePath/FixMake.sh"
ReleasePath="./../Linux/Release" ReleasePath="./../Linux/Release"
elif [ "$BuildTarget" == "linux32" ]; then elif [ "$BuildTarget" == "linux32" ]; then
echo "Building version $AppVersionStrFull for Linux 32bit.." echo "Building version $AppVersionStrFull for Linux 32bit.."
UpdateFile="tlinux32upd$AppVersion" UpdateFile="tlinux32upd$AppVersion"
SetupFile="tsetup32.$AppVersionStrFull.tar.xz" SetupFile="tsetup32.$AppVersionStrFull.tar.xz"
WorkPath="./../Linux"
HomePath="./../../Telegram"
FixScript="$HomePath/FixMake32.sh"
ReleasePath="./../Linux/Release" ReleasePath="./../Linux/Release"
elif [ "$BuildTarget" == "mac" ]; then elif [ "$BuildTarget" == "mac" ]; then
echo "Building version $AppVersionStrFull for OS X 10.8+.." echo "Building version $AppVersionStrFull for OS X 10.8+.."
@ -73,6 +81,20 @@ fi
#fi #fi
if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then 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 if [ ! -f "$ReleasePath/Telegram" ]; then
echo "Telegram not found!" echo "Telegram not found!"
exit 1 exit 1
@ -106,8 +128,8 @@ fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
touch ./SourceFiles/telegram.qrc or exit 1 touch ./SourceFiles/telegram.qrc
xcodebuild -project Telegram.xcodeproj -alltargets -configuration Release build or exit 1 xcodebuild -project Telegram.xcodeproj -alltargets -configuration Release build
if [ ! -d "$ReleasePath/$BinaryName.app" ]; then if [ ! -d "$ReleasePath/$BinaryName.app" ]; then
echo "$BinaryName.app not found!" echo "$BinaryName.app not found!"

2
Telegram/Telegram.pro
View File

@ -73,10 +73,8 @@ unix {
linux-g++-64:QMAKE_TARGET.arch = x86_64 linux-g++-64:QMAKE_TARGET.arch = x86_64
contains(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 DEFINES += Q_OS_LINUX64
} else { } else {
CONFIG(release,debug|release):QMAKE_PRE_LINK = ./../../Telegram/FixMake32.sh
DEFINES += Q_OS_LINUX32 DEFINES += Q_OS_LINUX32
} }
} }