From e757e6f67ba1be38efa842537ee6fa29ade50c2f Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 26 Sep 2019 12:52:36 +0300 Subject: [PATCH] Move private folder. --- Telegram/Resources/langs/download.sh | 2 +- Telegram/Resources/langs/refresh.sh | 2 +- Telegram/Resources/langs/upload.sh | 2 +- Telegram/SourceFiles/_other/packer.cpp | 4 ++-- Telegram/SourceFiles/config.h | 2 +- Telegram/build/build.bat | 4 ++-- Telegram/build/build.sh | 2 +- Telegram/build/deploy.sh | 6 +++--- Telegram/build/release.py | 2 +- Telegram/build/release.sh | 2 +- Telegram/build/test_package.bat | 4 ++-- Telegram/build/updates.py | 2 +- Telegram/build/updates.sh | 2 +- Telegram/gyp/generate.py | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Telegram/Resources/langs/download.sh b/Telegram/Resources/langs/download.sh index 92f1ef1db3..a4da694045 100755 --- a/Telegram/Resources/langs/download.sh +++ b/Telegram/Resources/langs/download.sh @@ -5,7 +5,7 @@ pushd `dirname $0` > /dev/null FullScriptPath=`pwd` popd > /dev/null -if [ ! -d "$FullScriptPath/../../../../TelegramPrivate" ]; then +if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then echo "" echo "This script is for building the production version of Telegram Desktop." echo "" diff --git a/Telegram/Resources/langs/refresh.sh b/Telegram/Resources/langs/refresh.sh index 033b373823..cd705f35fc 100755 --- a/Telegram/Resources/langs/refresh.sh +++ b/Telegram/Resources/langs/refresh.sh @@ -6,7 +6,7 @@ popd > /dev/null FileName="$1" -if [ ! -d "$FullScriptPath/../../../../TelegramPrivate" ]; then +if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then echo "" echo "This script is for building the production version of Telegram Desktop." echo "" diff --git a/Telegram/Resources/langs/upload.sh b/Telegram/Resources/langs/upload.sh index e20706990d..fcbf4f2a0e 100755 --- a/Telegram/Resources/langs/upload.sh +++ b/Telegram/Resources/langs/upload.sh @@ -5,7 +5,7 @@ pushd `dirname $0` > /dev/null FullScriptPath=`pwd` popd > /dev/null -if [ ! -d "$FullScriptPath/../../../../TelegramPrivate" ]; then +if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then echo "" echo "This script is for building the production version of Telegram Desktop." echo "" diff --git a/Telegram/SourceFiles/_other/packer.cpp b/Telegram/SourceFiles/_other/packer.cpp index 4b0df96686..d6332970d3 100644 --- a/Telegram/SourceFiles/_other/packer.cpp +++ b/Telegram/SourceFiles/_other/packer.cpp @@ -35,8 +35,8 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\ extern const char *PrivateKey; extern const char *PrivateBetaKey; -#include "../../../../TelegramPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing -#include "../../../../TelegramPrivate/alpha_private.h" // private key for alpha version file generation +#include "../../../../DesktopPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing +#include "../../../../DesktopPrivate/alpha_private.h" // private key for alpha version file generation QString countAlphaVersionSignature(quint64 version); diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index d3460cc085..fb7b54e4df 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -183,7 +183,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb"; #if (TDESKTOP_ALPHA_VERSION != 0) // Private key for downloading closed alphas. -#include "../../../TelegramPrivate/alpha_private.h" +#include "../../../DesktopPrivate/alpha_private.h" #else static const char *AlphaPrivateKey = ""; diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat index f66abd7fbf..d23c583fff 100644 --- a/Telegram/build/build.bat +++ b/Telegram/build/build.bat @@ -3,7 +3,7 @@ setlocal enabledelayedexpansion set "FullScriptPath=%~dp0" set "FullExecPath=%cd%" -if not exist "%FullScriptPath%..\..\..\TelegramPrivate" ( +if not exist "%FullScriptPath%..\..\..\DesktopPrivate" ( echo. echo This script is for building the production version of Telegram Desktop. echo. @@ -54,7 +54,7 @@ set "SetupFile=tsetup.%AppVersionStrFull%.exe" set "PortableFile=tportable.%AppVersionStrFull%.zip" set "ReleasePath=%HomePath%\..\out\Release" set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%" -set "SignPath=%HomePath%\..\..\TelegramPrivate\Sign.bat" +set "SignPath=%HomePath%\..\..\DesktopPrivate\Sign.bat" set "BinaryName=Telegram" set "DropboxSymbolsPath=Y:\Telegram\symbols" set "FinalReleasePath=Z:\Telegram\backup" diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index 02cc9e6394..02a4aa188d 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -4,7 +4,7 @@ pushd `dirname $0` > /dev/null FullScriptPath=`pwd` popd > /dev/null -if [ ! -d "$FullScriptPath/../../../TelegramPrivate" ]; then +if [ ! -d "$FullScriptPath/../../../DesktopPrivate" ]; then echo "" echo "This script is for building the production version of Telegram Desktop." echo "" diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh index a1b99d31dd..036b63c0f0 100755 --- a/Telegram/build/deploy.sh +++ b/Telegram/build/deploy.sh @@ -4,7 +4,7 @@ pushd `dirname $0` > /dev/null FullScriptPath=`pwd` popd > /dev/null -if [ ! -d "$FullScriptPath/../../../TelegramPrivate" ]; then +if [ ! -d "$FullScriptPath/../../../DesktopPrivate" ]; then echo "" echo "This script is for building the production version of Telegram Desktop." echo "" @@ -186,7 +186,7 @@ if [ "$DeployLinux32" == "1" ]; then fi fi -$FullScriptPath/../../../TelegramPrivate/mount.sh +$FullScriptPath/../../../DesktopPrivate/mount.sh declare -a Files if [ "$DeployMac" == "1" ]; then @@ -208,7 +208,7 @@ if [ "$DeployLinux32" == "1" ]; then Files+=("tlinux32/$Linux32UpdateFile" "tlinux32/$Linux32SetupFile") fi cd $DeployPath -rsync -avR --progress ${Files[@]} "$FullScriptPath/../../../TelegramPrivate/remote/files" +rsync -avR --progress ${Files[@]} "$FullScriptPath/../../../DesktopPrivate/remote/files" echo "Version $AppVersionStrFull was deployed!" cd $FullExecPath diff --git a/Telegram/build/release.py b/Telegram/build/release.py index e1ac78055c..7678adfc5e 100644 --- a/Telegram/build/release.py +++ b/Telegram/build/release.py @@ -4,7 +4,7 @@ from subprocess import call from os.path import expanduser changelog_file = '../../changelog.txt' -token_file = '../../../TelegramPrivate/github-releases-token.txt' +token_file = '../../../DesktopPrivate/github-releases-token.txt' version = '' commit = '' diff --git a/Telegram/build/release.sh b/Telegram/build/release.sh index abbb049965..57be119f1f 100755 --- a/Telegram/build/release.sh +++ b/Telegram/build/release.sh @@ -9,7 +9,7 @@ Param2="$2" Param3="$3" Param4="$4" -if [ ! -d "$FullScriptPath/../../../TelegramPrivate" ]; then +if [ ! -d "$FullScriptPath/../../../DesktopPrivate" ]; then echo "" echo "This script is for building the production version of Telegram Desktop." echo "" diff --git a/Telegram/build/test_package.bat b/Telegram/build/test_package.bat index b7875c9dd2..bec56f8313 100644 --- a/Telegram/build/test_package.bat +++ b/Telegram/build/test_package.bat @@ -3,7 +3,7 @@ setlocal enabledelayedexpansion set "FullScriptPath=%~dp0" set "FullExecPath=%cd%" -if not exist "%FullScriptPath%..\..\..\TelegramPrivate" ( +if not exist "%FullScriptPath%..\..\..\DesktopPrivate" ( echo. echo This script is for building the production version of Telegram Desktop. echo. @@ -13,7 +13,7 @@ if not exist "%FullScriptPath%..\..\..\TelegramPrivate" ( ) set "HomePath=%FullScriptPath%.." -set "SignAppxPath=%HomePath%\..\..\TelegramPrivate\AppxSign.bat" +set "SignAppxPath=%HomePath%\..\..\DesktopPrivate\AppxSign.bat" set "ResourcesPath=%HomePath%\Resources" set "SolutionPath=%HomePath%\.." set "ReleasePath=%HomePath%\..\out\Debug" diff --git a/Telegram/build/updates.py b/Telegram/build/updates.py index 69a3f15f5b..8ffd5e96b1 100644 --- a/Telegram/build/updates.py +++ b/Telegram/build/updates.py @@ -183,7 +183,7 @@ if building: commandPath = scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt' if composing: - templatePath = scriptPath + '/../../../TelegramPrivate/updates_template.txt' + templatePath = scriptPath + '/../../../DesktopPrivate/updates_template.txt' if not os.path.exists(templatePath): finish(1, 'Template file "' + templatePath + '" not found.') diff --git a/Telegram/build/updates.sh b/Telegram/build/updates.sh index 1dad4e4b95..ffb76f1aaa 100755 --- a/Telegram/build/updates.sh +++ b/Telegram/build/updates.sh @@ -4,7 +4,7 @@ pushd `dirname $0` > /dev/null FullScriptPath=`pwd` popd > /dev/null -if [ ! -d "$FullScriptPath/../../../TelegramPrivate" ]; then +if [ ! -d "$FullScriptPath/../../../DesktopPrivate" ]; then echo "" echo "This script is for building the production version of Telegram Desktop." echo "" diff --git a/Telegram/gyp/generate.py b/Telegram/gyp/generate.py index b6c6df7b4f..4ffcdd87ae 100644 --- a/Telegram/gyp/generate.py +++ b/Telegram/gyp/generate.py @@ -42,9 +42,9 @@ if os.path.isfile(officialTargetFile): officialTarget = line.strip() if officialTarget != '': - officialApiIdFile = scriptPath + '/../../../TelegramPrivate/custom_api_id.h' + officialApiIdFile = scriptPath + '/../../../DesktopPrivate/custom_api_id.h' if not os.path.isfile(officialApiIdFile): - print("[ERROR] TelegramPrivate/custom_api_id.h not found.") + print("[ERROR] DesktopPrivate/custom_api_id.h not found.") finish(1) with open(officialApiIdFile, 'r') as f: for line in f: