Switch to cmake for builds #25

berkus · 2017-12-03T20:43:55Z

Cleanup code in general
Remove custom types
Remove autoupdater
Add conan-based build

Obsoletes #22 - this one is ready to merge once tested successfully.

…cotire subrepo: subdir: "cotire" merged: "516d78476" upstream: origin: "https://github.com/procxx/cotire.git" branch: "stable" commit: "516d78476" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

…am/ThirdParty/libtgvoip subrepo: subdir: "Telegram/ThirdParty/libtgvoip" merged: "651594b3" upstream: origin: "https://github.com/telegramdesktop/libtgvoip" branch: "tdesktop" commit: "651594b3" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

…ty/variant subrepo: subdir: "Telegram/ThirdParty/variant" merged: "237f83ca" upstream: origin: "https://github.com/mapbox/variant" branch: "master" commit: "237f83ca" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

…Party/GSL subrepo: subdir: "Telegram/ThirdParty/GSL" merged: "1c95f943" upstream: origin: "https://github.com/Microsoft/GSL.git" branch: "master" commit: "1c95f943" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

…Party/Catch subrepo: subdir: "Telegram/ThirdParty/Catch" merged: "63c097a07" upstream: origin: "https://github.com/philsquared/Catch" branch: "master" commit: "63c097a07" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

subrepo: subdir: "modules" merged: "b6fbaff17" upstream: origin: "https://github.com/procxx/cmake-modules.git" branch: "master" commit: "b6fbaff17" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

leha-bot · 2017-12-04T00:46:17Z

Telegram/SourceFiles/apiwrap.cpp

-	QMap<uint64, int32> msgsIds; // copied from feedMsgs
-	for (int32 i = 0, l = v->size(); i < l; ++i) {
+	QMap<uint64_t, int32_t> msgsIds; // copied from feedMsgs
+	for (int32_t i = 0, l = v->size(); i < l; ++i) {


Range-based for? size_t -> int32_t?

Created #35 as follow-up.

✅

leha-bot · 2017-12-04T00:46:35Z

README.md

@@ -28,7 +39,6 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
 * liblzma ([public domain](http://tukaani.org/xz/))
 * Google Breakpad ([License](https://chromium.googlesource.com/breakpad/breakpad/+/master/LICENSE))
 * Google Crashpad ([Apache License 2.0](https://chromium.googlesource.com/crashpad/crashpad/+/master/LICENSE))
-* GYP ([BSD License](https://github.com/bnoordhuis/gyp/blob/master/LICENSE))
 * Ninja ([Apache License 2.0](https://github.com/ninja-build/ninja/blob/master/COPYING))


Is it still ever required for building?

Gyp? no

✅

leha-bot · 2017-12-04T00:50:30Z

Telegram/SourceFiles/boxes/abstract_box.cpp

@@ -104,7 +104,7 @@ void BoxContent::onDraggingScrollDelta(int delta) {
 }

 void BoxContent::onDraggingScrollTimer() {
-	auto delta = (_draggingScrollDelta > 0) ? qMin(_draggingScrollDelta * 3 / 20 + 1, int32(MaxScrollSpeed)) : qMax(_draggingScrollDelta * 3 / 20 - 1, -int32(MaxScrollSpeed));
+	auto delta = (_draggingScrollDelta > 0) ? qMin(_draggingScrollDelta * 3 / 20 + 1, int32_t(MaxScrollSpeed)) : qMax(_draggingScrollDelta * 3 / 20 - 1, -int32_t(MaxScrollSpeed));


May be use std::clamp or similar func?

Created #36 as a follow-up.

✅

leha-bot · 2017-12-04T00:55:15Z

Telegram/SourceFiles/config.h

@@ -247,7 +247,7 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
 #ifdef CUSTOM_API_ID
 #include "../../../TelegramPrivate/custom_api_id.h" // Custom API id and API hash
 #else
-static const int32 ApiId = 17349;
+static const int32_t ApiId = 17349;


(Just a note: this is an App ID. We will use your own here after moving from legacy)

@leha-bot, please file an issue for that!

Filed #37 as follow-up item.

✅

leha-bot · 2017-12-04T01:00:28Z

Telegram/SourceFiles/core/version.h


 #define BETA_VERSION_MACRO (0ULL)

 constexpr int AppVersion = 1001023;
-constexpr str_const AppVersionStr = "1.1.23";
+constexpr str_const AppVersionStr = "1.1.23-procxx";


todo: use the CMake as a source for version number

Created #34 as follow-up.

✅

leha-bot · 2017-12-04T01:02:45Z

Telegram/SourceFiles/history/history_admin_log_inner.cpp

@@ -1396,7 +1396,7 @@ void InnerWidget::performDrag() {
 	//				) {
 	//				uponSelected = false;
 	//			} else {
-	//				uint16 selFrom = _selected.cbegin().value().from, selTo = _selected.cbegin().value().to;
+	//				uint16_t selFrom = _selected.cbegin().value().from, selTo = _selected.cbegin().value().to;


May be we should remove the whole commented piece of code

leha-bot · 2017-12-04T01:10:49Z

Telegram/SourceFiles/mainwindow.h


 signals:

-	void saved(QString host, quint32 port, QString username, QString password);


Fucked pass by value!!!

This is fine

leha-bot · 2017-12-04T01:12:08Z

Telegram/SourceFiles/media/media_audio.h

-	void play(const AudioMsgId &audio, int64 position = 0);
-	void play(const AudioMsgId &audio, std::unique_ptr<VideoSoundData> videoData, int64 position = 0);
+	void play(const AudioMsgId &audio, int64_t position = 0);
+	void play(const AudioMsgId &audio, std::unique_ptr<VideoSoundData> videoData, int64_t position = 0);


unique_ptr by value?

What if it's moved?

leha-bot · 2017-12-04T01:18:40Z

Telegram/SourceFiles/mtproto/core_types.h

@@ -22,23 +22,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "core/basic_types.h"
 #include "base/flags.h"
+#include <cstdint>


Is it need? I saw the in core/basic_types.h

We want to get rid of basic_types.h

✅

leha-bot · 2017-12-04T01:36:16Z

Telegram/Telegram.plist

 	<key>CFBundleGetInfoString</key>
-	<string>Telegram Desktop messaging app</string>
+	<string>pro.cxx Telegram messaging app</string>


TODO: I think that we should use the CMake features for app naming on each platform build

Created #34 as follow-up.

✅

leha-bot

Pretty cool. @crackedmind , @xvitaly , @mymedia2 , please check build on Windows, Fedora, Debian respectively

Closes: #3196

* Do not do redundant copying of numbers.

…studio 15.5)

berkus added 11 commits December 3, 2017 21:02

git subrepo clone --branch=stable https://github.com/procxx/cotire.git …

db59505

…cotire subrepo: subdir: "cotire" merged: "516d78476" upstream: origin: "https://github.com/procxx/cotire.git" branch: "stable" commit: "516d78476" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

git subrepo clone https://github.com/procxx/cmake-modules.git modules

7ad41c0

subrepo: subdir: "modules" merged: "b6fbaff17" upstream: origin: "https://github.com/procxx/cmake-modules.git" branch: "master" commit: "b6fbaff17" git-subrepo: version: "0.3.1" origin: "???" commit: "???"

Build libtgvoip with cmake

81337e8

Add cmake files

bb53a6b

Update plist file for OSX build with cmake

ad3f653

Add ccache support

cd13a1d

Manually cotire objc++ files

0096365

berkus requested review from xvitaly, crackedmind and zamazan4ik December 3, 2017 20:43

berkus mentioned this pull request Dec 3, 2017

Use cmake for builds WIP DO NOT MERGE YET #22

Closed

leha-bot reviewed Dec 4, 2017

View reviewed changes

leha-bot mentioned this pull request Dec 6, 2017

Rename chat with self to "Saved Messages" #7

Open

berkus and others added 24 commits December 20, 2017 04:11

Shorten all lines lengths to fit 100 column limit

06284c5

Fix build against OpenSSL 1.1

3a23cec

Closes: #3196

Optimize key initialization

0ad990f

* Do not do redundant copying of numbers.

Fix crash in RSA public key wrapper.

ce76e65

Cleanup formatting

53f5bed

Reorg cmake structure - remove duplication, reorder sections

ed3c14a

Add todo notes

9aa4479

Add more defines from gyp

6c7d4f3

Enable tests

a97e096

Fix error c2100 invalid inderection against visual c++ 19.12 (visual …

2ed2c0c

…studio 15.5)

Add list of necessary libs to readme

a81ff4e

Fix cmake version check for policy introduced in 3.10

4e5ef68

Update readme

8f61b34

Adjust OpenAL detection on Linux systems

bd71522

Fix condition name

fd78280

Set LINUX os flag

91564b7

Add ALSA and PulseAudio support on Linux

0ca386b

Set flag only if supported by the compiler

2b313e8

Create styles directory initially

71d0982

Replace typeof() gcc extension with decltype()

090c666

Add explicit typecasting for some constants

9ba4377

Update cmake for linux builds

46b8164

Link in threading libraries if necessary

bb23f69

Handle all enum values

dae5543

berkus force-pushed the updated-cmake branch from c6e7f60 to dae5543 Compare December 20, 2017 02:22

Remove Qt plugins path rewriting

394df76

crackedmind approved these changes Dec 20, 2017

View reviewed changes

berkus merged commit 6ffc8d3 into procxx:dev Dec 20, 2017

berkus deleted the updated-cmake branch December 20, 2017 12:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch to cmake for builds #25

Switch to cmake for builds #25

berkus commented Dec 3, 2017

leha-bot Dec 4, 2017

berkus Dec 20, 2017

leha-bot Dec 4, 2017

berkus Dec 4, 2017 •

edited

Loading

leha-bot Dec 4, 2017

berkus Dec 20, 2017

leha-bot Dec 4, 2017

ForNeVeR Dec 4, 2017

berkus Dec 20, 2017

leha-bot Dec 4, 2017

berkus Dec 20, 2017 •

edited

Loading

leha-bot Dec 4, 2017

leha-bot Dec 4, 2017

berkus Dec 4, 2017

leha-bot Dec 4, 2017

berkus Dec 4, 2017

leha-bot Dec 4, 2017

berkus Dec 4, 2017 •

edited

Loading

leha-bot Dec 4, 2017

berkus Dec 4, 2017

berkus Dec 20, 2017

leha-bot left a comment


		signals:

		void saved(QString host, quint32 port, QString username, QString password);

Switch to cmake for builds #25

Switch to cmake for builds #25

Conversation

berkus commented Dec 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

berkus Dec 4, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

berkus Dec 20, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

berkus Dec 4, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leha-bot left a comment

Choose a reason for hiding this comment

berkus Dec 4, 2017 •

edited

Loading

berkus Dec 20, 2017 •

edited

Loading

berkus Dec 4, 2017 •

edited

Loading