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

Merge branch 'dev' into games

This commit is contained in:
John Preston 2016-09-03 11:51:29 -04:00
parent 160895f6e3 3d3fc33253
commit 610d42fd8d
27 changed files with 85 additions and 80 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 VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,2,1 FILEVERSION 0,10,3,0
PRODUCTVERSION 0,10,2,1 PRODUCTVERSION 0,10,3,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.2.1" VALUE "FileVersion", "0.10.3.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.2.1" VALUE "ProductVersion", "0.10.3.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

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

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

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

@ -138,18 +138,6 @@ QString BetaSignature;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QString workDir; 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; QString remove;
int version = 0; 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]); 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]; NSArray *keys = [NSArray arrayWithObject:NSURLIsDirectoryKey];
NSDirectoryEnumerator *enumerator = [fileManager NSDirectoryEnumerator *enumerator = [fileManager
enumeratorAtURL:[NSURL fileURLWithPath:srcEnum] enumeratorAtURL:[NSURL fileURLWithPath:srcEnum]

4
Telegram/SourceFiles/application.cpp
View File

@ -1065,8 +1065,8 @@ void AppClass::checkMapVersion() {
if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion() < AppVersion) {
if (Local::oldMapVersion()) { if (Local::oldMapVersion()) {
QString versionFeatures; QString versionFeatures;
if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9058) { if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 10003) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Alpha version of an embedded video player"); versionFeatures = QString::fromUtf8("\xe2\x80\x94 New cute design for the Settings page");
} else if (Local::oldMapVersion() < 10000) { } else if (Local::oldMapVersion() < 10000) {
versionFeatures = langNewVersionText(); versionFeatures = langNewVersionText();
} else { } else {

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

@ -1355,7 +1355,7 @@ RevokePublicLinkBox::RevokePublicLinkBox(base::lambda_unique<void()> &&revokeCal
, _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke))) , _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke)))
, _aboutRevoke(this, lang(lng_channels_too_much_public_about), FlatLabel::InitType::Simple, st::aboutRevokePublicLabel) , _aboutRevoke(this, lang(lng_channels_too_much_public_about), FlatLabel::InitType::Simple, st::aboutRevokePublicLabel)
, _cancel(this, lang(lng_cancel), st::cancelBoxButton) , _cancel(this, lang(lng_cancel), st::cancelBoxButton)
, _revokeCallback(std::move(revokeCallback)) { , _revokeCallback(std_::move(revokeCallback)) {
setMouseTracking(true); setMouseTracking(true);
MTP::send(MTPchannels_GetAdminedPublicChannels(), rpcDone(&RevokePublicLinkBox::getPublicDone), rpcFail(&RevokePublicLinkBox::getPublicFail)); MTP::send(MTPchannels_GetAdminedPublicChannels(), rpcDone(&RevokePublicLinkBox::getPublicDone), rpcFail(&RevokePublicLinkBox::getPublicFail));
@ -1406,7 +1406,7 @@ void RevokePublicLinkBox::mousePressEvent(QMouseEvent *e) {
void RevokePublicLinkBox::mouseReleaseEvent(QMouseEvent *e) { void RevokePublicLinkBox::mouseReleaseEvent(QMouseEvent *e) {
auto pressed = createAndSwap(_pressed); auto pressed = createAndSwap(_pressed);
setCursor((_selected || _pressed) ? style::cur_pointer : style::cur_default); setCursor((_selected || _pressed) ? style::cur_pointer : style::cur_default);
if (pressed == _selected) { if (pressed && pressed == _selected) {
auto text_method = pressed->isMegagroup() ? lng_channels_too_much_public_revoke_confirm_group : lng_channels_too_much_public_revoke_confirm_channel; auto text_method = pressed->isMegagroup() ? lng_channels_too_much_public_revoke_confirm_group : lng_channels_too_much_public_revoke_confirm_channel;
auto text = text_method(lt_link, qsl("telegram.me/") + pressed->userName(), lt_group, pressed->name); auto text = text_method(lt_link, qsl("telegram.me/") + pressed->userName(), lt_group, pressed->name);
weakRevokeConfirmBox = new ConfirmBox(text, lang(lng_channels_too_much_public_revoke)); weakRevokeConfirmBox = new ConfirmBox(text, lang(lng_channels_too_much_public_revoke));

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 <vector>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QtMath>
namespace codegen { namespace codegen {
namespace style { namespace style {
@ -78,7 +79,7 @@ inline int pxAdjust(int value, int scale) {
if (value < 0) { if (value < 0) {
return -pxAdjust(-value, scale); return -pxAdjust(-value, scale);
} }
return static_cast<int>(std::floor((value * scale / 4.) + 0.1)); return qFloor((value * scale / 4.) + 0.1);
} }
struct point { struct point {

9
Telegram/SourceFiles/core/basic_types.h
View File

@ -339,6 +339,13 @@ inline constexpr typename remove_reference<T>::type &&move(T &&value) noexcept {
return static_cast<typename remove_reference<T>::type&&>(value); return static_cast<typename remove_reference<T>::type&&>(value);
} }
template <typename T>
void swap(T &a, T &b) {
T tmp = move(a);
a = move(b);
b = move(tmp);
}
template <typename T> template <typename T>
struct remove_const { struct remove_const {
using type = T; using type = T;
@ -510,7 +517,7 @@ struct is_base_of {
template <typename T> template <typename T>
T createAndSwap(T &value) { T createAndSwap(T &value) {
T result = T(); T result = T();
std::swap(result, value); std_::swap(result, value);
return std_::move(result); return std_::move(result);
} }

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

@ -417,7 +417,7 @@ private:
} }
static void destroyNode(Subscription::Node *node) { static void destroyNode(Subscription::Node *node) {
if (auto that = node->observable.lock()) { if (auto that = node->observable.toStrongRef()) {
static_cast<CommonObservableData*>(that.data())->remove(node); static_cast<CommonObservableData*>(that.data())->remove(node);
} }
} }

8
Telegram/SourceFiles/core/vector_of_moveable.h
View File

@ -39,9 +39,9 @@ public:
, _plaindata(createAndSwap(other._plaindata)) { , _plaindata(createAndSwap(other._plaindata)) {
} }
vector_of_moveable &operator=(vector_of_moveable &&other) { vector_of_moveable &operator=(vector_of_moveable &&other) {
std::swap(_size, other._size); std_::swap(_size, other._size);
std::swap(_capacity, other._capacity); std_::swap(_capacity, other._capacity);
std::swap(_plaindata, other._plaindata); std_::swap(_plaindata, other._plaindata);
return *this; return *this;
} }
@ -165,7 +165,7 @@ private:
new (newLocation) T(std_::move(*oldLocation)); new (newLocation) T(std_::move(*oldLocation));
oldLocation->~T(); oldLocation->~T();
} }
std::swap(_plaindata, newPlainData); std_::swap(_plaindata, newPlainData);
_capacity = newCapacity; _capacity = newCapacity;
operator delete[](newPlainData); operator delete[](newPlainData);
} }

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

@ -22,9 +22,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "core/basic_types.h" #include "core/basic_types.h"
#define BETA_VERSION_MACRO (10002001ULL) #define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 10002; constexpr int AppVersion = 10003;
constexpr str_const AppVersionStr = "0.10.2"; constexpr str_const AppVersionStr = "0.10.3";
constexpr bool AppAlphaVersion = false; constexpr bool AppAlphaVersion = true;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

2
Telegram/SourceFiles/history.cpp
View File

@ -8458,7 +8458,7 @@ void GoToMessageClickHandler::onClickImpl() const {
if (current && current->history()->peer->id == peer()) { if (current && current->history()->peer->id == peer()) {
App::main()->pushReplyReturn(current); App::main()->pushReplyReturn(current);
} }
Ui::showPeerHistory(peer(), msgid()); Ui::showPeerHistory(peer(), msgid(), Ui::ShowWay::Forward);
} }
} }

2
Telegram/SourceFiles/mainwidget.cpp
View File

@ -3451,7 +3451,7 @@ void MainWidget::usernameResolveDone(QPair<MsgId, QString> msgIdAndStartToken, c
_history->resizeEvent(0); _history->resizeEvent(0);
} }
} }
Ui::showPeerHistory(peer->id, msgId); Ui::showPeerHistory(peer->id, msgId, Ui::ShowWay::Forward);
} }
} }

8
Telegram/SourceFiles/profile/profile_actions_widget.cpp
View File

@ -98,15 +98,15 @@ Ui::LeftOutlineButton *ActionsWidget::addButton(const QString &text, const char
result->show(); result->show();
int top = buttonsBottom() + skipHeight; int top = buttonsBottom() + skipHeight;
resizeButton(result, top); resizeButton(result, width(), top);
_buttons.push_back(result); _buttons.push_back(result);
return result; return result;
}; };
void ActionsWidget::resizeButton(Ui::LeftOutlineButton *button, int top) { void ActionsWidget::resizeButton(Ui::LeftOutlineButton *button, int newWidth, int top) {
int left = defaultOutlineButtonLeft(); int left = defaultOutlineButtonLeft();
int availableWidth = width() - left - st::profileBlockMarginRight; int availableWidth = newWidth - left - st::profileBlockMarginRight;
accumulate_min(availableWidth, st::profileBlockOneLineWidthMax); accumulate_min(availableWidth, st::profileBlockOneLineWidthMax);
button->resizeToWidth(availableWidth); button->resizeToWidth(availableWidth);
button->moveToLeft(left, top); button->moveToLeft(left, top);
@ -242,7 +242,7 @@ void ActionsWidget::refreshLeaveChannel() {
int ActionsWidget::resizeGetHeight(int newWidth) { int ActionsWidget::resizeGetHeight(int newWidth) {
for_const (auto button, _buttons) { for_const (auto button, _buttons) {
resizeButton(button, button->y()); resizeButton(button, newWidth, button->y());
} }
return buttonsBottom(); return buttonsBottom();
} }

2
Telegram/SourceFiles/profile/profile_actions_widget.h
View File

@ -73,7 +73,7 @@ private:
Ui::LeftOutlineButton *addButton(const QString &text, const char *slot Ui::LeftOutlineButton *addButton(const QString &text, const char *slot
, const style::OutlineButton &st = st::defaultLeftOutlineButton, int skipHeight = 0); , const style::OutlineButton &st = st::defaultLeftOutlineButton, int skipHeight = 0);
void resizeButton(Ui::LeftOutlineButton *button, int top); void resizeButton(Ui::LeftOutlineButton *button, int newWidth, int top);
QString getBlockButtonText() const; QString getBlockButtonText() const;
bool hasBotCommand(const QString &command) const; bool hasBotCommand(const QString &command) const;

6
Telegram/SourceFiles/profile/profile_shared_media_widget.cpp
View File

@ -84,7 +84,7 @@ void SharedMediaWidget::notifyPeerUpdated(const Notify::PeerUpdate &update) {
int SharedMediaWidget::resizeGetHeight(int newWidth) { int SharedMediaWidget::resizeGetHeight(int newWidth) {
int newHeight = contentTop(); int newHeight = contentTop();
resizeButtons(&newHeight); resizeButtons(newWidth, &newHeight);
return newHeight; return newHeight;
} }
@ -135,11 +135,11 @@ void SharedMediaWidget::onMediaChosen() {
} }
} }
void SharedMediaWidget::resizeButtons(int *top) { void SharedMediaWidget::resizeButtons(int newWidth, int *top) {
t_assert(top != nullptr); t_assert(top != nullptr);
int left = defaultOutlineButtonLeft(); int left = defaultOutlineButtonLeft();
int availableWidth = width() - left - st::profileBlockMarginRight; int availableWidth = newWidth - left - st::profileBlockMarginRight;
accumulate_min(availableWidth, st::profileBlockOneLineWidthMax); accumulate_min(availableWidth, st::profileBlockOneLineWidthMax);
for_const (auto button, _mediaButtons) { for_const (auto button, _mediaButtons) {
if (!button) continue; if (!button) continue;

2
Telegram/SourceFiles/profile/profile_shared_media_widget.h
View File

@ -53,7 +53,7 @@ private:
void refreshButton(MediaOverviewType type); void refreshButton(MediaOverviewType type);
void refreshVisibility(); void refreshVisibility();
void resizeButtons(int *top); void resizeButtons(int newWidth, int *top);
Ui::LeftOutlineButton *_mediaButtons[OverviewCount] = { nullptr }; Ui::LeftOutlineButton *_mediaButtons[OverviewCount] = { nullptr };
History *_history; History *_history;

36
Telegram/SourceFiles/pspecific_mac_p.h
View File

@ -24,31 +24,31 @@ public:
PsMacWindowPrivate(); PsMacWindowPrivate();
void setWindowBadge(const QString &str); void setWindowBadge(const QString &str);
void startBounce(); void startBounce();
void updateDelegate(); void updateDelegate();
void showNotify(uint64 peer, int32 msgId, const QPixmap &pix, const QString &title, const QString &subtitle, const QString &msg, bool withReply); void showNotify(uint64 peer, int32 msgId, const QPixmap &pix, const QString &title, const QString &subtitle, const QString &msg, bool withReply);
void clearNotifies(uint64 peer = 0); void clearNotifies(uint64 peer = 0);
void enableShadow(WId winId); void enableShadow(WId winId);
bool filterNativeEvent(void *event); bool filterNativeEvent(void *event);
virtual void activeSpaceChanged() { virtual void activeSpaceChanged() {
} }
virtual void darkModeChanged() { virtual void darkModeChanged() {
} }
virtual void notifyClicked(unsigned long long peer, int msgid) { virtual void notifyClicked(unsigned long long peer, int msgid) {
} }
virtual void notifyReplied(unsigned long long peer, int msgid, const char *str) { virtual void notifyReplied(unsigned long long peer, int msgid, const char *str) {
} }
~PsMacWindowPrivate(); ~PsMacWindowPrivate();
PsMacWindowData *data; PsMacWindowData *data;
}; };
void objc_holdOnTop(WId winId); void objc_holdOnTop(WId winId);
@ -89,7 +89,6 @@ QByteArray objc_downloadPathBookmark(const QString &path);
QByteArray objc_pathBookmark(const QString &path); QByteArray objc_pathBookmark(const QString &path);
void objc_downloadPathEnableAccess(const QByteArray &bookmark); void objc_downloadPathEnableAccess(const QByteArray &bookmark);
class objc_FileBookmarkData;
class objc_FileBookmark { class objc_FileBookmark {
public: public:
objc_FileBookmark(const QByteArray &bookmark); objc_FileBookmark(const QByteArray &bookmark);
@ -103,6 +102,9 @@ public:
~objc_FileBookmark(); ~objc_FileBookmark();
private: private:
#ifdef OS_MAC_STORE
class objc_FileBookmarkData;
objc_FileBookmarkData *data = nullptr; objc_FileBookmarkData *data = nullptr;
#endif // OS_MAC_STORE
}; };

2
Telegram/SourceFiles/pspecific_mac_p.mm
View File

@ -1160,7 +1160,7 @@ namespace {
QMutex _bookmarksMutex; QMutex _bookmarksMutex;
} }
class objc_FileBookmarkData { class objc_FileBookmark::objc_FileBookmarkData {
public: public:
~objc_FileBookmarkData() { ~objc_FileBookmarkData() {
if (url) [url release]; if (url) [url release];

2
Telegram/SourceFiles/structs.cpp
View File

@ -1636,7 +1636,7 @@ void PeerOpenClickHandler::onClickImpl() const {
if (!peer()->asChannel()->isPublic() && !peer()->asChannel()->amIn()) { if (!peer()->asChannel()->isPublic() && !peer()->asChannel()->amIn()) {
Ui::showLayer(new InformBox(lang((peer()->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible))); Ui::showLayer(new InformBox(lang((peer()->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
} else { } else {
Ui::showPeerHistory(peer(), ShowAtUnreadMsgId); Ui::showPeerHistory(peer(), ShowAtUnreadMsgId, Ui::ShowWay::Forward);
} }
} else { } else {
Ui::showPeerProfile(peer()); Ui::showPeerProfile(peer());

2
Telegram/build/build.sh
View File

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

2
Telegram/build/deploy.sh
View File

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

5
Telegram/build/set_version.bat
View File

@ -89,11 +89,6 @@ call :repl "Replace=(AppVersion\s+=) (\s*)\d+/$1$2 %VersionFull%" "Filename=%Ver
call :repl "Replace=(AppVersionStr\s+=) (\s*)[&hat;;]+/$1$2 &quot;%VersionStrSmall%&quot;" "Filename=%VersionHeaderPath%" || goto :error call :repl "Replace=(AppVersionStr\s+=) (\s*)[&hat;;]+/$1$2 &quot;%VersionStrSmall%&quot;" "Filename=%VersionHeaderPath%" || goto :error
call :repl "Replace=(AppAlphaVersion\s+=) (\s*)[a-z]+/$1$2 %VersionAlphaBool%" "Filename=%VersionHeaderPath%" || goto :error call :repl "Replace=(AppAlphaVersion\s+=) (\s*)[a-z]+/$1$2 %VersionAlphaBool%" "Filename=%VersionHeaderPath%" || goto :error
echo Patching project.pbxproj...
set "TelegramProjectPath=%FullScriptPath%..\Telegram.xcodeproj\project.pbxproj"
call :repl "Replace=(TDESKTOP_MAJOR_VERSION\s+=) (\s*)[&hat;;]+/$1$2 %VersionMajor%.%VersionMinor%" "Filename=%TelegramProjectPath%" || goto :error
call :repl "Replace=(TDESKTOP_VERSION\s+=) (\s*)[&hat;;]+/$1$2 %VersionStrSmall%" "Filename=%TelegramProjectPath%" || 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 "Replace=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error call :repl "Replace=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error

10
Telegram/build/version
View File

@ -1,6 +1,6 @@
AppVersion 10002 AppVersion 10003
AppVersionStrMajor 0.10 AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.2 AppVersionStrSmall 0.10.3
AppVersionStr 0.10.2 AppVersionStr 0.10.3
AlphaChannel 0 AlphaChannel 1
BetaVersion 10002001 BetaVersion 0

2
Telegram/gyp/Telegram.gyp
View File

@ -51,7 +51,7 @@
], ],
}, },
'includes': [ 'includes': [
'common_executable.gypi', 'common_executable.gypi',
'telegram_qrc.gypi', 'telegram_qrc.gypi',
'telegram_win.gypi', 'telegram_win.gypi',
'telegram_mac.gypi', 'telegram_mac.gypi',

6
Telegram/gyp/common_executable.gypi
View File

@ -25,4 +25,10 @@
'includes': [ 'includes': [
'common.gypi', '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', 'TreatWChar_tAsBuiltInType': 'false',
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'SubSystem': '<(win_subsystem)',
'MinimumRequiredVersion': '5.01', 'MinimumRequiredVersion': '5.01',
'ImageHasSafeExceptionHandlers': 'false', # Disable /SAFESEH 'ImageHasSafeExceptionHandlers': 'false', # Disable /SAFESEH
'ImportLibrary': '<(PRODUCT_DIR)/<(_target_name).lib',
}, },
}, },
'libraries': [ 'libraries': [