procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Closed beta 10002002: testin OS X build by GYP.

Browse source
This commit is contained in:
John Preston 2016-09-02 01:27:54 -04:00
parent 58f0dbe2a4
commit 07dffb948d
11 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View file

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,2,1
PRODUCTVERSION 0,10,2,1
FILEVERSION 0,10,2,2
PRODUCTVERSION 0,10,2,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.2.1"
VALUE "FileVersion", "0.10.2.2"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.2.1"
VALUE "ProductVersion", "0.10.2.2"
END
END
BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View file

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,2,1
PRODUCTVERSION 0,10,2,1
FILEVERSION 0,10,2,2
PRODUCTVERSION 0,10,2,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.10.2.1"
VALUE "FileVersion", "0.10.2.2"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.2.1"
VALUE "ProductVersion", "0.10.2.2"
END
END
BLOCK "VarFileInfo"

12
Telegram/SourceFiles/_other/packer.cpp
View file

@ -138,18 +138,6 @@ QString BetaSignature;
int main(int argc, char *argv[])
{
QString workDir;
#ifdef Q_OS_MAC
if (QDir(QString()).absolutePath() == "/") {
QString first = argc ? QString::fromLocal8Bit(argv[0]) : QString();
if (!first.isEmpty()) {
QFileInfo info(first);
if (info.exists()) {
QDir result(info.absolutePath() + "/../../..");
workDir = result.absolutePath() + '/';
}
}
}
#endif
QString remove;
int version = 0;

8
Telegram/SourceFiles/_other/updater_osx.m
View file

@ -160,6 +160,14 @@ int main(int argc, const char * argv[]) {
writeLog([@"Starting update files iteration, path: " stringByAppendingString: srcEnum]);
NSString *contentsPath = [appDirFull stringByAppendingString: @"/Contents"];
writeLog([[NSArray arrayWithObjects: @"Clearing dir ", contentsPath, nil] componentsJoinedByString:@""]);
if (![fileManager removeItemAtPath:contentsPath error:nil]) {
writeLog([@"Failed to clear path for directory " stringByAppendingString:contentsPath]);
delFolder();
return -1;
}
NSArray *keys = [NSArray arrayWithObject:NSURLIsDirectoryKey];
NSDirectoryEnumerator *enumerator = [fileManager
enumeratorAtURL:[NSURL fileURLWithPath:srcEnum]

3
Telegram/SourceFiles/codegen/style/structure_types.h
View file

@ -24,6 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include <vector>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QtMath>
namespace codegen {
namespace style {
@ -78,7 +79,7 @@ inline int pxAdjust(int value, int scale) {
if (value < 0) {
return -pxAdjust(-value, scale);
}
return static_cast<int>(std::floor((value * scale / 4.) + 0.1));
return qFloor((value * scale / 4.) + 0.1);
}
struct point {

2
Telegram/SourceFiles/core/version.h
View file

@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "core/basic_types.h"
#define BETA_VERSION_MACRO (10002001ULL)
#define BETA_VERSION_MACRO (10002002ULL)
constexpr int AppVersion = 10002;
constexpr str_const AppVersionStr = "0.10.2";

2
Telegram/build/build.sh
View file

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

2
Telegram/build/deploy.sh
View file

@ -83,7 +83,7 @@ elif [ "$BuildTarget" == "mac" ]; then
fi
UpdateFile="tmacupd$AppVersion"
SetupFile="tsetup.$AppVersionStrFull.dmg"
ReleasePath="$HomePath/../Mac/Release"
ReleasePath="$HomePath/../out/Release"
RemoteFolder="tmac"
Mac32DeployPath="$HomePath/../../tother/tmac32/$AppVersionStrMajor/$AppVersionStrFull"
Mac32UpdateFile="tmac32upd$AppVersion"

2
Telegram/build/version
View file

@ -3,4 +3,4 @@ AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.2
AppVersionStr 0.10.2
AlphaChannel 0
BetaVersion 10002001
BetaVersion 10002002

6
Telegram/gyp/common_executable.gypi
View file

@ -25,4 +25,10 @@
'includes': [
'common.gypi',
],
'msvs_settings': {
'VCLinkerTool': {
'SubSystem': '<(win_subsystem)',
'ImportLibrary': '<(PRODUCT_DIR)/<(_target_name).lib',
},
},
}

2
Telegram/gyp/settings_win.gypi
View file

@ -42,10 +42,8 @@
'TreatWChar_tAsBuiltInType': 'false',
},
'VCLinkerTool': {
'SubSystem': '<(win_subsystem)',
'MinimumRequiredVersion': '5.01',
'ImageHasSafeExceptionHandlers': 'false', # Disable /SAFESEH
'ImportLibrary': '<(PRODUCT_DIR)/<(_target_name).lib',
},
},
'libraries': [