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

Swap 'alpha' and 'beta'. Happy debugging!

This commit is contained in:
John Preston 2018-09-26 17:58:09 +03:00
parent a949c5e287
commit 6e566e0165
32 changed files with 379 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
//Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) //Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
#endif #endif
bool AlphaChannel = false; bool BetaChannel = false;
quint64 BetaVersion = 0; quint64 AlphaVersion = 0;
const char *PublicKey = "\ const char *PublicKey = "\
-----BEGIN RSA PUBLIC KEY-----\n\ -----BEGIN RSA PUBLIC KEY-----\n\
@ -24,7 +24,7 @@ BZpkIfKaRcl6XzNJiN28cVwO1Ui5JSa814UAiDHzWUqCaXUiUEQ6NmNTneiGx2sQ\n\
-----END RSA PUBLIC KEY-----\ -----END RSA PUBLIC KEY-----\
"; ";
const char *PublicAlphaKey = "\ const char *PublicBetaKey = "\
-----BEGIN RSA PUBLIC KEY-----\n\ -----BEGIN RSA PUBLIC KEY-----\n\
MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\ MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\
0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\ 0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\
@ -33,11 +33,11 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
"; ";
extern const char *PrivateKey; extern const char *PrivateKey;
extern const char *PrivateAlphaKey; extern const char *PrivateBetaKey;
#include "../../../../TelegramPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing #include "../../../../TelegramPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing
#include "../../../../TelegramPrivate/beta_private.h" // private key for beta version file generation #include "../../../../TelegramPrivate/alpha_private.h" // private key for alpha version file generation
QString countBetaVersionSignature(quint64 version); QString countAlphaVersionSignature(quint64 version);
// sha1 hash // sha1 hash
typedef unsigned char uchar; typedef unsigned char uchar;
@ -124,7 +124,7 @@ int32 *hashSha1(const void *data, uint32 len, void *dest) {
return (int32*)sha1To; return (int32*)sha1To;
} }
QString BetaSignature; QString AlphaSignature;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -144,18 +144,18 @@ int main(int argc, char *argv[])
target32 = (string("mac32") == argv[i + 1]); 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("-beta") == argv[i]) {
AlphaChannel = true; BetaChannel = true;
} else if (string("-beta") == argv[i] && i + 1 < argc) { } else if (string("-alpha") == argv[i] && i + 1 < argc) {
BetaVersion = QString(argv[i + 1]).toULongLong(); AlphaVersion = QString(argv[i + 1]).toULongLong();
if (BetaVersion > version * 1000ULL && BetaVersion < (version + 1) * 1000ULL) { if (AlphaVersion > version * 1000ULL && AlphaVersion < (version + 1) * 1000ULL) {
AlphaChannel = false; BetaChannel = false;
BetaSignature = countBetaVersionSignature(BetaVersion); AlphaSignature = countAlphaVersionSignature(AlphaVersion);
if (BetaSignature.isEmpty()) { if (AlphaSignature.isEmpty()) {
return -1; return -1;
} }
} else { } else {
cout << "Bad -beta param value passed, should be for the same version: " << version << ", beta: " << BetaVersion << "\n"; cout << "Bad -alpha param value passed, should be for the same version: " << version << ", alpha: " << AlphaVersion << "\n";
return -1; return -1;
} }
} }
@ -211,9 +211,9 @@ int main(int argc, char *argv[])
QDataStream stream(&buffer); QDataStream stream(&buffer);
stream.setVersion(QDataStream::Qt_5_1); stream.setVersion(QDataStream::Qt_5_1);
if (BetaVersion) { if (AlphaVersion) {
stream << quint32(0x7FFFFFFF); stream << quint32(0x7FFFFFFF);
stream << quint64(BetaVersion); stream << quint64(AlphaVersion);
} else { } else {
stream << quint32(version); stream << quint32(version);
} }
@ -407,7 +407,7 @@ int main(int argc, char *argv[])
uint32 siglen = 0; uint32 siglen = 0;
cout << "Signing..\n"; cout << "Signing..\n";
RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>((AlphaChannel || BetaVersion) ? PrivateAlphaKey : PrivateKey), -1), 0, 0, 0); RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>((BetaChannel || AlphaVersion) ? PrivateBetaKey : PrivateKey), -1), 0, 0, 0);
if (!prKey) { if (!prKey) {
cout << "Could not read RSA private key!\n"; cout << "Could not read RSA private key!\n";
return -1; return -1;
@ -430,7 +430,7 @@ int main(int argc, char *argv[])
} }
cout << "Checking signature..\n"; cout << "Checking signature..\n";
RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>((AlphaChannel || BetaVersion) ? PublicAlphaKey : PublicKey), -1), 0, 0, 0); RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>((BetaChannel || AlphaVersion) ? PublicBetaKey : PublicKey), -1), 0, 0, 0);
if (!pbKey) { if (!pbKey) {
cout << "Could not read RSA public key!\n"; cout << "Could not read RSA public key!\n";
return -1; return -1;
@ -443,18 +443,18 @@ int main(int argc, char *argv[])
cout << "Signature verified!\n"; cout << "Signature verified!\n";
RSA_free(pbKey); RSA_free(pbKey);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QString outName(QString("tupdate%1").arg(BetaVersion ? BetaVersion : version)); QString outName(QString("tupdate%1").arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_MAC #elif defined Q_OS_MAC
QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(BetaVersion ? BetaVersion : version)); QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : 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(AlphaVersion ? AlphaVersion : 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(AlphaVersion ? AlphaVersion : version));
#else #else
#error Unknown platform! #error Unknown platform!
#endif #endif
if (BetaVersion) { if (AlphaVersion) {
outName += "_" + BetaSignature; outName += "_" + AlphaSignature;
} }
QFile out(outName); QFile out(outName);
if (!out.open(QIODevice::WriteOnly)) { if (!out.open(QIODevice::WriteOnly)) {
@ -464,14 +464,14 @@ int main(int argc, char *argv[])
out.write(compressed); out.write(compressed);
out.close(); out.close();
if (BetaVersion) { if (AlphaVersion) {
QString keyName(QString("tbeta_%1_key").arg(BetaVersion)); QString keyName(QString("talpha_%1_key").arg(AlphaVersion));
QFile key(keyName); QFile key(keyName);
if (!key.open(QIODevice::WriteOnly)) { if (!key.open(QIODevice::WriteOnly)) {
cout << "Can't open '" << keyName.toUtf8().constData() << "' for write..\n"; cout << "Can't open '" << keyName.toUtf8().constData() << "' for write..\n";
return -1; return -1;
} }
key.write(BetaSignature.toUtf8()); key.write(AlphaSignature.toUtf8());
key.close(); key.close();
} }
@ -480,10 +480,10 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
QString countBetaVersionSignature(quint64 version) { // duplicated in autoupdater.cpp QString countAlphaVersionSignature(quint64 version) { // duplicated in autoupdater.cpp
QByteArray cBetaPrivateKey(BetaPrivateKey); QByteArray cAlphaPrivateKey(AlphaPrivateKey);
if (cBetaPrivateKey.isEmpty()) { if (cAlphaPrivateKey.isEmpty()) {
cout << "Error: Trying to count beta version signature without beta private key!\n"; cout << "Error: Trying to count alpha version signature without alpha private key!\n";
return QString(); return QString();
} }
@ -496,27 +496,27 @@ QString countBetaVersionSignature(quint64 version) { // duplicated in autoupdate
uint32 siglen = 0; uint32 siglen = 0;
RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cBetaPrivateKey.constData()), -1), 0, 0, 0); RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cAlphaPrivateKey.constData()), -1), 0, 0, 0);
if (!prKey) { if (!prKey) {
cout << "Error: Could not read beta private key!\n"; cout << "Error: Could not read alpha private key!\n";
return QString(); return QString();
} }
if (RSA_size(prKey) != keySize) { if (RSA_size(prKey) != keySize) {
cout << "Error: Bad beta private key size: " << RSA_size(prKey) << "\n"; cout << "Error: Bad alpha private key size: " << RSA_size(prKey) << "\n";
RSA_free(prKey); RSA_free(prKey);
return QString(); return QString();
} }
QByteArray signature; QByteArray signature;
signature.resize(keySize); signature.resize(keySize);
if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature
cout << "Error: Counting beta version signature failed!\n"; cout << "Error: Counting alpha version signature failed!\n";
RSA_free(prKey); RSA_free(prKey);
return QString(); return QString();
} }
RSA_free(prKey); RSA_free(prKey);
if (siglen != keySize) { if (siglen != keySize) {
cout << "Error: Bad beta version signature length: " << siglen << "\n"; cout << "Error: Bad alpha version signature length: " << siglen << "\n";
return QString(); return QString();
} }

2
Telegram/SourceFiles/_other/updater.cpp
View File

@ -144,7 +144,7 @@ bool update() {
if (!ReadFile(versionFile, &versionNum, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD)) { if (!ReadFile(versionFile, &versionNum, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD)) {
versionNum = 0; versionNum = 0;
} else { } else {
if (versionNum == 0x7FFFFFFF) { // beta version if (versionNum == 0x7FFFFFFF) { // alpha version
} else if (!ReadFile(versionFile, &versionLen, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD) || versionLen > 63) { } else if (!ReadFile(versionFile, &versionLen, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD) || versionLen > 63) {
versionNum = 0; versionNum = 0;

16
Telegram/SourceFiles/boxes/about_box.cpp
View File

@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/update_checker.h" #include "core/update_checker.h"
AboutBox::AboutBox(QWidget *parent) AboutBox::AboutBox(QWidget *parent)
: _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (cAlphaVersion() ? " alpha" : "") + (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString())), st::aboutVersionLink) : _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (cBetaVersion() ? " beta" : "") + (cAlphaVersion() ? qsl(" alpha %1").arg(cAlphaVersion()) : QString())), st::aboutVersionLink)
, _text1(this, lang(lng_about_text_1), Ui::FlatLabel::InitType::Rich, st::aboutLabel) , _text1(this, lang(lng_about_text_1), Ui::FlatLabel::InitType::Rich, st::aboutLabel)
, _text2(this, lang(lng_about_text_2), Ui::FlatLabel::InitType::Rich, st::aboutLabel) , _text2(this, lang(lng_about_text_2), Ui::FlatLabel::InitType::Rich, st::aboutLabel)
, _text3(this, st::aboutLabel) { , _text3(this, st::aboutLabel) {
@ -59,7 +59,7 @@ void AboutBox::resizeEvent(QResizeEvent *e) {
} }
void AboutBox::showVersionHistory() { void AboutBox::showVersionHistory() {
if (cRealBetaVersion()) { if (cRealAlphaVersion()) {
auto url = qsl("https://tdesktop.com/"); auto url = qsl("https://tdesktop.com/");
switch (cPlatform()) { switch (cPlatform()) {
case dbipWindows: url += qsl("win/%1.zip"); break; case dbipWindows: url += qsl("win/%1.zip"); break;
@ -68,11 +68,11 @@ void AboutBox::showVersionHistory() {
case dbipLinux32: url += qsl("linux32/%1.tar.xz"); break; case dbipLinux32: url += qsl("linux32/%1.tar.xz"); break;
case dbipLinux64: url += qsl("linux/%1.tar.xz"); break; case dbipLinux64: url += qsl("linux/%1.tar.xz"); break;
} }
url = url.arg(qsl("tbeta%1_%2").arg(cRealBetaVersion()).arg(Core::countBetaVersionSignature(cRealBetaVersion()))); url = url.arg(qsl("talpha%1_%2").arg(cRealAlphaVersion()).arg(Core::countAlphaVersionSignature(cRealAlphaVersion())));
Application::clipboard()->setText(url); Application::clipboard()->setText(url);
Ui::show(Box<InformBox>("The link to the current private beta version of Telegram Desktop was copied to the clipboard.")); Ui::show(Box<InformBox>("The link to the current private alpha version of Telegram Desktop was copied to the clipboard."));
} else { } else {
QDesktopServices::openUrl(qsl("https://desktop.telegram.org/changelog")); QDesktopServices::openUrl(qsl("https://desktop.telegram.org/changelog"));
} }
@ -99,11 +99,11 @@ QString telegramFaqLink() {
QString currentVersionText() { QString currentVersionText() {
auto result = QString::fromLatin1(AppVersionStr.c_str()); auto result = QString::fromLatin1(AppVersionStr.c_str());
if (cAlphaVersion()) {
result += " alpha";
}
if (cBetaVersion()) { if (cBetaVersion()) {
result += qsl(" beta %1").arg(cBetaVersion() % 1000); result += " beta";
}
if (cAlphaVersion()) {
result += qsl(" alpha %1").arg(cAlphaVersion() % 1000);
} }
return result; return result;
} }

12
Telegram/SourceFiles/config.h
View File

@ -186,7 +186,7 @@ BZpkIfKaRcl6XzNJiN28cVwO1Ui5JSa814UAiDHzWUqCaXUiUEQ6NmNTneiGx2sQ\n\
-----END RSA PUBLIC KEY-----\ -----END RSA PUBLIC KEY-----\
"; ";
static const char *UpdatesPublicAlphaKey = "\ static const char *UpdatesPublicBetaKey = "\
-----BEGIN RSA PUBLIC KEY-----\n\ -----BEGIN RSA PUBLIC KEY-----\n\
MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\ MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\
0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\ 0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\
@ -205,14 +205,14 @@ static const char *ApiHash = "344583e45741c457fe1862106095a5eb";
#error "Only little endian is supported!" #error "Only little endian is supported!"
#endif // Q_BYTE_ORDER == Q_BIG_ENDIAN #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN
#ifndef BETA_VERSION_MACRO #ifndef ALPHA_VERSION_MACRO
#error "Beta version macro is not defined." #error "Alpha version macro is not defined."
#endif #endif
#if (defined CUSTOM_API_ID) && (BETA_VERSION_MACRO > 0ULL) #if (defined CUSTOM_API_ID) && (ALPHA_VERSION_MACRO > 0ULL)
#include "../../../TelegramPrivate/beta_private.h" // private key for downloading closed betas #include "../../../TelegramPrivate/alpha_private.h" // private key for downloading closed alphas
#else #else
static const char *BetaPrivateKey = ""; static const char *AlphaPrivateKey = "";
#endif #endif
extern QString gKeyFile; extern QString gKeyFile;

14
Telegram/SourceFiles/core/changelogs.cpp
View File

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Core { namespace Core {
namespace { namespace {
std::map<int, const char*> AlphaLogs() { std::map<int, const char*> BetaLogs() {
return { return {
{ {
1002024, 1002024,
@ -118,8 +118,8 @@ void Changelogs::requestCloudLogs() {
} }
void Changelogs::addLocalLogs() { void Changelogs::addLocalLogs() {
if (cAlphaVersion() || cBetaVersion()) { if (cBetaVersion() || cAlphaVersion()) {
addAlphaLogs(); addBetaLogs();
} }
if (!_addedSomeLocal) { if (!_addedSomeLocal) {
const auto text = lng_new_version_wrap( const auto text = lng_new_version_wrap(
@ -143,13 +143,13 @@ void Changelogs::addLocalLog(const QString &text) {
_addedSomeLocal = true; _addedSomeLocal = true;
}; };
void Changelogs::addAlphaLogs() { void Changelogs::addBetaLogs() {
for (const auto[version, changes] : AlphaLogs()) { for (const auto[version, changes] : BetaLogs()) {
addAlphaLog(version, changes); addBetaLog(version, changes);
} }
} }
void Changelogs::addAlphaLog(int changeVersion, const char *changes) { void Changelogs::addBetaLog(int changeVersion, const char *changes) {
if (_oldVersion >= changeVersion) { if (_oldVersion >= changeVersion) {
return; return;
} }

4
Telegram/SourceFiles/core/changelogs.h
View File

@ -24,8 +24,8 @@ private:
void requestCloudLogs(); void requestCloudLogs();
void addLocalLogs(); void addLocalLogs();
void addLocalLog(const QString &text); void addLocalLog(const QString &text);
void addAlphaLogs(); void addBetaLogs();
void addAlphaLog(int changeVersion, const char *changes); void addBetaLog(int changeVersion, const char *changes);
const not_null<AuthSession*> _session; const not_null<AuthSession*> _session;
const int _oldVersion = 0; const int _oldVersion = 0;

6
Telegram/SourceFiles/core/crash_report_window.cpp
View File

@ -228,7 +228,7 @@ LastCrashedWindow::LastCrashedWindow()
: std::make_unique<UpdaterData>(this)) { : std::make_unique<UpdaterData>(this)) {
excludeReportUsername(); excludeReportUsername();
if (!cAlphaVersion() && !cBetaVersion()) { // currently accept crash reports only from testers if (!cBetaVersion() && !cAlphaVersion()) { // currently accept crash reports only from testers
_sendingState = SendingNoReport; _sendingState = SendingNoReport;
} }
if (_sendingState != SendingNoReport) { if (_sendingState != SendingNoReport) {
@ -281,7 +281,7 @@ LastCrashedWindow::LastCrashedWindow()
} }
if (_sendingState != SendingNoReport) { if (_sendingState != SendingNoReport) {
QString version = getReportField(qstr("version"), qstr("Version:")); QString version = getReportField(qstr("version"), qstr("Version:"));
QString current = cBetaVersion() ? qsl("-%1").arg(cBetaVersion()) : QString::number(AppVersion); QString current = cAlphaVersion() ? qsl("-%1").arg(cAlphaVersion()) : QString::number(AppVersion);
if (version != current) { // currently don't accept crash reports from not current app version if (version != current) { // currently don't accept crash reports from not current app version
_sendingState = SendingNoReport; _sendingState = SendingNoReport;
} }
@ -418,7 +418,7 @@ QString LastCrashedWindow::getReportField(const QLatin1String &name, const QLati
QString data = lines.at(i).trimmed().mid(prefix.size()).trimmed(); QString data = lines.at(i).trimmed().mid(prefix.size()).trimmed();
if (name == qstr("version")) { if (name == qstr("version")) {
if (data.endsWith(qstr(" beta"))) { if (data.endsWith(qstr(" alpha"))) {
data = QString::number(-data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong()); data = QString::number(-data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong());
} else { } else {
data = QString::number(data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong()); data = QString::number(data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong());

2
Telegram/SourceFiles/core/crash_reports.cpp
View File

@ -310,7 +310,7 @@ void StartCatching() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
ProcessAnnotations["Binary"] = cExeName().toUtf8().constData(); ProcessAnnotations["Binary"] = cExeName().toUtf8().constData();
ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData(); ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData();
ProcessAnnotations["Version"] = (cBetaVersion() ? qsl("%1 beta").arg(cBetaVersion()) : (cAlphaVersion() ? qsl("%1 alpha") : qsl("%1")).arg(AppVersion)).toUtf8().constData(); ProcessAnnotations["Version"] = (cAlphaVersion() ? qsl("%1 alpha").arg(cAlphaVersion()) : (cBetaVersion() ? qsl("%1 beta") : qsl("%1")).arg(AppVersion)).toUtf8().constData();
ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData(); ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData();
ProcessAnnotations["Platform"] = cPlatformString().toUtf8().constData(); ProcessAnnotations["Platform"] = cPlatformString().toUtf8().constData();
ProcessAnnotations["UserTag"] = QString::number(Sandbox::UserTag(), 16).toUtf8().constData(); ProcessAnnotations["UserTag"] = QString::number(Sandbox::UserTag(), 16).toUtf8().constData();

106
Telegram/SourceFiles/core/update_checker.cpp
View File

@ -163,7 +163,7 @@ private:
std::optional<QString> parseResponse(const QByteArray &response) const; std::optional<QString> parseResponse(const QByteArray &response) const;
QString validateLatestUrl( QString validateLatestUrl(
uint64 availableVersion, uint64 availableVersion,
bool isAvailableBeta, bool isAvailableAlpha,
QString url) const; QString url) const;
std::unique_ptr<QNetworkAccessManager> _manager; std::unique_ptr<QNetworkAccessManager> _manager;
@ -391,15 +391,15 @@ bool UnpackUpdate(const QString &filepath) {
return false; return false;
} }
RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(AppAlphaVersion ? UpdatesPublicAlphaKey : UpdatesPublicKey), -1), 0, 0, 0); RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(AppBetaVersion ? UpdatesPublicBetaKey : UpdatesPublicKey), -1), 0, 0, 0);
if (!pbKey) { if (!pbKey) {
LOG(("Update Error: cant read public rsa key!")); LOG(("Update Error: cant read public rsa key!"));
return false; return false;
} }
if (RSA_verify(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (const uchar*)(compressed.constData()), hSigLen, pbKey) != 1) { // verify signature if (RSA_verify(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (const uchar*)(compressed.constData()), hSigLen, pbKey) != 1) { // verify signature
RSA_free(pbKey); RSA_free(pbKey);
if (cAlphaVersion() || cBetaVersion()) { // try other public key, if we are in alpha or beta version if (cBetaVersion() || cAlphaVersion()) { // try other public key, if we are in beta or alpha version
pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(AppAlphaVersion ? UpdatesPublicKey : UpdatesPublicAlphaKey), -1), 0, 0, 0); pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(AppBetaVersion ? UpdatesPublicKey : UpdatesPublicBetaKey), -1), 0, 0, 0);
if (!pbKey) { if (!pbKey) {
LOG(("Update Error: cant read public rsa key!")); LOG(("Update Error: cant read public rsa key!"));
return false; return false;
@ -488,15 +488,15 @@ bool UnpackUpdate(const QString &filepath) {
return false; return false;
} }
quint64 betaVersion = 0; quint64 alphaVersion = 0;
if (version == 0x7FFFFFFF) { // beta version if (version == 0x7FFFFFFF) { // alpha version
stream >> betaVersion; stream >> alphaVersion;
if (stream.status() != QDataStream::Ok) { if (stream.status() != QDataStream::Ok) {
LOG(("Update Error: cant read beta version from downloaded stream, status: %1").arg(stream.status())); LOG(("Update Error: cant read alpha version from downloaded stream, status: %1").arg(stream.status()));
return false; return false;
} }
if (!cBetaVersion() || betaVersion <= cBetaVersion()) { if (!cAlphaVersion() || alphaVersion <= cAlphaVersion()) {
LOG(("Update Error: downloaded beta version %1 is not greater, than mine %2").arg(betaVersion).arg(cBetaVersion())); LOG(("Update Error: downloaded alpha version %1 is not greater, than mine %2").arg(alphaVersion).arg(cAlphaVersion()));
return false; return false;
} }
} else if (int32(version) <= AppVersion) { } else if (int32(version) <= AppVersion) {
@ -571,8 +571,8 @@ bool UnpackUpdate(const QString &filepath) {
return false; return false;
} }
fVersion.write((const char*)&versionNum, sizeof(VersionInt)); fVersion.write((const char*)&versionNum, sizeof(VersionInt));
if (versionNum == 0x7FFFFFFF) { // beta version if (versionNum == 0x7FFFFFFF) { // alpha version
fVersion.write((const char*)&betaVersion, sizeof(quint64)); fVersion.write((const char*)&alphaVersion, sizeof(quint64));
} else { } else {
fVersion.write((const char*)&versionLen, sizeof(VersionInt)); fVersion.write((const char*)&versionLen, sizeof(VersionInt));
fVersion.write((const char*)&versionStr[0], versionLen); fVersion.write((const char*)&versionStr[0], versionLen);
@ -653,14 +653,14 @@ bool ParseCommonMap(
} }
const auto types = (*it).toObject(); const auto types = (*it).toObject();
const auto list = [&]() -> std::vector<QString> { const auto list = [&]() -> std::vector<QString> {
if (cBetaVersion()) { if (cAlphaVersion()) {
return { "alpha", "beta", "stable" }; return { "alpha", "beta", "stable" };
} else if (cAlphaVersion()) { } else if (cBetaVersion()) {
return { "beta", "stable" }; return { "beta", "stable" };
} }
return { "stable" }; return { "stable" };
}(); }();
auto bestIsAvailableBeta = false; auto bestIsAvailableAlpha = false;
auto bestAvailableVersion = 0ULL; auto bestAvailableVersion = 0ULL;
for (const auto &type : list) { for (const auto &type : list) {
const auto it = types.constFind(type); const auto it = types.constFind(type);
@ -677,7 +677,7 @@ bool ParseCommonMap(
if (version == map.constEnd()) { if (version == map.constEnd()) {
continue; continue;
} }
const auto isAvailableBeta = (type == "alpha"); const auto isAvailableAlpha = (type == "alpha");
const auto availableVersion = [&] { const auto availableVersion = [&] {
if ((*version).isString()) { if ((*version).isString()) {
const auto string = (*version).toString(); const auto string = (*version).toString();
@ -695,16 +695,16 @@ bool ParseCommonMap(
).arg(platform).arg(type).arg(key)); ).arg(platform).arg(type).arg(key));
return false; return false;
} }
const auto compare = isAvailableBeta const auto compare = isAvailableAlpha
? availableVersion ? availableVersion
: availableVersion * 1000; : availableVersion * 1000;
const auto bestCompare = bestIsAvailableBeta const auto bestCompare = bestIsAvailableAlpha
? bestAvailableVersion ? bestAvailableVersion
: bestAvailableVersion * 1000; : bestAvailableVersion * 1000;
if (compare > bestCompare) { if (compare > bestCompare) {
bestAvailableVersion = availableVersion; bestAvailableVersion = availableVersion;
bestIsAvailableBeta = isAvailableBeta; bestIsAvailableAlpha = isAvailableAlpha;
if (!callback(availableVersion, isAvailableBeta, map)) { if (!callback(availableVersion, isAvailableAlpha, map)) {
return false; return false;
} }
} }
@ -972,24 +972,24 @@ std::optional<QString> HttpChecker::parseOldResponse(
} }
const auto availableVersion = old.captured(1).toULongLong(); const auto availableVersion = old.captured(1).toULongLong();
const auto url = old.captured(2); const auto url = old.captured(2);
const auto isAvailableBeta = url.startsWith(qstr("beta_")); const auto isAvailableAlpha = url.startsWith(qstr("beta_"));
return validateLatestUrl( return validateLatestUrl(
availableVersion, availableVersion,
isAvailableBeta, isAvailableAlpha,
isAvailableBeta ? url.mid(5) + "_{signature}" : url); isAvailableAlpha ? url.mid(5) + "_{signature}" : url);
} }
std::optional<QString> HttpChecker::parseResponse( std::optional<QString> HttpChecker::parseResponse(
const QByteArray &response) const { const QByteArray &response) const {
auto bestAvailableVersion = 0ULL; auto bestAvailableVersion = 0ULL;
auto bestIsAvailableBeta = false; auto bestIsAvailableAlpha = false;
auto bestLink = QString(); auto bestLink = QString();
const auto accumulate = [&]( const auto accumulate = [&](
uint64 version, uint64 version,
bool isBeta, bool isAlpha,
const QJsonObject &map) { const QJsonObject &map) {
bestAvailableVersion = version; bestAvailableVersion = version;
bestIsAvailableBeta = isBeta; bestIsAvailableAlpha = isAlpha;
const auto link = map.constFind("link"); const auto link = map.constFind("link");
if (link == map.constEnd()) { if (link == map.constEnd()) {
LOG(("Update Error: Link not found for version %1." LOG(("Update Error: Link not found for version %1."
@ -1009,28 +1009,28 @@ std::optional<QString> HttpChecker::parseResponse(
} }
return validateLatestUrl( return validateLatestUrl(
bestAvailableVersion, bestAvailableVersion,
bestIsAvailableBeta, bestIsAvailableAlpha,
Local::readAutoupdatePrefix() + bestLink); Local::readAutoupdatePrefix() + bestLink);
} }
QString HttpChecker::validateLatestUrl( QString HttpChecker::validateLatestUrl(
uint64 availableVersion, uint64 availableVersion,
bool isAvailableBeta, bool isAvailableAlpha,
QString url) const { QString url) const {
const auto myVersion = isAvailableBeta const auto myVersion = isAvailableAlpha
? cBetaVersion() ? cAlphaVersion()
: uint64(AppVersion); : uint64(AppVersion);
const auto validVersion = (cBetaVersion() || !isAvailableBeta); const auto validVersion = (cAlphaVersion() || !isAvailableAlpha);
if (!validVersion || availableVersion <= myVersion) { if (!validVersion || availableVersion <= myVersion) {
return QString(); return QString();
} }
const auto versionUrl = url.replace( const auto versionUrl = url.replace(
"{version}", "{version}",
QString::number(availableVersion)); QString::number(availableVersion));
const auto finalUrl = isAvailableBeta const auto finalUrl = isAvailableAlpha
? QString(versionUrl).replace( ? QString(versionUrl).replace(
"{signature}", "{signature}",
countBetaVersionSignature(availableVersion)) countAlphaVersionSignature(availableVersion))
: versionUrl; : versionUrl;
return finalUrl; return finalUrl;
} }
@ -1365,10 +1365,10 @@ auto MtpChecker::parseText(const QByteArray &text) const
auto bestLocation = FileLocation(); auto bestLocation = FileLocation();
const auto accumulate = [&]( const auto accumulate = [&](
uint64 version, uint64 version,
bool isBeta, bool isAlpha,
const QJsonObject &map) { const QJsonObject &map) {
if (isBeta) { if (isAlpha) {
LOG(("Update Error: MTP closed beta found.")); LOG(("Update Error: MTP closed alpha found."));
return false; return false;
} }
bestAvailableVersion = version; bestAvailableVersion = version;
@ -1638,7 +1638,7 @@ private:
Implementation _httpImplementation; Implementation _httpImplementation;
Implementation _mtpImplementation; Implementation _mtpImplementation;
std::shared_ptr<Loader> _activeLoader; std::shared_ptr<Loader> _activeLoader;
bool _usingMtprotoLoader = (cBetaVersion() != 0); bool _usingMtprotoLoader = (cAlphaVersion() != 0);
QPointer<MTP::Instance> _mtproto; QPointer<MTP::Instance> _mtproto;
rpl::lifetime _lifetime; rpl::lifetime _lifetime;
@ -1761,8 +1761,8 @@ void Updater::start(bool forceWait) {
} }
_retryTimer.cancel(); _retryTimer.cancel();
const auto constDelay = cBetaVersion() ? 600 : UpdateDelayConstPart; const auto constDelay = cAlphaVersion() ? 600 : UpdateDelayConstPart;
const auto randDelay = cBetaVersion() ? 300 : UpdateDelayRandPart; const auto randDelay = cAlphaVersion() ? 300 : UpdateDelayRandPart;
const auto updateInSecs = cLastUpdateCheck() const auto updateInSecs = cLastUpdateCheck()
+ constDelay + constDelay
+ int(rand() % randDelay) + int(rand() % randDelay)
@ -2042,15 +2042,15 @@ bool checkReadyUpdate() {
ClearAll(); ClearAll();
return false; return false;
} }
if (versionNum == 0x7FFFFFFF) { // beta version if (versionNum == 0x7FFFFFFF) { // alpha version
quint64 betaVersion = 0; quint64 alphaVersion = 0;
if (fVersion.read((char*)&betaVersion, sizeof(quint64)) != sizeof(quint64)) { if (fVersion.read((char*)&alphaVersion, sizeof(quint64)) != sizeof(quint64)) {
LOG(("Update Error: cant read beta version from file '%1'").arg(versionPath)); LOG(("Update Error: cant read alpha version from file '%1'").arg(versionPath));
ClearAll(); ClearAll();
return false; return false;
} }
if (!cBetaVersion() || betaVersion <= cBetaVersion()) { if (!cAlphaVersion() || alphaVersion <= cAlphaVersion()) {
LOG(("Update Error: cant install beta version %1 having beta version %2").arg(betaVersion).arg(cBetaVersion())); LOG(("Update Error: cant install alpha version %1 having alpha version %2").arg(alphaVersion).arg(cAlphaVersion()));
ClearAll(); ClearAll();
return false; return false;
} }
@ -2147,9 +2147,9 @@ void UpdateApplication() {
} }
} }
QString countBetaVersionSignature(uint64 version) { // duplicated in packer.cpp QString countAlphaVersionSignature(uint64 version) { // duplicated in packer.cpp
if (cBetaPrivateKey().isEmpty()) { if (cAlphaPrivateKey().isEmpty()) {
LOG(("Error: Trying to count beta version signature without beta private key!")); LOG(("Error: Trying to count alpha version signature without alpha private key!"));
return QString(); return QString();
} }
@ -2162,27 +2162,27 @@ QString countBetaVersionSignature(uint64 version) { // duplicated in packer.cpp
uint32 siglen = 0; uint32 siglen = 0;
RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cBetaPrivateKey().constData()), -1), 0, 0, 0); RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cAlphaPrivateKey().constData()), -1), 0, 0, 0);
if (!prKey) { if (!prKey) {
LOG(("Error: Could not read beta private key!")); LOG(("Error: Could not read alpha private key!"));
return QString(); return QString();
} }
if (RSA_size(prKey) != keySize) { if (RSA_size(prKey) != keySize) {
LOG(("Error: Bad beta private key size: %1").arg(RSA_size(prKey))); LOG(("Error: Bad alpha private key size: %1").arg(RSA_size(prKey)));
RSA_free(prKey); RSA_free(prKey);
return QString(); return QString();
} }
QByteArray signature; QByteArray signature;
signature.resize(keySize); signature.resize(keySize);
if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature
LOG(("Error: Counting beta version signature failed!")); LOG(("Error: Counting alpha version signature failed!"));
RSA_free(prKey); RSA_free(prKey);
return QString(); return QString();
} }
RSA_free(prKey); RSA_free(prKey);
if (siglen != keySize) { if (siglen != keySize) {
LOG(("Error: Bad beta version signature length: %1").arg(siglen)); LOG(("Error: Bad alpha version signature length: %1").arg(siglen));
return QString(); return QString();
} }

2
Telegram/SourceFiles/core/update_checker.h
View File

@ -55,6 +55,6 @@ private:
bool checkReadyUpdate(); bool checkReadyUpdate();
void UpdateApplication(); void UpdateApplication();
QString countBetaVersionSignature(uint64 version); QString countAlphaVersionSignature(uint64 version);
} // namespace Core } // namespace Core

6
Telegram/SourceFiles/core/version.h
View File

@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/utils.h" #include "core/utils.h"
#define BETA_VERSION_MACRO (1003016007ULL) #define ALPHA_VERSION_MACRO (1003016007ULL)
constexpr int AppVersion = 1003016; constexpr int AppVersion = 1003016;
constexpr str_const AppVersionStr = "1.3.16"; constexpr str_const AppVersionStr = "1.3.16";
constexpr bool AppAlphaVersion = false; constexpr bool AppBetaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppAlphaVersion = ALPHA_VERSION_MACRO;

81
Telegram/SourceFiles/facades.cpp
View File

@ -371,41 +371,68 @@ uint64 SandboxUserTag = 0;
namespace Sandbox { namespace Sandbox {
bool CheckBetaVersionDir() { bool MoveLegacyAlphaFolder() {
QFile beta(cExeDir() + qsl("TelegramBeta_data/tdata/beta")); const auto was = cExeDir() + qsl("TelegramBeta_data");
if (cBetaVersion()) { const auto now = cExeDir() + qsl("TelegramAlpha_data");
cForceWorkingDir(cExeDir() + qsl("TelegramBeta_data/")); if (QDir(was).exists() && !QDir(now).exists()) {
QDir().mkpath(cWorkingDir() + qstr("tdata")); const auto oldFile = was + "/tdata/beta";
if (*BetaPrivateKey) { const auto newFile = was + "/tdata/alpha";
cSetBetaPrivateKey(QByteArray(BetaPrivateKey)); if (QFile(oldFile).exists() && !QFile(newFile).exists()) {
if (!QFile(oldFile).copy(newFile)) {
LOG(("FATAL: Could not copy '%1' to '%2'"
).arg(oldFile
).arg(newFile));
return false;
}
} }
if (beta.open(QIODevice::WriteOnly)) { if (!QDir().rename(was, now)) {
QDataStream dataStream(&beta); LOG(("FATAL: Could not rename '%1' to '%2'"
dataStream.setVersion(QDataStream::Qt_5_3); ).arg(was
dataStream << quint64(cRealBetaVersion()) << cBetaPrivateKey(); ).arg(now));
} else {
LOG(("FATAL: Could not open '%1' for writing private key!").arg(beta.fileName()));
return false; return false;
} }
} else if (beta.exists()) { }
cForceWorkingDir(cExeDir() + qsl("TelegramBeta_data/")); return true;
if (beta.open(QIODevice::ReadOnly)) { }
QDataStream dataStream(&beta);
bool CheckAlphaVersionDir() {
if (!MoveLegacyAlphaFolder()) {
return false;
}
QFile alpha(cExeDir() + qsl("TelegramAlpha_data/tdata/alpha"));
if (cAlphaVersion()) {
cForceWorkingDir(cExeDir() + qsl("TelegramAlpha_data/"));
QDir().mkpath(cWorkingDir() + qstr("tdata"));
if (*AlphaPrivateKey) {
cSetAlphaPrivateKey(QByteArray(AlphaPrivateKey));
}
if (alpha.open(QIODevice::WriteOnly)) {
QDataStream dataStream(&alpha);
dataStream.setVersion(QDataStream::Qt_5_3);
dataStream << quint64(cRealAlphaVersion()) << cAlphaPrivateKey();
} else {
LOG(("FATAL: Could not open '%1' for writing private key!").arg(alpha.fileName()));
return false;
}
} else if (alpha.exists()) {
cForceWorkingDir(cExeDir() + qsl("TelegramAlpha_data/"));
if (alpha.open(QIODevice::ReadOnly)) {
QDataStream dataStream(&alpha);
dataStream.setVersion(QDataStream::Qt_5_3); dataStream.setVersion(QDataStream::Qt_5_3);
quint64 v; quint64 v;
QByteArray k; QByteArray k;
dataStream >> v >> k; dataStream >> v >> k;
if (dataStream.status() == QDataStream::Ok && !k.isEmpty()) { if (dataStream.status() == QDataStream::Ok && !k.isEmpty()) {
cSetBetaVersion(AppVersion * 1000ULL); cSetAlphaVersion(AppVersion * 1000ULL);
cSetBetaPrivateKey(k); cSetAlphaPrivateKey(k);
cSetRealBetaVersion(v); cSetRealAlphaVersion(v);
} else { } else {
LOG(("FATAL: '%1' is corrupted, reinstall private beta!").arg(beta.fileName())); LOG(("FATAL: '%1' is corrupted, reinstall private alpha!").arg(alpha.fileName()));
return false; return false;
} }
} else { } else {
LOG(("FATAL: could not open '%1' for reading private key!").arg(beta.fileName())); LOG(("FATAL: could not open '%1' for reading private key!").arg(alpha.fileName()));
return false; return false;
} }
} }
@ -420,11 +447,11 @@ void WorkingDirReady() {
&& QFile(cWorkingDir() + qsl("tdata/withdebug")).exists()) { && QFile(cWorkingDir() + qsl("tdata/withdebug")).exists()) {
Logs::SetDebugEnabled(true); Logs::SetDebugEnabled(true);
} }
if (cBetaVersion()) { if (cAlphaVersion()) {
cSetAlphaVersion(false); cSetBetaVersion(false);
} else if (!cAlphaVersion() && QFile(cWorkingDir() + qsl("tdata/devversion")).exists()) { } else if (!cBetaVersion() && QFile(cWorkingDir() + qsl("tdata/devversion")).exists()) {
cSetAlphaVersion(true); cSetBetaVersion(true);
} else if (AppAlphaVersion) { } else if (AppBetaVersion) {
QFile f(cWorkingDir() + qsl("tdata/devversion")); QFile f(cWorkingDir() + qsl("tdata/devversion"));
if (!f.exists() && f.open(QIODevice::WriteOnly)) { if (!f.exists() && f.open(QIODevice::WriteOnly)) {
f.write("1"); f.write("1");

2
Telegram/SourceFiles/facades.h
View File

@ -185,7 +185,7 @@ inline bool IsTopCorner(ScreenCorner corner) {
namespace Sandbox { namespace Sandbox {
bool CheckBetaVersionDir(); bool CheckAlphaVersionDir();
void WorkingDirReady(); void WorkingDirReady();
void MainThreadTaskAdded(); void MainThreadTaskAdded();

4
Telegram/SourceFiles/intro/introphone.cpp
View File

@ -25,8 +25,8 @@ namespace {
void SendToBannedHelp(const QString &phone) { void SendToBannedHelp(const QString &phone) {
const auto version = QString::fromLatin1(AppVersionStr.c_str()) const auto version = QString::fromLatin1(AppVersionStr.c_str())
+ (cAlphaVersion() ? " alpha" : "") + (cBetaVersion() ? " beta" : "")
+ (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString()); + (cAlphaVersion() ? qsl(" alpha %1").arg(cAlphaVersion()) : QString());
const auto subject = qsl("Banned phone number: ") + phone; const auto subject = qsl("Banned phone number: ") + phone;

6
Telegram/SourceFiles/logs.cpp
View File

@ -322,7 +322,7 @@ bool DebugEnabled() {
void start(not_null<Core::Launcher*> launcher) { void start(not_null<Core::Launcher*> launcher) {
Assert(LogsData == 0); Assert(LogsData == 0);
if (!Sandbox::CheckBetaVersionDir()) { if (!Sandbox::CheckAlphaVersionDir()) {
return; return;
} }
@ -330,7 +330,7 @@ void start(not_null<Core::Launcher*> launcher) {
auto moveOldDataFrom = QString(); auto moveOldDataFrom = QString();
auto workingDirChosen = false; auto workingDirChosen = false;
if (cBetaVersion()) { if (cAlphaVersion()) {
SetDebugEnabled(true); SetDebugEnabled(true);
workingDirChosen = true; workingDirChosen = true;
#if defined Q_OS_MAC || defined Q_OS_LINUX #if defined Q_OS_MAC || defined Q_OS_LINUX
@ -397,7 +397,7 @@ void start(not_null<Core::Launcher*> launcher) {
LogsData = 0; LogsData = 0;
} }
LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cAlphaVersion())).arg(cBetaVersion()).arg(Logs::b(DebugEnabled())).arg(Logs::b(cTestMode()))); LOG(("Launched version: %1, beta: %2, alpha: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cBetaVersion())).arg(cAlphaVersion()).arg(Logs::b(DebugEnabled())).arg(Logs::b(cTestMode())));
LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName())); LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName()));
LOG(("Initial working dir: %1").arg(initialWorkingDir)); LOG(("Initial working dir: %1").arg(initialWorkingDir));
LOG(("Working dir: %1").arg(cWorkingDir())); LOG(("Working dir: %1").arg(cWorkingDir()));

77
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -175,81 +175,6 @@ QStringList addr2linestr(uint64 *addresses, int count) {
return result; return result;
} }
QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
QString initial = QString::fromUtf8(crashdump), result;
QStringList lines = initial.split('\n');
result.reserve(initial.size());
int32 i = 0, l = lines.size();
while (i < l) {
uint64 addresses[1024] = { 0 };
for (; i < l; ++i) {
result.append(lines.at(i)).append('\n');
QString line = lines.at(i).trimmed();
if (line == qstr("Backtrace:")) {
++i;
break;
}
}
int32 start = i;
for (; i < l; ++i) {
QString line = lines.at(i).trimmed();
if (line.isEmpty()) break;
QRegularExpressionMatch m1 = QRegularExpression(qsl("^(.+)\\(([^+]+)\\+([^\\)]+)\\)\\[(.+)\\]$")).match(line);
QRegularExpressionMatch m2 = QRegularExpression(qsl("^(.+)\\[(.+)\\]$")).match(line);
QString addrstr = m1.hasMatch() ? m1.captured(4) : (m2.hasMatch() ? m2.captured(2) : QString());
if (!addrstr.isEmpty()) {
uint64 addr = addrstr.startsWith(qstr("0x")) ? addrstr.mid(2).toULongLong(0, 16) : addrstr.toULongLong();
if (addr > 1) {
addresses[i - start] = addr;
}
}
}
QStringList addr2line = addr2linestr(addresses, i - start);
for (i = start; i < l; ++i) {
QString line = lines.at(i).trimmed();
if (line.isEmpty()) break;
result.append(qsl("\n%1. ").arg(i - start));
if (line.startsWith(qstr("ERROR: "))) {
result.append(line).append('\n');
continue;
}
if (line == qstr("[0x1]")) {
result.append(qsl("(0x1 separator)\n"));
continue;
}
QRegularExpressionMatch m1 = QRegularExpression(qsl("^(.+)\\(([^+]*)\\+([^\\)]+)\\)(.+)$")).match(line);
QRegularExpressionMatch m2 = QRegularExpression(qsl("^(.+)\\[(.+)\\]$")).match(line);
if (!m1.hasMatch() && !m2.hasMatch()) {
result.append(qstr("BAD LINE: ")).append(line).append('\n');
continue;
}
if (m1.hasMatch()) {
result.append(demanglestr(m1.captured(2))).append(qsl(" + ")).append(m1.captured(3)).append(qsl(" [")).append(m1.captured(1)).append(qsl("] "));
if (!addr2line.at(i - start).isEmpty() && addr2line.at(i - start) != qsl("??:0")) {
result.append(qsl(" (")).append(addr2line.at(i - start)).append(qsl(")\n"));
} else {
result.append(m1.captured(4)).append(qsl(" (demangled)")).append('\n');
}
} else {
result.append('[').append(m2.captured(1)).append(']');
if (!addr2line.at(i - start).isEmpty() && addr2line.at(i - start) != qsl("??:0")) {
result.append(qsl(" (")).append(addr2line.at(i - start)).append(qsl(")\n"));
} else {
result.append(' ').append(m2.captured(2)).append('\n');
}
}
}
}
return result;
}
bool _removeDirectory(const QString &path) { // from http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c bool _removeDirectory(const QString &path) { // from http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c
QByteArray pathRaw = QFile::encodeName(path); QByteArray pathRaw = QFile::encodeName(path);
DIR *d = opendir(pathRaw.constData()); DIR *d = opendir(pathRaw.constData());
@ -409,7 +334,7 @@ QString SystemLanguage() {
void RegisterCustomScheme() { void RegisterCustomScheme() {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME #ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
auto home = getHomeDir(); auto home = getHomeDir();
if (home.isEmpty() || cBetaVersion() || cExeName().isEmpty()) return; // don't update desktop file for beta version if (home.isEmpty() || cAlphaVersion() || cExeName().isEmpty()) return; // don't update desktop file for alpha version
if (Core::UpdaterDisabled()) if (Core::UpdaterDisabled())
return; return;

1
Telegram/SourceFiles/platform/linux/specific_linux.h
View File

@ -44,7 +44,6 @@ inline void psCheckLocalSocket(const QString &serverName) {
} }
void psWriteDump(); void psWriteDump();
QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile);
void psDeleteDir(const QString &dir); void psDeleteDir(const QString &dir);

1
Telegram/SourceFiles/platform/mac/specific_mac.h
View File

@ -43,7 +43,6 @@ inline void psCheckLocalSocket(const QString &serverName) {
} }
void psWriteDump(); void psWriteDump();
QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile);
void psDeleteDir(const QString &dir); void psDeleteDir(const QString &dir);

121
Telegram/SourceFiles/platform/mac/specific_mac.mm
View File

@ -164,127 +164,6 @@ QStringList atosstr(uint64 *addresses, int count, uint64 base) {
} }
QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
QString initial = QString::fromUtf8(crashdump), result;
QStringList lines = initial.split('\n');
result.reserve(initial.size());
int32 i = 0, l = lines.size();
while (i < l) {
uint64 addresses[1024] = { 0 };
for (; i < l; ++i) {
result.append(lines.at(i)).append('\n');
QString line = lines.at(i).trimmed();
if (line == qstr("Base image addresses:")) {
++i;
break;
}
}
uint64 base = 0;
for (int32 start = i; i < l; ++i) {
QString line = lines.at(i).trimmed();
if (line.isEmpty()) break;
if (!base) {
QRegularExpressionMatch m = QRegularExpression(qsl("^\\d+ (\\d+) \\((.+)\\)")).match(line);
if (m.hasMatch()) {
if (uint64 address = m.captured(1).toULongLong()) {
if (m.captured(2).endsWith(qstr("Contents/MacOS/Telegram"))) {
base = address;
}
}
}
}
}
if (base) {
result.append(qsl("(base address read: 0x%1)\n").arg(base, 0, 16));
} else {
result.append(qsl("ERROR: base address not read!\n"));
}
for (; i < l; ++i) {
result.append(lines.at(i)).append('\n');
QString line = lines.at(i).trimmed();
if (line == qstr("Backtrace:")) {
++i;
break;
}
}
int32 start = i;
for (; i < l; ++i) {
QString line = lines.at(i).trimmed();
if (line.isEmpty()) break;
if (QRegularExpression(qsl("^\\d+")).match(line).hasMatch()) {
QStringList lst = line.split(' ', QString::SkipEmptyParts);
if (lst.size() > 2) {
uint64 addr = lst.at(2).startsWith(qstr("0x")) ? lst.at(2).mid(2).toULongLong(0, 16) : lst.at(2).toULongLong();
addresses[i - start] = addr;
}
}
}
QStringList atos = atosstr(addresses, i - start, base);
for (i = start; i < l; ++i) {
QString line = lines.at(i).trimmed();
if (line.isEmpty()) break;
if (!QRegularExpression(qsl("^\\d+")).match(line).hasMatch()) {
if (!lines.at(i).startsWith(qstr("ERROR: "))) {
result.append(qstr("BAD LINE: "));
}
result.append(line).append('\n');
continue;
}
QStringList lst = line.split(' ', QString::SkipEmptyParts);
result.append('\n').append(lst.at(0)).append(qsl(". "));
if (lst.size() < 3) {
result.append(qstr("BAD LINE: ")).append(line).append('\n');
continue;
}
if (lst.size() > 5 && lst.at(3) == qsl("0x0") && lst.at(4) == qsl("+") && lst.at(5) == qsl("1")) {
result.append(qsl("(0x1 separator)\n"));
continue;
}
if (i - start < atos.size()) {
if (!atos.at(i - start).isEmpty()) {
result.append(atos.at(i - start)).append('\n');
continue;
}
}
for (int j = 1, s = lst.size();;) {
if (lst.at(j).startsWith('_')) {
result.append(demanglestr(lst.at(j)));
if (++j < s) {
result.append(' ');
for (;;) {
result.append(lst.at(j));
if (++j < s) {
result.append(' ');
} else {
break;
}
}
}
break;
} else if (j > 2) {
result.append(lst.at(j));
}
if (++j < s) {
result.append(' ');
} else {
break;
}
}
result.append(qsl(" [demangled]")).append('\n');
}
}
return result;
}
void psDeleteDir(const QString &dir) { void psDeleteDir(const QString &dir) {
objc_deleteDir(dir); objc_deleteDir(dir);
} }

166
Telegram/SourceFiles/platform/win/specific_win.cpp
View File

@ -1069,172 +1069,6 @@ BOOL _getModuleInfo(HANDLE hProcess, DWORD64 baseAddr, IMAGEHLP_MODULEW64 *pModu
void psWriteDump() { void psWriteDump() {
} }
char ImageHlpSymbol64[sizeof(IMAGEHLP_SYMBOL64) + StackEntryMaxNameLength];
QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
if (!LoadDbgHelp(true) || cExeName().isEmpty()) {
return qsl("ERROR: could not init dbghelp.dll!");
}
HANDLE hProcess = GetCurrentProcess();
QString initial = QString::fromUtf8(crashdump), result;
QStringList lines = initial.split('\n');
result.reserve(initial.size());
int32 i = 0, l = lines.size();
QString versionstr;
uint64 version = 0, betaversion = 0;
for (; i < l; ++i) {
result.append(lines.at(i)).append('\n');
QString line = lines.at(i).trimmed();
if (line.startsWith(qstr("Version: "))) {
versionstr = line.mid(qstr("Version: ").size()).trimmed();
version = versionstr.toULongLong();
if (versionstr.endsWith(qstr("beta"))) {
if (version % 1000) {
betaversion = version;
} else {
version /= 1000;
}
}
++i;
break;
}
}
// maybe need to launch another executable
QString tolaunch;
if ((betaversion && betaversion != cBetaVersion()) || (!betaversion && version && version != AppVersion)) {
QString path = cExeDir();
QRegularExpressionMatch m = QRegularExpression("deploy/\\d+\\.\\d+/\\d+\\.\\d+\\.\\d+(/|\\.dev/|\\.alpha/|_\\d+/)(Telegram/)?$").match(path);
if (m.hasMatch()) {
QString base = path.mid(0, m.capturedStart()) + qstr("deploy/");
int32 major = version / 1000000, minor = (version % 1000000) / 1000, micro = (version % 1000);
base += qsl("%1.%2/%3.%4.%5").arg(major).arg(minor).arg(major).arg(minor).arg(micro);
if (betaversion) {
base += qsl("_%1").arg(betaversion);
} else if (QDir(base + qstr(".dev")).exists()) {
base += qstr(".dev");
} else if (QDir(base + qstr(".alpha")).exists()) {
base += qstr(".alpha");
}
if (QFile(base + qstr("/Telegram/Telegram.exe")).exists()) {
base += qstr("/Telegram");
}
tolaunch = base + qstr("Telegram.exe");
}
}
if (!tolaunch.isEmpty()) {
result.append(qsl("ERROR: for this crashdump executable '%1' should be used!").arg(tolaunch));
}
while (i < l) {
for (; i < l; ++i) {
result.append(lines.at(i)).append('\n');
QString line = lines.at(i).trimmed();
if (line == qstr("Backtrace:")) {
++i;
break;
}
}
IMAGEHLP_SYMBOL64 *pSym = NULL;
IMAGEHLP_MODULEW64 Module;
IMAGEHLP_LINEW64 Line;
pSym = (IMAGEHLP_SYMBOL64*)ImageHlpSymbol64;
memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + StackEntryMaxNameLength);
pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
pSym->MaxNameLength = StackEntryMaxNameLength;
memset(&Line, 0, sizeof(Line));
Line.SizeOfStruct = sizeof(Line);
memset(&Module, 0, sizeof(Module));
Module.SizeOfStruct = sizeof(Module);
StackEntry csEntry;
for (int32 start = i; i < l; ++i) {
QString line = lines.at(i).trimmed();
if (line.isEmpty()) break;
result.append(qsl("%1. ").arg(i + 1 - start));
if (!QRegularExpression(qsl("^\\d+$")).match(line).hasMatch()) {
if (!lines.at(i).startsWith(qstr("ERROR: "))) {
result.append(qstr("BAD LINE: "));
}
result.append(line).append('\n');
continue;
}
DWORD64 address = line.toULongLong();
csEntry.offset = address;
csEntry.name[0] = 0;
csEntry.undName[0] = 0;
csEntry.undFullName[0] = 0;
csEntry.offsetFromSmybol = 0;
csEntry.offsetFromLine = 0;
csEntry.lineFileName[0] = 0;
csEntry.lineNumber = 0;
csEntry.loadedImageName[0] = 0;
csEntry.moduleName[0] = 0;
if (symGetSymFromAddr64(hProcess, address, &(csEntry.offsetFromSmybol), pSym) != FALSE) {
// TODO: Mache dies sicher...!
strcpy_s(csEntry.name, pSym->Name);
unDecorateSymbolName(pSym->Name, csEntry.undName, StackEntryMaxNameLength, UNDNAME_NAME_ONLY);
unDecorateSymbolName(pSym->Name, csEntry.undFullName, StackEntryMaxNameLength, UNDNAME_COMPLETE);
if (symGetLineFromAddr64) {
if (symGetLineFromAddr64(hProcess, address, &(csEntry.offsetFromLine), &Line) != FALSE) {
csEntry.lineNumber = Line.LineNumber;
// TODO: Mache dies sicher...!
wcscpy_s(csEntry.lineFileName, Line.FileName);
}
}
} else {
result.append("ERROR: could not get Sym from Addr! for ").append(QString::number(address)).append('\n');
continue;
}
if (_getModuleInfo(hProcess, address, &Module) != FALSE) {
// TODO: Mache dies sicher...!
wcscpy_s(csEntry.moduleName, Module.ModuleName);
}
if (csEntry.name[0] == 0) {
strcpy_s(csEntry.name, "(function-name not available)");
}
if (csEntry.undName[0] != 0) {
strcpy_s(csEntry.name, csEntry.undName);
}
if (csEntry.undFullName[0] != 0) {
strcpy_s(csEntry.name, csEntry.undFullName);
}
if (csEntry.lineFileName[0] == 0) {
if (csEntry.moduleName[0] == 0) {
wcscpy_s(csEntry.moduleName, L"module-name not available");
}
result.append(csEntry.name).append(qsl(" (%1) 0x%3").arg(QString::fromWCharArray(csEntry.moduleName)).arg(address, 0, 16)).append('\n');
} else {
QString file = QString::fromWCharArray(csEntry.lineFileName).toLower();
int32 index = file.indexOf(qstr("tbuild\\tdesktop\\telegram\\"));
if (index >= 0) {
file = file.mid(index + qstr("tbuild\\tdesktop\\telegram\\").size());
if (file.startsWith(qstr("sourcefiles\\"))) {
file = file.mid(qstr("sourcefiles\\").size());
}
}
result.append(csEntry.name).append(qsl(" (%1 - %2) 0x%3").arg(file).arg(csEntry.lineNumber).arg(address, 0, 16)).append('\n');
}
}
}
symCleanup(hProcess);
return result;
}
void psWriteStackTrace() { void psWriteStackTrace() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
if (!LoadDbgHelp()) { if (!LoadDbgHelp()) {

1
Telegram/SourceFiles/platform/win/specific_win.h
View File

@ -53,7 +53,6 @@ inline void psCheckLocalSocket(const QString &) {
void psWriteDump(); void psWriteDump();
void psWriteStackTrace(); void psWriteStackTrace();
QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile);
void psDeleteDir(const QString &dir); void psDeleteDir(const QString &dir);

8
Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
View File

@ -30,7 +30,7 @@ const WCHAR AppUserModelIdRelease[] = L"Telegram.TelegramDesktop.Store";
#else // OS_WIN_STORE #else // OS_WIN_STORE
const WCHAR AppUserModelIdRelease[] = L"Telegram.TelegramDesktop"; const WCHAR AppUserModelIdRelease[] = L"Telegram.TelegramDesktop";
#endif // OS_WIN_STORE #endif // OS_WIN_STORE
const WCHAR AppUserModelIdBeta[] = L"Telegram.TelegramDesktop.Beta"; const WCHAR AppUserModelIdAlpha[] = L"Telegram.TelegramDesktop.Alpha";
} // namespace } // namespace
@ -252,8 +252,8 @@ bool validateShortcut() {
QString path = systemShortcutPath(); QString path = systemShortcutPath();
if (path.isEmpty() || cExeName().isEmpty()) return false; if (path.isEmpty() || cExeName().isEmpty()) return false;
if (cBetaVersion()) { if (cAlphaVersion()) {
path += qsl("TelegramBeta.lnk"); path += qsl("TelegramAlpha.lnk");
if (validateShortcutAt(path)) return true; if (validateShortcutAt(path)) return true;
} else { } else {
if (validateShortcutAt(path + qsl("Telegram Desktop/Telegram.lnk"))) return true; if (validateShortcutAt(path + qsl("Telegram Desktop/Telegram.lnk"))) return true;
@ -310,7 +310,7 @@ bool validateShortcut() {
} }
const WCHAR *getId() { const WCHAR *getId() {
return cBetaVersion() ? AppUserModelIdBeta : AppUserModelIdRelease; return cAlphaVersion() ? AppUserModelIdAlpha : AppUserModelIdRelease;
} }
const PROPERTYKEY &getKey() { const PROPERTYKEY &getKey() {

8
Telegram/SourceFiles/settings.cpp
View File

@ -10,10 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
bool gRtl = false; bool gRtl = false;
Qt::LayoutDirection gLangDir = gRtl ? Qt::RightToLeft : Qt::LeftToRight; Qt::LayoutDirection gLangDir = gRtl ? Qt::RightToLeft : Qt::LeftToRight;
bool gAlphaVersion = AppAlphaVersion; bool gBetaVersion = AppBetaVersion;
uint64 gBetaVersion = AppBetaVersion; uint64 gAlphaVersion = AppAlphaVersion;
uint64 gRealBetaVersion = AppBetaVersion; uint64 gRealAlphaVersion = AppAlphaVersion;
QByteArray gBetaPrivateKey; QByteArray gAlphaPrivateKey;
bool gTestMode = false; bool gTestMode = false;
bool gManyInstance = false; bool gManyInstance = false;

8
Telegram/SourceFiles/settings.h
View File

@ -28,10 +28,10 @@ inline bool rtl() {
return cRtl(); return cRtl();
} }
DeclareSetting(bool, AlphaVersion); DeclareSetting(bool, BetaVersion);
DeclareSetting(uint64, BetaVersion); DeclareSetting(uint64, AlphaVersion);
DeclareSetting(uint64, RealBetaVersion); DeclareSetting(uint64, RealAlphaVersion);
DeclareSetting(QByteArray, BetaPrivateKey); DeclareSetting(QByteArray, AlphaPrivateKey);
DeclareSetting(bool, TestMode); DeclareSetting(bool, TestMode);
DeclareSetting(QString, LoggedPhoneNumber); DeclareSetting(QString, LoggedPhoneNumber);

52
Telegram/build/build.bat
View File

@ -23,15 +23,15 @@ if "%BuildTarget%" equ "uwp" (
FOR /F "tokens=1,2* delims= " %%i in (%FullScriptPath%version) do set "%%i=%%j" FOR /F "tokens=1,2* delims= " %%i in (%FullScriptPath%version) do set "%%i=%%j"
set "VersionForPacker=%AppVersion%" set "VersionForPacker=%AppVersion%"
if %BetaVersion% neq 0 ( if %AlphaVersion% neq 0 (
set "AppVersion=%BetaVersion%" set "AppVersion=%AlphaVersion%"
set "AppVersionStrFull=%AppVersionStr%_%BetaVersion%" set "AppVersionStrFull=%AppVersionStr%_%AlphaVersion%"
set "AlphaBetaParam=-beta %BetaVersion%" set "AlphaBetaParam=-alpha %AlphaVersion%"
set "BetaKeyFile=tbeta_%BetaVersion%_key" set "AlphaKeyFile=talpha_%AlphaVersion%_key"
) else ( ) else (
if %AlphaChannel% neq 0 ( if %BetaChannel% neq 0 (
set "AlphaBetaParam=-alpha" set "AlphaBetaParam=-beta"
set "AppVersionStrFull=%AppVersionStr%.alpha" set "AppVersionStrFull=%AppVersionStr%.beta"
) else ( ) else (
set "AlphaBetaParam=" set "AlphaBetaParam="
set "AppVersionStrFull=%AppVersionStr%" set "AppVersionStrFull=%AppVersionStr%"
@ -76,13 +76,13 @@ if %BuildUWP% neq 0 (
exit /b 1 exit /b 1
) )
) )
if %BetaVersion% neq 0 ( if %AlphaVersion% neq 0 (
if exist %DeployPath%\ ( if exist %DeployPath%\ (
echo Deploy folder for version %AppVersionStr% already exists! echo Deploy folder for version %AppVersionStr% already exists!
exit /b 1 exit /b 1
) )
if exist %ReleasePath%\%BetaKeyFile% ( if exist %ReleasePath%\%AlphaKeyFile% (
echo Beta version key file for version %AppVersion% already exists! echo Alpha version key file for version %AppVersion% already exists!
exit /b 1 exit /b 1
) )
) else ( ) else (
@ -90,8 +90,8 @@ if %BetaVersion% neq 0 (
echo Deploy folder for version %AppVersionStr%.alpha already exists! echo Deploy folder for version %AppVersionStr%.alpha already exists!
exit /b 1 exit /b 1
) )
if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%.dev\ ( if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%.beta\ (
echo Deploy folder for version %AppVersionStr%.dev already exists! echo Deploy folder for version %AppVersionStr%.beta already exists!
exit /b 1 exit /b 1
) )
if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\ ( if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\ (
@ -138,7 +138,7 @@ if %BuildUWP% equ 0 (
call "%SignPath%" "Updater.exe" call "%SignPath%" "Updater.exe"
if %errorlevel% neq 0 goto error if %errorlevel% neq 0 goto error
if %BetaVersion% equ 0 ( if %AlphaVersion% equ 0 (
iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% "/dReleasePath=%ReleasePath%" "%FullScriptPath%setup.iss" iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% "/dReleasePath=%ReleasePath%" "%FullScriptPath%setup.iss"
if %errorlevel% neq 0 goto error if %errorlevel% neq 0 goto error
if not exist "tsetup.%AppVersionStrFull%.exe" goto error if not exist "tsetup.%AppVersionStrFull%.exe" goto error
@ -150,19 +150,19 @@ if %BuildUWP% equ 0 (
call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe %AlphaBetaParam% call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe %AlphaBetaParam%
if %errorlevel% neq 0 goto error if %errorlevel% neq 0 goto error
if %BetaVersion% neq 0 ( if %AlphaVersion% neq 0 (
if not exist "%ReleasePath%\%BetaKeyFile%" ( if not exist "%ReleasePath%\%AlphaKeyFile%" (
echo Beta version key file not found! echo Alpha version key file not found!
exit /b 1 exit /b 1
) )
FOR /F "tokens=1* delims= " %%i in (%ReleasePath%\%BetaKeyFile%) do set "BetaSignature=%%i" FOR /F "tokens=1* delims= " %%i in (%ReleasePath%\%AlphaKeyFile%) do set "AlphaSignature=%%i"
) )
if %errorlevel% neq 0 goto error if %errorlevel% neq 0 goto error
if %BetaVersion% neq 0 ( if %AlphaVersion% neq 0 (
set "UpdateFile=!UpdateFile!_!BetaSignature!" set "UpdateFile=!UpdateFile!_!AlphaSignature!"
set "PortableFile=tbeta!BetaVersion!_!BetaSignature!.zip" set "PortableFile=talpha!AlphaVersion!_!AlphaSignature!.zip"
) )
) )
@ -239,10 +239,10 @@ if %BuildUWP% neq 0 (
xcopy "%ReleasePath%\Updater.pdb" "%DeployPath%\" xcopy "%ReleasePath%\Updater.pdb" "%DeployPath%\"
move "%ReleasePath%\%BinaryName%.exe.pdb" "%DeployPath%\" move "%ReleasePath%\%BinaryName%.exe.pdb" "%DeployPath%\"
move "%ReleasePath%\Updater.exe.pdb" "%DeployPath%\" move "%ReleasePath%\Updater.exe.pdb" "%DeployPath%\"
if %BetaVersion% equ 0 ( if %AlphaVersion% equ 0 (
move "%ReleasePath%\%SetupFile%" "%DeployPath%\" move "%ReleasePath%\%SetupFile%" "%DeployPath%\"
) else ( ) else (
move "%ReleasePath%\%BetaKeyFile%" "%DeployPath%\" move "%ReleasePath%\%AlphaKeyFile%" "%DeployPath%\"
) )
move "%ReleasePath%\%UpdateFile%" "%DeployPath%\" move "%ReleasePath%\%UpdateFile%" "%DeployPath%\"
if %errorlevel% neq 0 goto error if %errorlevel% neq 0 goto error
@ -265,7 +265,7 @@ if %BuildUWP% equ 0 (
if not exist "%DeployPath%\%UpdateFile%" goto error if not exist "%DeployPath%\%UpdateFile%" goto error
if not exist "%DeployPath%\%PortableFile%" goto error if not exist "%DeployPath%\%PortableFile%" goto error
if %BetaVersion% equ 0 ( if %AlphaVersion% equ 0 (
if not exist "%DeployPath%\%SetupFile%" goto error if not exist "%DeployPath%\%SetupFile%" goto error
) )
if not exist "%DeployPath%\%BinaryName%.pdb" goto error if not exist "%DeployPath%\%BinaryName%.pdb" goto error
@ -277,10 +277,10 @@ if %BuildUWP% equ 0 (
xcopy "%DeployPath%\%UpdateFile%" "%FinalDeployPath%\" /Y xcopy "%DeployPath%\%UpdateFile%" "%FinalDeployPath%\" /Y
xcopy "%DeployPath%\%PortableFile%" "%FinalDeployPath%\" /Y xcopy "%DeployPath%\%PortableFile%" "%FinalDeployPath%\" /Y
if %BetaVersion% equ 0 ( if %AlphaVersion% equ 0 (
xcopy "%DeployPath%\%SetupFile%" "%FinalDeployPath%\" /Y xcopy "%DeployPath%\%SetupFile%" "%FinalDeployPath%\" /Y
) else ( ) else (
xcopy "%DeployPath%\%BetaKeyFile%" "%FinalDeployPath%\" /Y xcopy "%DeployPath%\%AlphaKeyFile%" "%FinalDeployPath%\" /Y
) )
) )

80
Telegram/build/build.sh
View File

@ -33,17 +33,17 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
done < "$FullScriptPath/version" done < "$FullScriptPath/version"
VersionForPacker="$AppVersion" VersionForPacker="$AppVersion"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
AppVersion="$BetaVersion" AppVersion="$AlphaVersion"
AppVersionStrFull="${AppVersionStr}_${BetaVersion}" AppVersionStrFull="${AppVersionStr}_${AlphaVersion}"
AlphaBetaParam="-beta $BetaVersion" AlphaBetaParam="-alpha $AlphaVersion"
BetaKeyFile="tbeta_${AppVersion}_key" AlphaKeyFile="talpha_${AppVersion}_key"
elif [ "$AlphaChannel" == "0" ]; then elif [ "$BetaChannel" == "0" ]; then
AppVersionStrFull="$AppVersionStr" AppVersionStrFull="$AppVersionStr"
AlphaBetaParam='' AlphaBetaParam=''
else else
AppVersionStrFull="$AppVersionStr.alpha" AppVersionStrFull="$AppVersionStr.beta"
AlphaBetaParam='-alpha' AlphaBetaParam='-beta'
fi fi
echo "" echo ""
@ -73,8 +73,8 @@ elif [ "$BuildTarget" == "mac32" ]; then
ReleasePath="$HomePath/../out/Release" ReleasePath="$HomePath/../out/Release"
BinaryName="Telegram" BinaryName="Telegram"
elif [ "$BuildTarget" == "macstore" ]; then elif [ "$BuildTarget" == "macstore" ]; then
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
Error "Can't build macstore beta version!" Error "Can't build macstore alpha version!"
fi fi
echo "Building version $AppVersionStrFull for Mac App Store.." echo "Building version $AppVersionStrFull for Mac App Store.."
@ -85,9 +85,9 @@ else
fi fi
#if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then #if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
if [ -f "$ReleasePath/$BetaKeyFile" ]; then if [ -f "$ReleasePath/$AlphaKeyFile" ]; then
Error "Beta version key file for version $AppVersion already exists!" Error "Alpha version key file for version $AppVersion already exists!"
fi fi
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStrFull" ]; then if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStrFull" ]; then
@ -98,8 +98,8 @@ fi
Error "Deploy folder for version $AppVersionStr.alpha already exists!" Error "Deploy folder for version $AppVersionStr.alpha already exists!"
fi fi
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.dev" ]; then if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.beta" ]; then
Error "Deploy folder for version $AppVersionStr.dev already exists!" Error "Deploy folder for version $AppVersionStr.beta already exists!"
fi fi
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr" ]; then if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr" ]; then
@ -197,17 +197,17 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
"./Packer" -path "$BinaryName" -path Updater -version $VersionForPacker $AlphaBetaParam "./Packer" -path "$BinaryName" -path Updater -version $VersionForPacker $AlphaBetaParam
echo "Packer done!" echo "Packer done!"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
if [ ! -f "$ReleasePath/$BetaKeyFile" ]; then if [ ! -f "$ReleasePath/$AlphaKeyFile" ]; then
Error "Beta version key file not found!" Error "Alpha version key file not found!"
fi fi
while IFS='' read -r line || [[ -n "$line" ]]; do while IFS='' read -r line || [[ -n "$line" ]]; do
BetaSignature="$line" AlphaSignature="$line"
done < "$ReleasePath/$BetaKeyFile" done < "$ReleasePath/$AlphaKeyFile"
UpdateFile="${UpdateFile}_${BetaSignature}" UpdateFile="${UpdateFile}_${AlphaSignature}"
SetupFile="tbeta${BetaVersion}_${BetaSignature}.tar.xz" SetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
fi fi
SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.sym" | awk -F " " 'END {print $4}'` SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.sym" | awk -F " " 'END {print $4}'`
@ -230,8 +230,8 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
mv "$ReleasePath/$BinaryName" "$DeployPath/$BinaryName/" mv "$ReleasePath/$BinaryName" "$DeployPath/$BinaryName/"
mv "$ReleasePath/Updater" "$DeployPath/$BinaryName/" mv "$ReleasePath/Updater" "$DeployPath/$BinaryName/"
mv "$ReleasePath/$UpdateFile" "$DeployPath/" mv "$ReleasePath/$UpdateFile" "$DeployPath/"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
mv "$ReleasePath/$BetaKeyFile" "$DeployPath/" mv "$ReleasePath/$AlphaKeyFile" "$DeployPath/"
fi fi
cd "$DeployPath" cd "$DeployPath"
tar -cJvf "$SetupFile" "$BinaryName/" tar -cJvf "$SetupFile" "$BinaryName/"
@ -239,8 +239,8 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
mkdir -p $BackupPath mkdir -p $BackupPath
cp "$SetupFile" "$BackupPath/" cp "$SetupFile" "$BackupPath/"
cp "$UpdateFile" "$BackupPath/" cp "$UpdateFile" "$BackupPath/"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
cp -v "$BetaKeyFile" "$BackupPath/" cp -v "$AlphaKeyFile" "$BackupPath/"
fi fi
fi fi
@ -334,7 +334,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
echo "Done!" echo "Done!"
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BetaVersion" == "0" ]; then if [ "$AlphaVersion" == "0" ]; then
cd "$ReleasePath" cd "$ReleasePath"
cp -f tsetup_template.dmg tsetup.temp.dmg cp -f tsetup_template.dmg tsetup.temp.dmg
TempDiskPath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.temp.dmg | awk -F "\t" 'END {print $3}'` TempDiskPath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.temp.dmg | awk -F "\t" 'END {print $3}'`
@ -348,17 +348,17 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
"./Packer" -path "$BinaryName.app" -target "$BuildTarget" -version $VersionForPacker $AlphaBetaParam "./Packer" -path "$BinaryName.app" -target "$BuildTarget" -version $VersionForPacker $AlphaBetaParam
echo "Packer done!" echo "Packer done!"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
if [ ! -f "$ReleasePath/$BetaKeyFile" ]; then if [ ! -f "$ReleasePath/$AlphaKeyFile" ]; then
Error "Beta version key file not found!" Error "Alpha version key file not found!"
fi fi
while IFS='' read -r line || [[ -n "$line" ]]; do while IFS='' read -r line || [[ -n "$line" ]]; do
BetaSignature="$line" AlphaSignature="$line"
done < "$ReleasePath/$BetaKeyFile" done < "$ReleasePath/$AlphaKeyFile"
UpdateFile="${UpdateFile}_${BetaSignature}" UpdateFile="${UpdateFile}_${AlphaSignature}"
SetupFile="tbeta${BetaVersion}_${BetaSignature}.zip" SetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
fi fi
fi fi
@ -375,11 +375,11 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
mkdir "$DeployPath" mkdir "$DeployPath"
mkdir "$DeployPath/$BinaryName" mkdir "$DeployPath/$BinaryName"
cp -r "$ReleasePath/$BinaryName.app" "$DeployPath/$BinaryName/" cp -r "$ReleasePath/$BinaryName.app" "$DeployPath/$BinaryName/"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
cd "$DeployPath" cd "$DeployPath"
zip -r "$SetupFile" "$BinaryName" zip -r "$SetupFile" "$BinaryName"
mv "$SetupFile" "$ReleasePath/" mv "$SetupFile" "$ReleasePath/"
mv "$ReleasePath/$BetaKeyFile" "$DeployPath/" mv "$ReleasePath/$AlphaKeyFile" "$DeployPath/"
fi fi
mv "$ReleasePath/$BinaryName.app.dSYM" "$DeployPath/" mv "$ReleasePath/$BinaryName.app.dSYM" "$DeployPath/"
rm "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName" rm "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName"
@ -393,16 +393,16 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
mkdir -p "$BackupPath/tmac" mkdir -p "$BackupPath/tmac"
cp "$DeployPath/$UpdateFile" "$BackupPath/tmac/" cp "$DeployPath/$UpdateFile" "$BackupPath/tmac/"
cp "$DeployPath/$SetupFile" "$BackupPath/tmac/" cp "$DeployPath/$SetupFile" "$BackupPath/tmac/"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
cp -v "$DeployPath/$BetaKeyFile" "$BackupPath/tmac/" cp -v "$DeployPath/$AlphaKeyFile" "$BackupPath/tmac/"
fi fi
fi fi
if [ "$BuildTarget" == "mac32" ]; then if [ "$BuildTarget" == "mac32" ]; then
mkdir -p "$BackupPath/tmac32" mkdir -p "$BackupPath/tmac32"
cp "$DeployPath/$UpdateFile" "$BackupPath/tmac32/" cp "$DeployPath/$UpdateFile" "$BackupPath/tmac32/"
cp "$DeployPath/$SetupFile" "$BackupPath/tmac32/" cp "$DeployPath/$SetupFile" "$BackupPath/tmac32/"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
cp -v "$DeployPath/$BetaKeyFile" "$BackupPath/tmac32/" cp -v "$DeployPath/$AlphaKeyFile" "$BackupPath/tmac32/"
fi fi
fi fi
elif [ "$BuildTarget" == "macstore" ]; then elif [ "$BuildTarget" == "macstore" ]; then

58
Telegram/build/deploy.sh
View File

@ -34,14 +34,14 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
eval $1="$2" eval $1="$2"
done < "$FullScriptPath/version" done < "$FullScriptPath/version"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
AppVersion="$BetaVersion" AppVersion="$AlphaVersion"
AppVersionStrFull="${AppVersionStr}_${BetaVersion}" AppVersionStrFull="${AppVersionStr}_${AlphaVersion}"
BetaKeyFile="tbeta_${AppVersion}_key" AlphaKeyFile="talpha_${AppVersion}_key"
elif [ "$AlphaChannel" == "0" ]; then elif [ "$BetaChannel" == "0" ]; then
AppVersionStrFull="$AppVersionStr" AppVersionStrFull="$AppVersionStr"
else else
AppVersionStrFull="$AppVersionStr.alpha" AppVersionStrFull="$AppVersionStr.beta"
fi fi
echo "" echo ""
@ -70,7 +70,7 @@ else
DeployMac="1" DeployMac="1"
DeployWin="1" DeployWin="1"
DeployLinux="1" DeployLinux="1"
if [ "$BetaVersion" == "0" ]; then if [ "$AlphaVersion" == "0" ]; then
DeployMac32="1" DeployMac32="1"
DeployLinux32="1" DeployLinux32="1"
echo "Deploying five versions of $AppVersionStrFull: for Windows, OS X 10.6 and 10.7, OS X 10.8+, Linux 64 bit and Linux 32 bit.." echo "Deploying five versions of $AppVersionStrFull: for Windows, OS X 10.6 and 10.7, OS X 10.8+, Linux 64 bit and Linux 32 bit.."
@ -108,36 +108,36 @@ Linux32SetupFile="tsetup32.$AppVersionStrFull.tar.xz"
Linux32RemoteFolder="tlinux32" Linux32RemoteFolder="tlinux32"
DeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull" DeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
if [ "$DeployTarget" == "win" ]; then if [ "$DeployTarget" == "win" ]; then
BetaFilePath="$WinDeployPath/$BetaKeyFile" AlphaFilePath="$WinDeployPath/$AlphaKeyFile"
elif [ "$DeployTarget" == "mac32" ]; then elif [ "$DeployTarget" == "mac32" ]; then
BetaFilePath="$Mac32DeployPath/$BetaKeyFile" AlphaFilePath="$Mac32DeployPath/$AlphaKeyFile"
elif [ "$DeployTarget" == "linux" ]; then elif [ "$DeployTarget" == "linux" ]; then
BetaFilePath="$LinuxDeployPath/$BetaKeyFile" AlphaFilePath="$LinuxDeployPath/$AlphaKeyFile"
elif [ "$DeployTarget" == "linux32" ]; then elif [ "$DeployTarget" == "linux32" ]; then
BetaFilePath="$Linux32DeployPath/$BetaKeyFile" AlphaFilePath="$Linux32DeployPath/$AlphaKeyFile"
else else
BetaFilePath="$MacDeployPath/$BetaKeyFile" AlphaFilePath="$MacDeployPath/$AlphaKeyFile"
fi fi
if [ ! -f "$BetaFilePath" ]; then if [ ! -f "$AlphaFilePath" ]; then
Error "Beta key file for $AppVersionStrFull not found." Error "Alpha key file for $AppVersionStrFull not found."
fi fi
while IFS='' read -r line || [[ -n "$line" ]]; do while IFS='' read -r line || [[ -n "$line" ]]; do
BetaSignature="$line" AlphaSignature="$line"
done < "$BetaFilePath" done < "$AlphaFilePath"
MacUpdateFile="${MacUpdateFile}_${BetaSignature}" MacUpdateFile="${MacUpdateFile}_${AlphaSignature}"
MacSetupFile="tbeta${BetaVersion}_${BetaSignature}.zip" MacSetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
Mac32UpdateFile="${Mac32UpdateFile}_${BetaSignature}" Mac32UpdateFile="${Mac32UpdateFile}_${AlphaSignature}"
Mac32SetupFile="tbeta${BetaVersion}_${BetaSignature}.zip" Mac32SetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
WinUpdateFile="${WinUpdateFile}_${BetaSignature}" WinUpdateFile="${WinUpdateFile}_${AlphaSignature}"
WinPortableFile="tbeta${BetaVersion}_${BetaSignature}.zip" WinPortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
LinuxUpdateFile="${LinuxUpdateFile}_${BetaSignature}" LinuxUpdateFile="${LinuxUpdateFile}_${AlphaSignature}"
LinuxSetupFile="tbeta${BetaVersion}_${BetaSignature}.tar.xz" LinuxSetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
Linux32UpdateFile="${Linux32UpdateFile}_${BetaSignature}" Linux32UpdateFile="${Linux32UpdateFile}_${AlphaSignature}"
Linux32SetupFile="tbeta${BetaVersion}_${BetaSignature}.tar.xz" Linux32SetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
fi fi
if [ "$DeployMac" == "1" ]; then if [ "$DeployMac" == "1" ]; then
@ -160,7 +160,7 @@ if [ "$DeployWin" == "1" ]; then
if [ ! -f "$WinDeployPath/$WinUpdateFile" ]; then if [ ! -f "$WinDeployPath/$WinUpdateFile" ]; then
Error "$WinUpdateFile not found!" Error "$WinUpdateFile not found!"
fi fi
if [ "$BetaVersion" == "0" ]; then if [ "$AlphaVersion" == "0" ]; then
if [ ! -f "$WinDeployPath/$WinSetupFile" ]; then if [ ! -f "$WinDeployPath/$WinSetupFile" ]; then
Error "$WinSetupFile not found!" Error "$WinSetupFile not found!"
fi fi
@ -197,7 +197,7 @@ if [ "$DeployMac32" == "1" ]; then
fi fi
if [ "$DeployWin" == "1" ]; then if [ "$DeployWin" == "1" ]; then
Files+=("tsetup/$WinUpdateFile" "tsetup/$WinPortableFile") Files+=("tsetup/$WinUpdateFile" "tsetup/$WinPortableFile")
if [ "$BetaVersion" == "0" ]; then if [ "$AlphaVersion" == "0" ]; then
Files+=("tsetup/$WinSetupFile") Files+=("tsetup/$WinSetupFile")
fi fi
fi fi

28
Telegram/build/release.py
View File

@ -59,8 +59,7 @@ url = 'https://api.github.com/'
version_parts = version.split('.') version_parts = version.split('.')
stable = 1 stable = 1
alpha = 0 beta = 0
dev = 0
if len(version_parts) < 2: if len(version_parts) < 2:
print('Error: expected at least major version ' + version) print('Error: expected at least major version ' + version)
@ -76,14 +75,10 @@ else:
version = version_major + '.' + version_parts[2] version = version_major + '.' + version_parts[2]
version_full = version version_full = version
if len(version_parts) == 4: if len(version_parts) == 4:
if version_parts[3] == 'dev': if version_parts[3] == 'beta':
dev = 1 beta = 1
stable = 0 stable = 0
version_full = version + '.dev' version_full = version + '.beta'
elif version_parts[3] == 'alpha':
alpha = 1
stable = 0
version_full = version + '.alpha'
else: else:
print('Error: unexpected version part ' + version_parts[3]) print('Error: unexpected version part ' + version_parts[3])
sys.exit(1) sys.exit(1)
@ -102,16 +97,11 @@ print('Version: ' + version_full);
local_folder = expanduser("~") + '/Telegram/backup/' + version_major + '/' + version_full local_folder = expanduser("~") + '/Telegram/backup/' + version_major + '/' + version_full
if stable == 1: if stable == 1:
if os.path.isdir(local_folder + '.dev'): if os.path.isdir(local_folder + '.beta'):
dev = 1 beta = 1
stable = 0 stable = 0
version_full = version + '.dev' version_full = version + '.beta'
local_folder = local_folder + '.dev' local_folder = local_folder + '.beta'
elif os.path.isdir(local_folder + '.alpha'):
alpha = 1
stable = 0
version_full = version + '.alpha'
local_folder = local_folder + '.alpha'
if not os.path.isdir(local_folder): if not os.path.isdir(local_folder):
print('Storage path not found: ' + local_folder) print('Storage path not found: ' + local_folder)
@ -200,7 +190,7 @@ if r.status_code == 404:
'target_commitish': commit, 'target_commitish': commit,
'name': 'v ' + version, 'name': 'v ' + version,
'body': changelog, 'body': changelog,
'prerelease': (dev == 1 or alpha == 1), 'prerelease': (beta == 1),
})) }))
checkResponseCode(r, 201) checkResponseCode(r, 201)

10
Telegram/build/release.sh
View File

@ -30,14 +30,14 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
done < "$FullScriptPath/version" done < "$FullScriptPath/version"
VersionForPacker="$AppVersion" VersionForPacker="$AppVersion"
if [ "$BetaVersion" != "0" ]; then if [ "$AlphaVersion" != "0" ]; then
Error "No releases for closed beta versions" Error "No releases for closed alpha versions"
elif [ "$AlphaChannel" == "0" ]; then elif [ "$BetaChannel" == "0" ]; then
AppVersionStrFull="$AppVersionStr" AppVersionStrFull="$AppVersionStr"
AlphaBetaParam='' AlphaBetaParam=''
else else
AppVersionStrFull="$AppVersionStr.alpha" AppVersionStrFull="$AppVersionStr.beta"
AlphaBetaParam='-alpha' AlphaBetaParam='-beta'
fi fi
cd "$FullScriptPath" cd "$FullScriptPath"

76
Telegram/build/set_version.bat
View File

@ -9,14 +9,14 @@ for /F "tokens=1,2,3,4 delims=. " %%a in ("%InputVersion%") do (
set "VersionMinor=%%b" set "VersionMinor=%%b"
set "VersionPatch=%%c" set "VersionPatch=%%c"
if "%%d" == "" ( if "%%d" == "" (
set "VersionBeta=0"
set "VersionAlpha=0" set "VersionAlpha=0"
) else if "%%d" == "alpha" (
set "VersionBeta=0" set "VersionBeta=0"
set "VersionAlpha=1" ) else if "%%d" == "beta" (
set "VersionAlpha=0"
set "VersionBeta=1"
) else ( ) else (
set "VersionBeta=%%d" set "VersionAlpha=%%d"
set "VersionAlpha=0" set "VersionBeta=0"
) )
) )
@ -35,27 +35,27 @@ if "%VersionPatchCleared%" neq "%VersionPatch%" (
echo Bad patch version! echo Bad patch version!
exit /b 1 exit /b 1
) )
if "%VersionAlpha%" neq "0" (
if "%VersionAlpha%" neq "1" (
echo Bad alpha version!
exit /b 1
)
set "VersionAlphaBool=true"
) else (
set "VersionAlphaBool=false"
)
set /a "VersionFull=%VersionMajor% * 1000000 + %VersionMinor% * 1000 + %VersionPatch%"
if "%VersionBeta%" neq "0" ( if "%VersionBeta%" neq "0" (
set /a "VersionBetaCleared=%VersionBeta% %% 1000" if "%VersionBeta%" neq "1" (
if "!VersionBetaCleared!" neq "%VersionBeta%" (
echo Bad beta version! echo Bad beta version!
exit /b 1 exit /b 1
) )
set /a "VersionBetaMul=1000 + %VersionBeta%" set "VersionBetaBool=true"
set "VersionFullBeta=%VersionFull%!VersionBetaMul:~1!"
) else ( ) else (
set "VersionFullBeta=0" set "VersionBetaBool=false"
)
set /a "VersionFull=%VersionMajor% * 1000000 + %VersionMinor% * 1000 + %VersionPatch%"
if "%VersionAlpha%" neq "0" (
set /a "VersionAlphaCleared=%VersionAlpha% %% 1000"
if "!VersionAlphaCleared!" neq "%VersionAlpha%" (
echo Bad alpha version!
exit /b 1
)
set /a "VersionAlphaMul=1000 + %VersionAlpha%"
set "VersionFullAlpha=%VersionFull%!VersionAlphaMul:~1!"
) else (
set "VersionFullAlpha=0"
) )
set "VersionStr=%VersionMajor%.%VersionMinor%.%VersionPatch%" set "VersionStr=%VersionMajor%.%VersionMinor%.%VersionPatch%"
@ -65,10 +65,10 @@ if "%VersionPatch%" neq "0" (
set "VersionStrSmall=%VersionMajor%.%VersionMinor%" set "VersionStrSmall=%VersionMajor%.%VersionMinor%"
) )
if "%VersionAlpha%" neq "0" ( if "%VersionBeta%" neq "0" (
echo Setting version: %VersionStr% alpha echo Setting version: %VersionStr% beta
) else if "%VersionBeta%" neq "0" ( ) else if "%VersionAlpha%" neq "0" (
echo Setting version: %VersionStr%.%VersionBeta% closed beta echo Setting version: %VersionStr%.%VersionAlpha% closed alpha
) else ( ) else (
echo Setting version: %VersionStr% stable echo Setting version: %VersionStr% stable
) )
@ -96,33 +96,33 @@ call :repl "Argument=(AppVersion) (\s*)\d+/$1$2 %VersionFull%" "Filename=%Versio
call :repl "Argument=(AppVersionStrMajor) (\s*)[\d\.]+/$1$2 %VersionMajor%.%VersionMinor%" "Filename=%VersionFilePath%" || goto :error call :repl "Argument=(AppVersionStrMajor) (\s*)[\d\.]+/$1$2 %VersionMajor%.%VersionMinor%" "Filename=%VersionFilePath%" || goto :error
call :repl "Argument=(AppVersionStrSmall) (\s*)[\d\.]+/$1$2 %VersionStrSmall%" "Filename=%VersionFilePath%" || goto :error call :repl "Argument=(AppVersionStrSmall) (\s*)[\d\.]+/$1$2 %VersionStrSmall%" "Filename=%VersionFilePath%" || goto :error
call :repl "Argument=(AppVersionStr) (\s*)[\d\.]+/$1$2 %VersionStr%" "Filename=%VersionFilePath%" || goto :error call :repl "Argument=(AppVersionStr) (\s*)[\d\.]+/$1$2 %VersionStr%" "Filename=%VersionFilePath%" || goto :error
call :repl "Argument=(AlphaChannel) (\s*)[\d\.]+/$1$2 %VersionAlpha%" "Filename=%VersionFilePath%" || goto :error call :repl "Argument=(BetaChannel) (\s*)[\d\.]+/$1$2 %VersionBeta%" "Filename=%VersionFilePath%" || goto :error
call :repl "Argument=(BetaVersion) (\s*)\d+/$1$2 %VersionFullBeta%" "Filename=%VersionFilePath%" || goto :error call :repl "Argument=(AlphaVersion) (\s*)\d+/$1$2 %VersionFullAlpha%" "Filename=%VersionFilePath%" || goto :error
echo Patching core/version.h... echo Patching core/version.h...
set "VersionHeaderPath=%FullScriptPath%..\SourceFiles\core\version.h" set "VersionHeaderPath=%FullScriptPath%..\SourceFiles\core\version.h"
call :repl "Argument=(BETA_VERSION_MACRO\s+)\(\d+ULL\)/$1(%VersionFullBeta%ULL)" "Filename=%VersionHeaderPath%" || goto :error call :repl "Argument=(ALPHA_VERSION_MACRO\s+)\(\d+ULL\)/$1(%VersionFullAlpha%ULL)" "Filename=%VersionHeaderPath%" || goto :error
call :repl "Argument=(AppVersion\s+=) (\s*)\d+/$1$2 %VersionFull%" "Filename=%VersionHeaderPath%" || goto :error call :repl "Argument=(AppVersion\s+=) (\s*)\d+/$1$2 %VersionFull%" "Filename=%VersionHeaderPath%" || goto :error
call :repl "Argument=(AppVersionStr\s+=) (\s*)[&hat;;]+/$1$2 &quot;%VersionStrSmall%&quot;" "Filename=%VersionHeaderPath%" || goto :error call :repl "Argument=(AppVersionStr\s+=) (\s*)[&hat;;]+/$1$2 &quot;%VersionStrSmall%&quot;" "Filename=%VersionHeaderPath%" || goto :error
call :repl "Argument=(AppAlphaVersion\s+=) (\s*)[a-z]+/$1$2 %VersionAlphaBool%" "Filename=%VersionHeaderPath%" || goto :error call :repl "Argument=(AppBetaVersion\s+=) (\s*)[a-z]+/$1$2 %VersionBetaBool%" "Filename=%VersionHeaderPath%" || goto :error
echo Patching Telegram.rc... echo Patching Telegram.rc...
set "ResourcePath=%FullScriptPath%..\Resources\winrc\Telegram.rc" set "ResourcePath=%FullScriptPath%..\Resources\winrc\Telegram.rc"
call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
call :repl "Argument=(&quot;FileVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%&quot;" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(&quot;FileVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%&quot;" "Filename=%ResourcePath%" || goto :error
call :repl "Argument=(&quot;ProductVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%&quot;" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(&quot;ProductVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%&quot;" "Filename=%ResourcePath%" || goto :error
echo Patching Updater.rc... echo Patching Updater.rc...
set "ResourcePath=%FullScriptPath%..\Resources\winrc\Updater.rc" set "ResourcePath=%FullScriptPath%..\Resources\winrc\Updater.rc"
call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
call :repl "Argument=(&quot;FileVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%&quot;" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(&quot;FileVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%&quot;" "Filename=%ResourcePath%" || goto :error
call :repl "Argument=(&quot;ProductVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%&quot;" "Filename=%ResourcePath%" || goto :error call :repl "Argument=(&quot;ProductVersion&quot;,) (\s*)&quot;\d+.\d+.\d+.\d+&quot;/$1$2 &quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%&quot;" "Filename=%ResourcePath%" || goto :error
echo Patching appxmanifest.xml... echo Patching appxmanifest.xml...
set "ResourcePath=%FullScriptPath%..\Resources\uwp\AppX\AppxManifest.xml" set "ResourcePath=%FullScriptPath%..\Resources\uwp\AppX\AppxManifest.xml"
call :repl "Argument= (Version=)&quot;\d+.\d+.\d+.\d+&quot;/ $1&quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%&quot;" "Filename=%ResourcePath%" || goto :error call :repl "Argument= (Version=)&quot;\d+.\d+.\d+.\d+&quot;/ $1&quot;%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%&quot;" "Filename=%ResourcePath%" || goto :error
exit /b exit /b

68
Telegram/build/set_version.sh
View File

@ -15,14 +15,14 @@ VersionMajor="${VersionParts[0]}"
VersionMinor="${VersionParts[1]}" VersionMinor="${VersionParts[1]}"
VersionPatch="${VersionParts[2]}" VersionPatch="${VersionParts[2]}"
if [ "${VersionParts[3]}" == "" ]; then if [ "${VersionParts[3]}" == "" ]; then
VersionBeta=0
VersionAlpha=0 VersionAlpha=0
elif [ "${VersionParts[3]}" == "alpha" ]; then
VersionBeta=0 VersionBeta=0
VersionAlpha=1 elif [ "${VersionParts[3]}" == "beta" ]; then
VersionAlpha=0
VersionBeta=1
else else
VersionBeta="${VersionParts[3]}" VersionAlpha="${VersionParts[3]}"
VersionAlpha=0 VersionBeta=0
fi fi
VersionMajorCleared=`echo "$VersionMajor % 1000" | bc` VersionMajorCleared=`echo "$VersionMajor % 1000" | bc`
@ -37,25 +37,25 @@ VersionPatchCleared=`echo "$VersionPatch % 1000" | bc`
if [ "$VersionPatchCleared" != "$VersionPatch" ]; then if [ "$VersionPatchCleared" != "$VersionPatch" ]; then
Error "Bad patch version!" Error "Bad patch version!"
fi fi
if [ "$VersionAlpha" != "0" ]; then if [ "$VersionBeta" != "0" ]; then
if [ "$VersionAlpha" != "1" ]; then if [ "$VersionBeta" != "1" ]; then
Error "Bad alpha version!" Error "Bad beta version!"
fi fi
VersionAlphaBool=true VersionBetaBool=true
else else
VersionAlphaBool=false VersionBetaBool=false
fi fi
VersionFull=`echo "$VersionMajor * 1000000 + $VersionMinor * 1000 + $VersionPatch" | bc` VersionFull=`echo "$VersionMajor * 1000000 + $VersionMinor * 1000 + $VersionPatch" | bc`
if [ "$VersionBeta" != "0" ]; then if [ "$VersionAlpha" != "0" ]; then
VersionBetaCleared=`echo "$VersionBeta % 1000" | bc` VersionAlphaCleared=`echo "$VersionAlpha % 1000" | bc`
if [ "$VersionBetaCleared" != "$VersionBeta" ]; then if [ "$VersionAlphaCleared" != "$VersionAlpha" ]; then
Error "Bad beta version!" Error "Bad alpha version!"
fi fi
VersionBetaMul=`echo "$VersionBeta + 1000" | bc` VersionAlphaMul=`echo "$VersionAlpha + 1000" | bc`
VersionFullBeta="$VersionFull${VersionBetaMul:1}" VersionFullAlpha="$VersionFull${VersionAlphaMul:1}"
else else
VersionFullBeta=0 VersionFullAlpha=0
fi fi
VersionStr="$VersionMajor.$VersionMinor.$VersionPatch" VersionStr="$VersionMajor.$VersionMinor.$VersionPatch"
@ -65,10 +65,10 @@ else
VersionStrSmall="$VersionMajor.$VersionMinor" VersionStrSmall="$VersionMajor.$VersionMinor"
fi fi
if [ "$VersionAlpha" != "0" ]; then if [ "$VersionBeta" != "0" ]; then
echo "Setting version: $VersionStr alpha" echo "Setting version: $VersionStr beta"
elif [ "$VersionBeta" != "0" ]; then elif [ "$VersionAlpha" != "0" ]; then
echo "Setting version: $VersionStr.$VersionBeta closed beta" echo "Setting version: $VersionStr.$VersionAlpha closed alpha"
else else
echo "Setting version: $VersionStr stable" echo "Setting version: $VersionStr stable"
fi fi
@ -116,30 +116,30 @@ repl "\(AppVersion\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFull" "$VersionFilePath"
repl "\(AppVersionStrMajor\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionMajor.$VersionMinor" "$VersionFilePath" repl "\(AppVersionStrMajor\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionMajor.$VersionMinor" "$VersionFilePath"
repl "\(AppVersionStrSmall\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionStrSmall" "$VersionFilePath" repl "\(AppVersionStrSmall\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionStrSmall" "$VersionFilePath"
repl "\(AppVersionStr\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionStr" "$VersionFilePath" repl "\(AppVersionStr\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionStr" "$VersionFilePath"
repl "\(AlphaChannel\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionAlpha" "$VersionFilePath" repl "\(BetaChannel\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionBeta" "$VersionFilePath"
repl "\(BetaVersion\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFullBeta" "$VersionFilePath" repl "\(AlphaVersion\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFullAlpha" "$VersionFilePath"
echo "Patching core/version.h..." echo "Patching core/version.h..."
VersionHeaderPath="$FullScriptPath/../SourceFiles/core/version.h" VersionHeaderPath="$FullScriptPath/../SourceFiles/core/version.h"
repl "\(BETA_VERSION_MACRO [ ]*\)([0-9][0-9]*ULL)" "\1(${VersionFullBeta}ULL)" "$VersionHeaderPath" repl "\(ALPHA_VERSION_MACRO [ ]*\)([0-9][0-9]*ULL)" "\1(${VersionFullAlpha}ULL)" "$VersionHeaderPath"
repl "\(AppVersion [ ]*=\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFull" "$VersionHeaderPath" repl "\(AppVersion [ ]*=\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFull" "$VersionHeaderPath"
repl "\(AppVersionStr [ ]*=\) \([ ]*\)[^;][^;]*" "\1\2 \"$VersionStrSmall\"" "$VersionHeaderPath" repl "\(AppVersionStr [ ]*=\) \([ ]*\)[^;][^;]*" "\1\2 \"$VersionStrSmall\"" "$VersionHeaderPath"
repl "\(AppAlphaVersion [ ]*=\) \([ ]*\)[a-z][a-z]*" "\1\2 $VersionAlphaBool" "$VersionHeaderPath" repl "\(AppBetaVersion [ ]*=\) \([ ]*\)[a-z][a-z]*" "\1\2 $VersionBetaBool" "$VersionHeaderPath"
echo "Patching Telegram.rc..." echo "Patching Telegram.rc..."
ResourcePath="$FullScriptPath/../Resources/winrc/Telegram.rc" ResourcePath="$FullScriptPath/../Resources/winrc/Telegram.rc"
repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath" repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath" repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath" repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath" repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
echo "Patching Updater.rc..." echo "Patching Updater.rc..."
ResourcePath="$FullScriptPath/../Resources/winrc/Updater.rc" ResourcePath="$FullScriptPath/../Resources/winrc/Updater.rc"
repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath" repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath" repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath" repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath" repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
echo "Patching appxmanifest.xml..." echo "Patching appxmanifest.xml..."
ResourcePath="$FullScriptPath/../Resources/uwp/AppX/AppxManifest.xml" ResourcePath="$FullScriptPath/../Resources/uwp/AppX/AppxManifest.xml"
repl " \(Version=\)\"[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*\"" " \1\"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath" repl " \(Version=\)\"[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*\"" " \1\"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"

4
Telegram/build/version
View File

@ -2,5 +2,5 @@ AppVersion 1003016
AppVersionStrMajor 1.3 AppVersionStrMajor 1.3
AppVersionStrSmall 1.3.16 AppVersionStrSmall 1.3.16
AppVersionStr 1.3.16 AppVersionStr 1.3.16
AlphaChannel 0 BetaChannel 0
BetaVersion 1003016007 AlphaVersion 1003016007