mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Remove 'mac32' and add 'osx' special targets.

Browse Source
This commit is contained in:
John Preston
2019-11-05 15:27:42 +03:00
parent 9a44531953
commit b94ed1fc3b
14 changed files with 96 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
QString remove;
int version = 0;
bool target32 = false;
bool targetosx = false;
QFileInfoList files;
for (int i = 0; i < argc; ++i) {
if (string("-path") == argv[i] && i + 1 < argc) {
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
files.push_back(info);
if (remove.isEmpty()) remove = info.canonicalPath() + "/";
} else if (string("-target") == argv[i] && i + 1 < argc) {
target32 = (string("mac32") == argv[i + 1]);
targetosx = (string("osx") == argv[i + 1]);
} else if (string("-version") == argv[i] && i + 1 < argc) {
version = QString(argv[i + 1]).toInt();
} else if (string("-beta") == argv[i]) {
@@ -466,7 +466,7 @@ int main(int argc, char *argv[])
#ifdef Q_OS_WIN
QString outName(QString("tupdate%1").arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_MAC
QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version));
QString outName((targetosx ? QString("tosxupd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_LINUX32
QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_LINUX64

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

@@ -92,8 +92,8 @@ void AboutBox::showVersionHistory() {
auto url = qsl("https://tdesktop.com/");
if (Platform::IsWindows()) {
url += qsl("win/%1.zip");
} else if (Platform::IsMacOldBuild()) {
url += qsl("mac32/%1.zip");
} else if (Platform::IsOSXBuild()) {
url += qsl("osx/%1.zip");
} else if (Platform::IsMac()) {
url += qsl("mac/%1.zip");
} else if (Platform::IsLinux32Bit()) {

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

@@ -328,8 +328,8 @@ QString PlatformString() {
return qsl("Windows");
} else if (Platform::IsMacStoreBuild()) {
return qsl("MacAppStore");
} else if (Platform::IsMacOldBuild()) {
return qsl("MacOSold");
} else if (Platform::IsOSXBuild()) {
return qsl("OSX");
} else if (Platform::IsMac()) {
return qsl("MacOS");
} else if (Platform::IsLinux32Bit()) {

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

@@ -222,7 +222,7 @@ QString FindUpdateFile() {
"^("
"tupdate|"
"tmacupd|"
"tmac32upd|"
"tosxupd|"
"tlinuxupd|"
"tlinux32upd"
")\\d+(_[a-z\\d]+)?$",