Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

.travis.yml

@@ -39,5 +39,9 @@ arch:
    - libtool --finish /usr/lib
    - .travis/build.sh
 
+before_install:
+  - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
+  - .travis/check.sh
+
 script:
   - .travis/arch.sh

.travis/build.sh

@@ -10,23 +10,6 @@ run() {
 	check
 }
 
-# set colors
-RCol='\e[0m'    # Text Reset
-
-# Regular           Bold                Underline           High Intensity      BoldHigh Intens     Background          High Intensity Backgrounds
-Bla='\e[0;30m';     BBla='\e[1;30m';    UBla='\e[4;30m';    IBla='\e[0;90m';    BIBla='\e[1;90m';   On_Bla='\e[40m';    On_IBla='\e[0;100m';
-Red='\e[0;31m';     BRed='\e[1;31m';    URed='\e[4;31m';    IRed='\e[0;91m';    BIRed='\e[1;91m';   On_Red='\e[41m';    On_IRed='\e[0;101m';
-Gre='\e[0;32m';     BGre='\e[1;32m';    UGre='\e[4;32m';    IGre='\e[0;92m';    BIGre='\e[1;92m';   On_Gre='\e[42m';    On_IGre='\e[0;102m';
-Yel='\e[0;33m';     BYel='\e[1;33m';    UYel='\e[4;33m';    IYel='\e[0;93m';    BIYel='\e[1;93m';   On_Yel='\e[43m';    On_IYel='\e[0;103m';
-Blu='\e[0;34m';     BBlu='\e[1;34m';    UBlu='\e[4;34m';    IBlu='\e[0;94m';    BIBlu='\e[1;94m';   On_Blu='\e[44m';    On_IBlu='\e[0;104m';
-Pur='\e[0;35m';     BPur='\e[1;35m';    UPur='\e[4;35m';    IPur='\e[0;95m';    BIPur='\e[1;95m';   On_Pur='\e[45m';    On_IPur='\e[0;105m';
-Cya='\e[0;36m';     BCya='\e[1;36m';    UCya='\e[4;36m';    ICya='\e[0;96m';    BICya='\e[1;96m';   On_Cya='\e[46m';    On_ICya='\e[0;106m';
-Whi='\e[0;37m';     BWhi='\e[1;37m';    UWhi='\e[4;37m';    IWhi='\e[0;97m';    BIWhi='\e[1;97m';   On_Whi='\e[47m';    On_IWhi='\e[0;107m';
-
-# Set variables
-_qtver=5.5.1
-srcdir=${PWD}
-
 downloadLibs() {
 	travis_fold_start "download_libs"
 	# Move telegram project to subfolder
@@ -172,28 +155,6 @@ check() {
 	fi
 }
 
-start_msg() {
+source ./.travis/common.sh
-	echo -e "\n${Gre}$*${RCol}"
-}
-
-info_msg() {
-	echo -e "\n${Cya}$*${RCol}"
-}
-
-error_msg() {
-	echo -e "\n${BRed}$*${RCol}"
-}
-
-success_msg() {
-	echo -e "\n${BGre}$*${RCol}"
-}
-
-travis_fold_start() {
-	echo "travis_fold:start:$*"
-}
-
-travis_fold_end() {
-	echo "travis_fold:end:$*"
-}
 
 run

.travis/check.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Checks commit message, ...
+
+run() {
+	checkCommitMessage
+}
+
+checkCommitMessage() {
+	info_msg "Commit message: ${TRAVIS_COMMIT_MSG}";
+	info_msg "Is pull request: ${TRAVIS_PULL_REQUEST}";
+
+	if [[ $TRAVIS_PULL_REQUEST != "false" ]];then
+		if [[  $TRAVIS_COMMIT_MSG != *"Signed-off-by: "* ]];then
+			error_msg "The commit message does not contain the signature!"
+			error_msg "More information: https://github.com/telegramdesktop/tdesktop/blob/master/.github/CONTRIBUTING.md#sign-your-work"
+			exit 1
+		else
+			success_msg "Commit message contains signature"
+		fi
+	fi
+}
+
+source ./.travis/common.sh
+
+run

.travis/common.sh

@@ -0,0 +1,40 @@
+# set colors
+RCol='\e[0m'    # Text Reset
+
+# Regular           Bold                Underline           High Intensity      BoldHigh Intens     Background          High Intensity Backgrounds
+Bla='\e[0;30m';     BBla='\e[1;30m';    UBla='\e[4;30m';    IBla='\e[0;90m';    BIBla='\e[1;90m';   On_Bla='\e[40m';    On_IBla='\e[0;100m';
+Red='\e[0;31m';     BRed='\e[1;31m';    URed='\e[4;31m';    IRed='\e[0;91m';    BIRed='\e[1;91m';   On_Red='\e[41m';    On_IRed='\e[0;101m';
+Gre='\e[0;32m';     BGre='\e[1;32m';    UGre='\e[4;32m';    IGre='\e[0;92m';    BIGre='\e[1;92m';   On_Gre='\e[42m';    On_IGre='\e[0;102m';
+Yel='\e[0;33m';     BYel='\e[1;33m';    UYel='\e[4;33m';    IYel='\e[0;93m';    BIYel='\e[1;93m';   On_Yel='\e[43m';    On_IYel='\e[0;103m';
+Blu='\e[0;34m';     BBlu='\e[1;34m';    UBlu='\e[4;34m';    IBlu='\e[0;94m';    BIBlu='\e[1;94m';   On_Blu='\e[44m';    On_IBlu='\e[0;104m';
+Pur='\e[0;35m';     BPur='\e[1;35m';    UPur='\e[4;35m';    IPur='\e[0;95m';    BIPur='\e[1;95m';   On_Pur='\e[45m';    On_IPur='\e[0;105m';
+Cya='\e[0;36m';     BCya='\e[1;36m';    UCya='\e[4;36m';    ICya='\e[0;96m';    BICya='\e[1;96m';   On_Cya='\e[46m';    On_ICya='\e[0;106m';
+Whi='\e[0;37m';     BWhi='\e[1;37m';    UWhi='\e[4;37m';    IWhi='\e[0;97m';    BIWhi='\e[1;97m';   On_Whi='\e[47m';    On_IWhi='\e[0;107m';
+
+# Set variables
+_qtver=5.5.1
+srcdir=${PWD}
+
+start_msg() {
+	echo -e "\n${Gre}$*${RCol}"
+}
+
+info_msg() {
+	echo -e "\n${Cya}$*${RCol}"
+}
+
+error_msg() {
+	echo -e "\n${BRed}$*${RCol}"
+}
+
+success_msg() {
+	echo -e "\n${BGre}$*${RCol}"
+}
+
+travis_fold_start() {
+	echo "travis_fold:start:$*"
+}
+
+travis_fold_end() {
+	echo "travis_fold:end:$*"
+}

Telegram/SourceFiles/logs.cpp

@@ -1023,13 +1023,13 @@ namespace internal {
 			internal::ReportFile = nullptr;
 		}
 #else // Q_OS_WIN
-		CrashDumpFile = fopen(QFile::encodeName(CrashDumpPath).constData(), "wb");
+		internal::ReportFile = fopen(QFile::encodeName(internal::ReportPath).constData(), "wb");
 #endif // else for Q_OS_WIN
 		if (internal::ReportFile) {
 #ifdef Q_OS_WIN
 			internal::ReportFileNo = _fileno(internal::ReportFile);
 #else // Q_OS_WIN
-			CrashDumpFileNo = fileno(internal::ReportFile);
+			internal::ReportFileNo = fileno(internal::ReportFile);
 #endif // else for Q_OS_WIN
 			if (internal::SetSignalHandlers) {
 #ifndef Q_OS_WIN
@@ -1039,12 +1039,12 @@ namespace internal {
 				sigemptyset(&sigact.sa_mask);
 				sigact.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
 
-				sigaction(SIGABRT, &sigact, &SIG_def[SIGABRT]);
+				sigaction(SIGABRT, &sigact, &internal::SIG_def[SIGABRT]);
-				sigaction(SIGSEGV, &sigact, &SIG_def[SIGSEGV]);
+				sigaction(SIGSEGV, &sigact, &internal::SIG_def[SIGSEGV]);
-				sigaction(SIGILL, &sigact, &SIG_def[SIGILL]);
+				sigaction(SIGILL, &sigact, &internal::SIG_def[SIGILL]);
-				sigaction(SIGFPE, &sigact, &SIG_def[SIGFPE]);
+				sigaction(SIGFPE, &sigact, &internal::SIG_def[SIGFPE]);
-				sigaction(SIGBUS, &sigact, &SIG_def[SIGBUS]);
+				sigaction(SIGBUS, &sigact, &internal::SIG_def[SIGBUS]);
-				sigaction(SIGSYS, &sigact, &SIG_def[SIGSYS]);
+				sigaction(SIGSYS, &sigact, &internal::SIG_def[SIGSYS]);
 #else // !Q_OS_WIN
 				signal(SIGABRT, SignalHandlers::internal::Handler);
 				signal(SIGSEGV, SignalHandlers::internal::Handler);