Skip to content

Commit

Permalink
Add configure script for cmake.
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Dec 6, 2019
1 parent 9310728 commit b5dc22b
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 8 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ project(Telegram
DESCRIPTION "Official Telegram Desktop messenger"
HOMEPAGE_URL "https://desktop.telegram.org"
)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)

include(cmake/nice_target_sources.cmake)
include(cmake/target_link_static_libraries.cmake)
Expand Down
12 changes: 6 additions & 6 deletions Telegram/build/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ echo.

set "HomePath=%FullScriptPath%.."
set "ResourcesPath=%HomePath%\Resources"
set "SolutionPath=%HomePath%\.."
set "SolutionPath=%HomePath%\..\out"
set "UpdateFile=tupdate%AppVersion%"
set "SetupFile=tsetup.%AppVersionStrFull%.exe"
set "PortableFile=tportable.%AppVersionStrFull%.zip"
set "ReleasePath=%HomePath%\..\out\Release"
set "ReleasePath=%SolutionPath%\Release"
set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%"
set "SignPath=%HomePath%\..\..\DesktopPrivate\Sign.bat"
set "BinaryName=Telegram"
Expand Down Expand Up @@ -105,25 +105,25 @@ if %AlphaVersion% neq 0 (

cd "%HomePath%"

call gyp\refresh.bat
call configure.bat
if %errorlevel% neq 0 goto error

cd "%SolutionPath%"
call ninja -C out/Release Telegram
call cmake --build . --config Release --target Telegram
if %errorlevel% neq 0 goto error

echo.
echo Version %AppVersionStrFull% build successfull. Preparing..
echo.

if not exist "%SolutionPath%\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" (
if not exist "%SolutionPath%\..\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" (
echo Utility dump_syms not found!
exit /b 1
)

echo Dumping debug symbols..
xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\%BinaryName%.exe.exe*"
call "%SolutionPath%\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" "%ReleasePath%\%BinaryName%.exe.pdb" > "%ReleasePath%\%BinaryName%.exe.sym"
call "%SolutionPath%\..\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" "%ReleasePath%\%BinaryName%.exe.pdb" > "%ReleasePath%\%BinaryName%.exe.sym"
del "%ReleasePath%\%BinaryName%.exe.exe"
echo Done!

Expand Down
12 changes: 12 additions & 0 deletions Telegram/configure.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@echo OFF

set "FullScriptPath=%~dp0"

python %FullScriptPath%configure.py %*
if %errorlevel% neq 0 goto error

exit /b

:error
echo FAILED
exit /b 1
54 changes: 54 additions & 0 deletions Telegram/configure.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
'''
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
'''
import sys, os, re

sys.dont_write_bytecode = True
scriptPath = os.path.dirname(os.path.realpath(__file__))
sys.path.append(scriptPath + '/../cmake')
import run_cmake

executePath = os.getcwd()
def finish(code):
global executePath
os.chdir(executePath)
sys.exit(code)

def error(message):
print('[ERROR] ' + message)
finish(1)

if sys.platform == 'win32' and not 'COMSPEC' in os.environ:
error('COMSPEC environment variable is not set.')

executePath = os.getcwd()
scriptPath = os.path.dirname(os.path.realpath(__file__))

arguments = sys.argv[1:]

officialTarget = ''
officialTargetFile = scriptPath + '/build/target'
if os.path.isfile(officialTargetFile):
with open(officialTargetFile, 'r') as f:
for line in f:
officialTarget = line.strip()

if officialTarget != '':
officialApiIdFile = scriptPath + '/../../DesktopPrivate/custom_api_id.h'
if not os.path.isfile(officialApiIdFile):
print("[ERROR] DesktopPrivate/custom_api_id.h not found.")
finish(1)
with open(officialApiIdFile, 'r') as f:
for line in f:
apiIdMatch = re.search(r'ApiId\s+=\s+(\d+)', line)
apiHashMatch = re.search(r'ApiHash\s+=\s+"([a-fA-F\d]+)"', line)
if apiIdMatch:
arguments.append('-DTDESKTOP_API_ID=' + apiIdMatch.group(1))
elif apiHashMatch:
arguments.append('-DTDESKTOP_API_HASH=' + apiHashMatch.group(1))

finish(run_cmake.run(os.path.basename(scriptPath), arguments))
2 changes: 1 addition & 1 deletion Telegram/lib_base
Submodule lib_base updated 1 files
+2 −5 CMakeLists.txt

0 comments on commit b5dc22b

Please sign in to comment.