Add a Gitter chat badge to README.md

CONTRIBUTING.md

@@ -73,10 +73,8 @@ For more info, see [GitHub Help][help_change_commit_message].
 
 ## Build instructions
 
-* [Visual Studio 2013][msvc]
-* [XCode 6.4][xcode]
-* [XCode 6.4 for OS X 10.6 and 10.7][xcode_old]
-* [Qt Creator 3.2.0 Ubuntu][qtcreator]
+See the [README.md](README.md#build-instructions) for details on the various build
+environments.
 
 ## Pull upstream changes into your fork regularly
 
@@ -91,9 +89,13 @@ Check the log to be sure that you actually want the changes, before merging:
 
     git log upstream/master
 
-Then merge the changes that you fetched:
+Then rebase your changes on the latest commits in the `master` branch:
 
-    git merge upstream/master
+    git rebase upstream/master
+
+After that, you have to force push your commits:
+
+    git push --force
 
 For more info, see [GitHub Help][help_fork_repo].
 

README.md

@@ -1,5 +1,7 @@
 # [Telegram Desktop][telegram_desktop] – Official Messenger
 
+[![Join the chat at https://gitter.im/tdesktop/Lobby](https://badges.gitter.im/tdesktop/Lobby.svg)](https://gitter.im/tdesktop/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 This is the complete source code and the build instructions for the alpha version of the official desktop client for the [Telegram][telegram] messenger, based on the [Telegram API][telegram_api] and the [MTProto][telegram_proto] secure protocol.
 
 The source code is published under GPLv3 with OpenSSL exception, the license is available [here][license].

Telegram/Build.bat

@@ -1,4 +1,5 @@
 @echo OFF
+setlocal
 
 FOR /F "tokens=1,2* delims= " %%i in (Version) do set "%%i=%%j"
 
@@ -29,6 +30,8 @@ set "HomePath=..\..\Telegram"
 set "ReleasePath=..\Win32\Deploy"
 set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%"
 set "SignPath=..\..\TelegramPrivate\Sign.bat"
+set "BinaryName=Telegram"
+set "DropboxSymbolsPath=Z:\Dropbox\Telegram\symbols"
 
 if %BetaVersion% neq 0 (
   if exist %DeployPath%\ (
@@ -71,9 +74,13 @@ echo .
 echo Version %AppVersionStrFull% build successfull. Preparing..
 echo .
 
+echo Dumping debug symbols..
+call ..\..\Libraries\breakpad\src\tools\windows\binaries\dump_syms.exe %ReleasePath%\%BinaryName%.pdb > %ReleasePath%\%BinaryName%.sym
+echo Done!
+
 set "PATH=%PATH%;C:\Program Files\7-Zip;C:\Program Files (x86)\Inno Setup 5"
 
-call %SignPath% %ReleasePath%\Telegram.exe
+call %SignPath% %ReleasePath%\%BinaryName%.exe
 if %errorlevel% neq 0 goto error
 
 call %SignPath% %ReleasePath%\Updater.exe
@@ -90,7 +97,7 @@ if %BetaVersion% equ 0 (
 )
 
 cd %ReleasePath%
-call Packer.exe -version %VersionForPacker% -path Telegram.exe -path Updater.exe %DevParam%
+call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe %DevParam%
 cd %HomePath%
 if %errorlevel% neq 0 goto error
 
@@ -109,6 +116,21 @@ if %BetaVersion% neq 0 (
   set "PortableFile=tbeta%BetaVersion%_%BetaSignature%.zip"
 )
 
+for /f ^"usebackq^ eol^=^
+
+^ delims^=^" %%a in (%ReleasePath%\%BinaryName%.sym) do (
+  set "SymbolsHashLine=%%a"
+  goto symbolslinedone
+)
+:symbolslinedone
+FOR /F "tokens=1,2,3,4* delims= " %%i in ("%SymbolsHashLine%") do set "SymbolsHash=%%l"
+
+echo Copying %BinaryName%.sym to %DropboxSymbolsPath%\%BinaryName%.pdb\%SymbolsHash%
+if not exist %DropboxSymbolsPath%\%BinaryName%.pdb mkdir %DropboxSymbolsPath%\%BinaryName%.pdb
+if not exist %DropboxSymbolsPath%\%BinaryName%.pdb\%SymbolsHash% mkdir %DropboxSymbolsPath%\%BinaryName%.pdb\%SymbolsHash%
+xcopy %ReleasePath%\%BinaryName%.sym %DropboxSymbolsPath%\%BinaryName%.pdb\%SymbolsHash%\
+echo Done!
+
 if not exist %ReleasePath%\deploy mkdir %ReleasePath%\deploy
 if not exist %ReleasePath%\deploy\%AppVersionStrMajor% mkdir %ReleasePath%\deploy\%AppVersionStrMajor%
 mkdir %DeployPath%
@@ -144,7 +166,7 @@ if not exist %DeployPath%\%PortableFile% goto error
 if %BetaVersion% equ 0 (
   if not exist %DeployPath%\%SetupFile% goto error
 )
-if not exist %DeployPath%\Telegram.pdb goto error
+if not exist %DeployPath%\%BinaryName%.pdb goto error
 if not exist %DeployPath%\Updater.exe goto error
 if not exist %DeployPath%\Updater.pdb goto error
 if not exist %FinalReleasePath%\%AppVersionStrMajor% mkdir %FinalReleasePath%\%AppVersionStrMajor%
@@ -157,7 +179,7 @@ if %BetaVersion% equ 0 (
 ) else (
   xcopy %DeployPath%\%BetaKeyFile% %FinalDeployPath%\ /Y
 )
-xcopy %DeployPath%\Telegram.pdb %FinalDeployPath%\
+xcopy %DeployPath%\%BinaryName%.pdb %FinalDeployPath%\
 xcopy %DeployPath%\Updater.exe %FinalDeployPath%\
 xcopy %DeployPath%\Updater.pdb %FinalDeployPath%\
 

Telegram/Build.sh

@@ -1,5 +1,7 @@
 set -e
 
+FastParam="$1"
+
 while IFS='' read -r line || [[ -n "$line" ]]; do
   set $line
   eval $1="$2"
@@ -37,13 +39,15 @@ if [ "$BuildTarget" == "linux" ]; then
   WorkPath="./../Linux"
   FixScript="$HomePath/FixMake.sh"
   ReleasePath="./../Linux/Release"
+  BinaryName="Telegram"
 elif [ "$BuildTarget" == "linux32" ]; then
   echo "Building version $AppVersionStrFull for Linux 32bit.."
   UpdateFile="tlinux32upd$AppVersion"
   SetupFile="tsetup32.$AppVersionStrFull.tar.xz"
   WorkPath="./../Linux"
   FixScript="$HomePath/FixMake32.sh"
   ReleasePath="./../Linux/Release"
+  BinaryName="Telegram"
 elif [ "$BuildTarget" == "mac" ]; then
   echo "Building version $AppVersionStrFull for OS X 10.8+.."
   UpdateFile="tmacupd$AppVersion"
@@ -104,22 +108,25 @@ fi
 #fi
 
 if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
+
+  DropboxSymbolsPath="/media/psf/Home/Dropbox/Telegram/symbols"
+
   mkdir -p "$WorkPath/ReleaseIntermediateUpdater"
   cd "$WorkPath/ReleaseIntermediateUpdater"
-  /usr/local/Qt-5.5.1/bin/qmake "$HomePath/Updater.pro"
+  /usr/local/Qt-5.5.1/bin/qmake "$HomePath/Updater.pro" -r -spec linux-g++
   make
   echo "Updater build complete!"
   cd "$HomePath"
 
   mkdir -p "$WorkPath/ReleaseIntermediate"
   cd "$WorkPath/ReleaseIntermediate"
-  /usr/local/Qt-5.5.1/bin/qmake "$HomePath/Telegram.pro"
+  /usr/local/Qt-5.5.1/bin/qmake "$HomePath/Telegram.pro" -r -spec linux-g++
   eval "$FixScript"
   make
-  echo "Telegram build complete!"
+  echo "$BinaryName build complete!"
   cd "$HomePath"
-  if [ ! -f "$ReleasePath/Telegram" ]; then
-    echo "Telegram not found!"
+  if [ ! -f "$ReleasePath/$BinaryName" ]; then
+    echo "$BinaryName not found!"
     exit 1
   fi
 
@@ -128,8 +135,16 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
     exit 1
   fi
 
+  echo "Dumping debug symbols.."
+  "./../../Libraries/breakpad/src/tools/linux/dump_syms/dump_syms" "$ReleasePath/$BinaryName" > "$ReleasePath/$BinaryName.sym"
+  echo "Done!"
+
+  echo "Stripping the executable.."
+  strip -s "$ReleasePath/$BinaryName"
+  echo "Done!"
+
   echo "Preparing version $AppVersionStrFull, executing Packer.."
-  cd "$ReleasePath" && "./Packer" -path Telegram -path Updater -version $VersionForPacker $DevParam && cd "$HomePath"
+  cd "$ReleasePath" && "./Packer" -path "$BinaryName" -path Updater -version $VersionForPacker $DevParam && cd "$HomePath"
   echo "Packer done!"
 
   if [ "$BetaVersion" != "0" ]; then
@@ -146,6 +161,12 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
     SetupFile="tbeta${BetaVersion}_${BetaSignature}.tar.xz"
   fi
 
+  SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.sym" | awk -F " " 'END {print $4}'`
+  echo "Copying $BinaryName.sym to $DropboxSymbolsPath/$BinaryName/$SymbolsHash"
+  mkdir -p "$DropboxSymbolsPath/$BinaryName/$SymbolsHash"
+  cp "$ReleasePath/$BinaryName.sym" "$DropboxSymbolsPath/$BinaryName/$SymbolsHash/"
+  echo "Done!"
+
   if [ ! -d "$ReleasePath/deploy" ]; then
     mkdir "$ReleasePath/deploy"
   fi
@@ -154,21 +175,25 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
     mkdir "$ReleasePath/deploy/$AppVersionStrMajor"
   fi
 
-  echo "Copying Telegram, Updater and $UpdateFile to deploy/$AppVersionStrMajor/$AppVersionStrFull..";
+  echo "Copying $BinaryName, Updater and $UpdateFile to deploy/$AppVersionStrMajor/$AppVersionStrFull..";
   mkdir "$DeployPath"
-  mkdir "$DeployPath/Telegram"
-  mv "$ReleasePath/Telegram" "$DeployPath/Telegram/"
-  mv "$ReleasePath/Updater" "$DeployPath/Telegram/"
+  mkdir "$DeployPath/$BinaryName"
+  mv "$ReleasePath/$BinaryName" "$DeployPath/$BinaryName/"
+  mv "$ReleasePath/Updater" "$DeployPath/$BinaryName/"
   mv "$ReleasePath/$UpdateFile" "$DeployPath/"
   if [ "$BetaVersion" != "0" ]; then
     mv "$ReleasePath/$BetaKeyFile" "$DeployPath/"
   fi
-  cd "$DeployPath" && tar -cJvf "$SetupFile" "Telegram/" && cd "./../../../$HomePath"
+  cd "$DeployPath" && tar -cJvf "$SetupFile" "$BinaryName/" && cd "./../../../$HomePath"
 fi
 
 if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
 
-  touch "./SourceFiles/telegram.qrc"
+  DropboxSymbolsPath="./../../../Dropbox/Telegram/symbols"
+
+  if [ "$FastParam" != "fast" ]; then
+    touch "./SourceFiles/telegram.qrc"
+  fi
   xcodebuild -project Telegram.xcodeproj -alltargets -configuration Release build
 
   if [ ! -d "$ReleasePath/$BinaryName.app" ]; then
@@ -181,6 +206,28 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
     exit 1
   fi
 
+  if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
+    echo "Removing Updater debug symbols.."
+    rm -rf "$ReleasePath/$BinaryName.app/Contents/Frameworks/Updater.dSYM"
+    echo "Done!"
+  fi
+
+  echo "Dumping debug symbols.."
+  "./../../Libraries/breakpad/src/tools/mac/dump_syms/build/Release/dump_syms" "$ReleasePath/$BinaryName.app.dSYM" > "$ReleasePath/$BinaryName.sym" 2>/dev/null
+  echo "Done!"
+
+  echo "Stripping the executable.."
+  strip "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName"
+  echo "Done!"
+
+  echo "Signing the application.."
+  if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
+    codesign --force --deep --sign "Developer ID Application: John Preston" "$ReleasePath/$BinaryName.app"
+  elif [ "$BuildTarget" == "macstore" ]; then
+    codesign --force --deep --sign "3rd Party Mac Developer Application: TELEGRAM MESSENGER LLP (6N38VWS5BX)" "$ReleasePath/$BinaryName.app" --entitlements "Telegram/Telegram Desktop.entitlements"
+  fi
+  echo "Done!"
+
   AppUUID=`dwarfdump -u "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName" | awk -F " " '{print $2}'`
   DsymUUID=`dwarfdump -u "$ReleasePath/$BinaryName.app.dSYM" | awk -F " " '{print $2}'`
   if [ "$AppUUID" != "$DsymUUID" ]; then
@@ -215,6 +262,12 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
     fi
   fi
 
+  SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.sym" | awk -F " " 'END {print $4}'`
+  echo "Copying $BinaryName.sym to $DropboxSymbolsPath/$BinaryName/$SymbolsHash"
+  mkdir -p "$DropboxSymbolsPath/$BinaryName/$SymbolsHash"
+  cp "$ReleasePath/$BinaryName.sym" "$DropboxSymbolsPath/$BinaryName/$SymbolsHash/"
+  echo "Done!"
+
   if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
     if [ "$BetaVersion" == "0" ]; then
       cd "$ReleasePath"
@@ -254,10 +307,10 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
   if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
     echo "Copying $BinaryName.app and $UpdateFile to deploy/$AppVersionStrMajor/$AppVersionStr..";
     mkdir "$DeployPath"
-    mkdir "$DeployPath/Telegram"
-    cp -r "$ReleasePath/$BinaryName.app" "$DeployPath/Telegram/"
+    mkdir "$DeployPath/$BinaryName"
+    cp -r "$ReleasePath/$BinaryName.app" "$DeployPath/$BinaryName/"
     if [ "$BetaVersion" != "0" ]; then
-      cd "$DeployPath" && zip -r "$SetupFile" "Telegram" && mv "$SetupFile" "./../../../" && cd "./../../../$HomePath"
+      cd "$DeployPath" && zip -r "$SetupFile" "$BinaryName" && mv "$SetupFile" "./../../../" && cd "./../../../$HomePath"
       mv "$ReleasePath/$BetaKeyFile" "$DeployPath/"
     fi
     mv "$ReleasePath/$BinaryName.app.dSYM" "$DeployPath/"
@@ -294,6 +347,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
     rm "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName"
     rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature"
 
+    mkdir -p "$DropboxDeployPath"
     cp -v "$DeployPath/$BinaryName.app" "$DropboxDeployPath/"
     cp -rv "$DeployPath/$BinaryName.app.dSYM" "$DropboxDeployPath/"
   fi

Telegram/Deploy.sh

@@ -165,13 +165,7 @@ fi
       fi
     fi
 
-    if [ ! -d "$DropboxPath" ]; then
-      mkdir "$DropboxPath"
-    fi
-
-    if [ ! -d "$DropboxDeployPath" ]; then
-      mkdir "$DropboxDeployPath"
-    fi
+    mkdir -p "$DropboxDeployPath"
   fi
 #fi
 

Telegram/FixMake.sh

@@ -11,12 +11,7 @@ Replace () {
 }
 
 Replace '\-llzma' '\/usr\/lib\/x86_64\-linux\-gnu\/liblzma\.a'
-Replace '\-lz' '\/usr\/lib\/x86_64\-linux\-gnu\/libz\.a'
-Replace '\-lssl' '\/usr\/lib\/x86_64\-linux\-gnu\/libssl\.a'
-Replace '\-lcrypto' '\/usr\/lib\/x86_64\-linux\-gnu\/libcrypto\.a'
-Replace '\-lexif' '\/usr\/lib\/x86_64\-linux\-gnu\/libexif\.a'
-Replace '\-lgobject\-2\.0' '\/usr\/lib\/x86_64\-linux\-gnu\/libgobject\-2\.0\.a \/usr\/lib\/x86_64\-linux\-gnu\/libffi\.a'
-Replace '\-lXi' '\/usr\/lib\/x86_64\-linux\-gnu\/libXi\.a'
+Replace '\-lXi' '\/usr\/lib\/x86_64\-linux\-gnu\/libXi\.a \/usr\/lib\/x86_64\-linux\-gnu\/libXext\.a'
 Replace '\-lSM' '\/usr\/lib\/x86_64\-linux\-gnu\/libSM\.a'
 Replace '\-lICE' '\/usr\/lib\/x86_64\-linux\-gnu\/libICE\.a'
 Replace '\-lfontconfig' '\/usr\/lib\/x86_64\-linux\-gnu\/libfontconfig\.a \/usr\/lib\/x86_64\-linux\-gnu\/libexpat\.a'
@@ -30,3 +25,4 @@ Replace '\-lswresample' '\/usr\/local\/lib\/libswresample\.a'
 Replace '\-lswscale' '\/usr\/local\/lib\/libswscale\.a'
 Replace '\-lavutil' '\/usr\/local\/lib\/libavutil\.a'
 Replace '\-lva' '\/usr\/local\/lib\/libva\.a'
+Replace '\-lQt5Network' '\/usr\/local\/Qt-5.5.1\/lib\/libQt5Network.a \/usr\/local\/ssl\/lib\/libssl.a \/usr\/local\/ssl\/lib\/libcrypto.a'

Telegram/FixMake32.sh

@@ -11,12 +11,7 @@ Replace () {
 }
 
 Replace '\-llzma' '\/usr\/lib\/i386\-linux\-gnu\/liblzma\.a'
-Replace '\-lz' '\/usr\/lib\/i386\-linux\-gnu\/libz\.a'
-Replace '\-lssl' '\/usr\/lib\/i386\-linux\-gnu\/libssl\.a'
-Replace '\-lcrypto' '\/usr\/lib\/i386\-linux\-gnu\/libcrypto\.a'
-Replace '\-lexif' '\/usr\/lib\/i386\-linux\-gnu\/libexif\.a'
-Replace '\-lgobject\-2\.0' '\/usr\/lib\/i386\-linux\-gnu\/libgobject\-2\.0\.a \/usr\/lib\/i386\-linux\-gnu\/libffi\.a'
-Replace '\-lXi' '\/usr\/lib\/i386\-linux\-gnu\/libXi\.a'
+Replace '\-lXi' '\/usr\/lib\/i386\-linux\-gnu\/libXi\.a \/usr\/lib\/i386\-linux\-gnu\/libXext\.a'
 Replace '\-lSM' '\/usr\/lib\/i386\-linux\-gnu\/libSM\.a'
 Replace '\-lICE' '\/usr\/lib\/i386\-linux\-gnu\/libICE\.a'
 Replace '\-lfontconfig' '\/usr\/lib\/i386\-linux\-gnu\/libfontconfig\.a \/usr\/lib\/i386\-linux\-gnu\/libexpat\.a'
@@ -30,3 +25,4 @@ Replace '\-lswresample' '\/usr\/local\/lib\/libswresample\.a'
 Replace '\-lswscale' '\/usr\/local\/lib\/libswscale\.a'
 Replace '\-lavutil' '\/usr\/local\/lib\/libavutil\.a'
 Replace '\-lva' '\/usr\/local\/lib\/libva\.a'
+Replace '\-lQt5Network' '\/usr\/local\/Qt-5.5.1\/lib\/libQt5Network.a \/usr\/local\/ssl\/lib\/libssl.a \/usr\/local\/ssl\/lib\/libcrypto.a'