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

2015-10-20 11:29:48 +02:00 · 2015-10-20 11:29:48 +02:00 · 8dd57e2845
parent 20d7f74c33 ee5f393009
commit 8dd57e2845
6 changed files with 186 additions and 15 deletions
--- a/Telegram/Build.bat
+++ b/Telegram/Build.bat
@ -0,0 +1,123 @@
+@echo OFF
+FOR /F "tokens=1,2* delims= " %%i in (Version) do set "%%i=%%j"
+
+if %DevChannel% neq 0 goto preparedev
+
+set "DevParam="
+set "AppVersionStrFull=%AppVersionStr%"
+goto devprepared
+
+:preparedev
+
+set "DevParam=-dev"
+set "AppVersionStrFull=%AppVersionStr%.dev"
+
+:devprepared
+
+echo.
+echo Building version %AppVersionStrFull% for Windows..
+echo.
+
+if exist ..\Win32\Deploy\deploy\%AppVersionStrMajor%\%AppVersionStr%\ goto error_exist1
+if exist ..\Win32\Deploy\deploy\%AppVersionStrMajor%\%AppVersionStr%.dev\ goto error_exist2
+if exist ..\Win32\Deploy\tupdate%AppVersion% goto error_exist3
+
+cd SourceFiles\
+copy telegram.qrc /B+,,/Y
+cd ..\
+if %errorlevel% neq 0 goto error
+
+cd ..\
+MSBuild Telegram.sln /property:Configuration=Deploy
+if %errorlevel% neq 0 goto error0
+
+echo .
+echo Version %AppVersionStrFull% build successfull! Preparing..
+echo .
+
+set "PATH=%PATH%;C:\Program Files\7-Zip;C:\Program Files (x86)\Inno Setup 5"
+cd Win32\Deploy\
+
+call ..\..\..\TelegramPrivate\Sign.bat Telegram.exe
+if %errorlevel% neq 0 goto error1
+
+call ..\..\..\TelegramPrivate\Sign.bat Updater.exe
+if %errorlevel% neq 0 goto error1
+
+iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% ..\..\Telegram\Setup.iss
+if %errorlevel% neq 0 goto error1
+
+call ..\..\..\TelegramPrivate\Sign.bat tsetup.%AppVersionStrFull%.exe
+if %errorlevel% neq 0 goto error1
+
+call Packer.exe -version %AppVersion% -path Telegram.exe -path Updater.exe %DevParam%
+if %errorlevel% neq 0 goto error1
+
+if not exist deploy mkdir deploy
+if not exist deploy\%AppVersionStrMajor% mkdir deploy\%AppVersionStrMajor%
+mkdir deploy\%AppVersionStrMajor%\%AppVersionStrFull%
+mkdir deploy\%AppVersionStrMajor%\%AppVersionStrFull%\Telegram
+if %errorlevel% neq 0 goto error1
+
+move Telegram.exe deploy\%AppVersionStrMajor%\%AppVersionStrFull%\Telegram\
+move Updater.exe deploy\%AppVersionStrMajor%\%AppVersionStrFull%\
+move Telegram.pdb deploy\%AppVersionStrMajor%\%AppVersionStrFull%\
+move Updater.pdb deploy\%AppVersionStrMajor%\%AppVersionStrFull%\
+move tsetup.%AppVersionStrFull%.exe deploy\%AppVersionStrMajor%\%AppVersionStrFull%\
+move tupdate%AppVersion% deploy\%AppVersionStrMajor%\%AppVersionStrFull%\
+if %errorlevel% neq 0 goto error1
+
+cd deploy\%AppVersionStrMajor%\%AppVersionStrFull%\
+7z a -mx9 tportable.%AppVersionStrFull%.zip Telegram\
+if %errorlevel% neq 0 goto error2
+
+echo .
+echo Version %AppVersionStrFull% is ready for deploy!
+echo .
+
+if not exist tupdate%AppVersion% goto error2
+if not exist tportable.%AppVersionStrFull%.zip goto error2
+if not exist tsetup.%AppVersionStrFull%.exe goto error2
+if not exist Telegram.pdb goto error2
+if not exist Updater.exe goto error2
+if not exist Updater.pdb goto error2
+if not exist Z:\TBuild\tother\tsetup\%AppVersionStrMajor% mkdir Z:\TBuild\tother\tsetup\%AppVersionStrMajor%
+if not exist Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull% mkdir Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull%
+
+xcopy tupdate%AppVersion% Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull%\
+xcopy tportable.%AppVersionStrFull%.zip Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull%\
+xcopy tsetup.%AppVersionStrFull%.exe Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull%\
+xcopy Telegram.pdb Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull%\
+xcopy Updater.exe Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull%\
+xcopy Updater.pdb Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStrFull%\
+
+echo Version %AppVersionStrFull% is ready!
+
+cd ..\..\..\..\..\Telegram\
+goto eof
+
+:error2
+cd ..\..\..\
+:error1
+cd ..\..\
+:error0
+cd Telegram\
+goto error
+
+:error_exist1
+echo Deploy folder for version %AppVersionStr% already exists!
+exit /b 1
+
+:error_exist2
+echo Deploy folder for version %AppVersionStr%.dev already exists!
+exit /b 1
+
+:error_exist3
+echo Update file for version %AppVersion% already exists!
+exit /b 1
+
+:error
+echo ERROR occured!
+exit /b %errorlevel%
+
+:eof
--- a/Telegram/FixMake.sh
+++ b/Telegram/FixMake.sh
@ -21,7 +21,6 @@ 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'
 Replace '\-lfreetype' '\/usr\/lib\/x86_64\-linux\-gnu\/libfreetype\.a'
-Replace '\-lpng' '\/usr\/lib\/x86_64\-linux\-gnu\/libpng\.a'
 Replace '\-lXext' '\/usr\/lib\/x86_64\-linux\-gnu\/libXext\.a'
 Replace '\-lopus' '\/usr\/local\/lib\/libopus\.a'
 Replace '\-lopenal' '\/usr\/local\/lib\/libopenal\.a'
--- a/Telegram/SourceFiles/gui/text.h
+++ b/Telegram/SourceFiles/gui/text.h
@ -676,7 +676,7 @@ inline bool chIsTrimmed(QChar ch, bool rich = false) {
 }
 inline bool chIsDiac(QChar ch) { // diac and variation selectors
 	QChar::Category c = ch.category();
-	return (c == QChar::Mark_NonSpacing);
+	return (c == QChar::Mark_NonSpacing) || (ch.unicode() == 1652);
 }
 inline int32 chMaxDiacAfterSymbol() {
 	return 2;
--- a/Telegram/Telegram.vcxproj
+++ b/Telegram/Telegram.vcxproj
@ -2119,6 +2119,9 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </None>
+    <None Include="Telegram.plist" />
+    <None Include="Telegram.xcodeproj\project.pbxproj" />
+    <None Include="Version" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/Telegram/Telegram.vcxproj.filters
+++ b/Telegram/Telegram.vcxproj.filters
@ -40,6 +40,12 @@
    <Filter Include="langs">
      <UniqueIdentifier>{67311646-a8af-4626-976d-0a5733bf90e8}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{df139398-6d5d-4bd5-8abe-b509b102f5d8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Version">
+      <UniqueIdentifier>{9d7bbb7d-817b-4f19-a719-74e674bdc84b}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="SourceFiles\main.cpp">
@ -1006,8 +1012,6 @@
    <CustomBuild Include="SourceFiles\gui\flatbutton.h">
      <Filter>gui</Filter>
    </CustomBuild>
-    <CustomBuild Include="Resources\style_classes.txt" />
-    <CustomBuild Include="Resources\style.txt" />
    <CustomBuild Include="SourceFiles\gui\flatinput.h">
      <Filter>gui</Filter>
    </CustomBuild>
@ -1143,10 +1147,6 @@
    <CustomBuild Include="SourceFiles\localstorage.h">
      <Filter>Source Files</Filter>
    </CustomBuild>
-    <CustomBuild Include="Resources\lang.strings" />
-    <CustomBuild Include="SourceFiles\telegram.qrc" />
-    <CustomBuild Include="SourceFiles\telegram_emojis.qrc" />
-    <CustomBuild Include="SourceFiles\telegram_wnd.qrc" />
    <CustomBuild Include="SourceFiles\boxes\languagebox.h">
      <Filter>boxes</Filter>
    </CustomBuild>
@ -1189,13 +1189,27 @@
    <CustomBuild Include="SourceFiles\playerwidget.h">
      <Filter>Source Files</Filter>
    </CustomBuild>
-    <CustomBuild Include="Resources\numbers.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="SourceFiles\art\icon256.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Telegram.rc" />
+    <CustomBuild Include="Resources\lang.strings">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="Resources\numbers.txt">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="Resources\style.txt">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="Resources\style_classes.txt">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="SourceFiles\telegram.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="SourceFiles\telegram_emojis.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="SourceFiles\telegram_wnd.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
    <None Include="SourceFiles\langs\lang_it.strings">
@ -1219,5 +1233,24 @@
    <None Include="SourceFiles\pspecific_mac_p.mm">
      <Filter>Source Files</Filter>
    </None>
+    <None Include="Telegram.xcodeproj\project.pbxproj">
+      <Filter>Version</Filter>
+    </None>
+    <None Include="Telegram.plist">
+      <Filter>Version</Filter>
+    </None>
+    <None Include="Version">
+      <Filter>Version</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="SourceFiles\art\icon256.ico">
+      <Filter>Resources</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Telegram.rc">
+      <Filter>Version</Filter>
+    </ResourceCompile>
  </ItemGroup>
 </Project>
--- a/Telegram/_openssl_patch.diff
+++ b/Telegram/_openssl_patch.diff
@ -0,0 +1,13 @@
+diff --git a/e_os.h b/e_os.h
+index 7584485..0b37c94 100644
+--- a/e_os.h
+++ b/e_os.h
+@@ -315,7 +315,7 @@ static __inline unsigned int _strlen31(const char *str)
+ #    undef isxdigit
+ #   endif
+ #   if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)
+-#    if _MSC_VER>=1300
+#    if (_MSC_VER>=1300) && (_MSC_VER<=1800)
+ #     undef stdin
+ #     undef stdout
+ #     undef stderr