RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
John Preston 2016-09-07 14:14:45 +03:00
parent 96a0e1c237 2f206bf6bc
commit 58933df54b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/_other/packer.cpp
View File

@ -141,6 +141,7 @@ int main(int argc, char *argv[])
QString remove; QString remove;
int version = 0; int version = 0;
bool target32 = false;
QFileInfoList files; QFileInfoList files;
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
if (string("-path") == argv[i] && i + 1 < argc) { if (string("-path") == argv[i] && i + 1 < argc) {
@ -148,6 +149,8 @@ int main(int argc, char *argv[])
QFileInfo info(path); QFileInfo info(path);
files.push_back(info); files.push_back(info);
if (remove.isEmpty()) remove = info.canonicalPath() + "/"; if (remove.isEmpty()) remove = info.canonicalPath() + "/";
} else if (string("-target") == argv[i] && i + 1 < argc) {
target32 = (string("mac32") == argv[i + 1]);
} else if (string("-version") == argv[i] && i + 1 < argc) { } else if (string("-version") == argv[i] && i + 1 < argc) {
version = QString(argv[i + 1]).toInt(); version = QString(argv[i + 1]).toInt();
} else if (string("-alpha") == argv[i]) { } else if (string("-alpha") == argv[i]) {
@ -451,11 +454,11 @@ int main(int argc, char *argv[])
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QString outName(QString("tupdate%1").arg(BetaVersion ? BetaVersion : version)); QString outName(QString("tupdate%1").arg(BetaVersion ? BetaVersion : version));
#elif defined Q_OS_MAC #elif defined Q_OS_MAC
QString outName(QString("tmacupd%1").arg(BetaVersion ? BetaVersion : version)); QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(BetaVersion ? BetaVersion : version));
#elif defined Q_OS_LINUX32 #elif defined Q_OS_LINUX32
QString outName(QString("tlinux32upd%1").arg(BetaVersion ? BetaVersion : version)); QString outName(QString("tlinux32upd%1").arg(BetaVersion ? BetaVersion : version));
#elif defined Q_OS_LINUX64 #elif defined Q_OS_LINUX64
QString outName(QString("tlinuxupd%1").arg(BetaVersion ? BetaVersion : version)); QString outName(QString("tlinuxupd%1").arg(BetaVersion ? BetaVersion : version));
#else #else
#error Unknown platform! #error Unknown platform!
#endif #endif

2
Telegram/build/build.sh
View File

@ -301,7 +301,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o "$SetupFile" hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o "$SetupFile"
fi fi
cd "$ReleasePath" cd "$ReleasePath"
"./Packer" -path "$BinaryName.app" -version $VersionForPacker $AlphaBetaParam "./Packer" -path "$BinaryName.app" -target "$BuildTarget" -version $VersionForPacker $AlphaBetaParam
echo "Packer done!" echo "Packer done!"
if [ "$BetaVersion" != "0" ]; then if [ "$BetaVersion" != "0" ]; then