RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move GSL dependency to a submodule.

This commit is contained in:
John Preston 2017-03-10 14:22:23 +03:00
parent e4f7b3c7c2
commit 7da52bd3ec
11 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.appveyor/install.bat
View File

@ -27,10 +27,6 @@ GOTO:EOF
call:logInfo "Clone dependencies repository"
git clone -q --branch=master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
cd %LIB_DIR%
call:logInfo "Clone GSL"
git clone https://github.com/Microsoft/GSL.git
call prepare.bat
GOTO:EOF
@ -39,6 +35,9 @@ GOTO:EOF
cd %LIB_DIR%
git clone https://chromium.googlesource.com/external/gyp
SET PATH=%PATH%;C:\TBuild\Libraries\gyp;C:\TBuild\Libraries\ninja;
cd %SRC_DIR%
git submodule init
git submodule update
cd %SRC_DIR%\Telegram
call gyp\refresh.bat
GOTO:EOF

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "third_party/GSL"]
path = third_party/GSL
url = https://github.com/Microsoft/GSL.git

6
.travis/build.sh
View File

@ -543,8 +543,9 @@ buildCustomQt() {
}
getGSL() {
cd "$EXTERNAL"
git clone https://github.com/Microsoft/GSL.git
cd "$UPSTREAM"
git submodule init
git submodule update
}
getGYP() {
@ -602,7 +603,6 @@ buildTelegram() {
cd "$UPSTREAM/Telegram/gyp"
"$GYP_PATH/gyp" \
-Dbuild_defines=${GYP_DEFINES:1} \
-Dlinux_path_gsl=$EXTERNAL/GSL \
-Dlinux_path_xkbcommon=$XKB_PATH \
-Dlinux_path_va=$VA_PATH \
-Dlinux_path_vdpau=$VDPAU_PATH \

3
Telegram/gyp/Telegram.gyp
View File

@ -30,6 +30,7 @@
'libs_loc': '<(libs_loc)',
'src_loc': '../SourceFiles',
'res_loc': '../Resources',
'submodules_loc': '../../third_party',
'third_party_loc': '../ThirdParty',
'minizip_loc': '<(third_party_loc)/minizip',
'sp_media_key_tap_loc': '<(third_party_loc)/SPMediaKeyTap',
@ -94,7 +95,7 @@
'<(libs_loc)/openal-soft/include',
'<(minizip_loc)',
'<(sp_media_key_tap_loc)',
'<(libs_loc)/GSL/include',
'<(submodules_loc)/GSL/include',
],
'sources': [
'<@(qrc_files)',

2
Telegram/gyp/telegram_linux.gypi
View File

@ -33,14 +33,12 @@
'linux_path_va%': '/usr/local',
'linux_path_vdpau%': '/usr/local',
'linux_path_breakpad%': '<(libs_loc)/breakpad',
'linux_path_gsl%': '<(libs_loc)/GSL',
},
'include_dirs': [
'/usr/local/include',
'<(linux_path_ffmpeg)/include',
'<(linux_path_openal)/include',
'<(linux_path_breakpad)/include/breakpad',
'<(linux_path_gsl)/include',
],
'library_dirs': [
'/usr/local/lib',

6
doc/building-cmake.md
View File

@ -21,7 +21,7 @@ Choose a folder for the future build, for example **/home/user/TBuild** There yo
By git – in Terminal go to **/home/user/TBuild** and run
git clone https://github.com/telegramdesktop/tdesktop.git
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
###Prepare libraries
@ -29,10 +29,6 @@ Install dev libraries
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev libdee-dev
From **/home/user/TBuild/Libraries** run
git clone https://github.com/Microsoft/GSL.git
####zlib 1.2.8
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8, zipfile format**](http://zlib.net/zlib128.zip)

6
doc/building-msvc.md
View File

@ -46,15 +46,11 @@ Go to **D:\\TBuild**
and run
git clone https://github.com/telegramdesktop/tdesktop.git
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
mkdir Libraries
## Prepare libraries
From **D:\\TBuild\\Libraries** run
git clone https://github.com/Microsoft/GSL.git
### OpenSSL
Go to **D:\\TBuild\\Libraries** and run

6
doc/building-qtcreator.md
View File

@ -24,7 +24,7 @@ Choose a folder for the future build, for example **/home/user/TBuild** There yo
By git – in Terminal go to **/home/user/TBuild** and run
git clone https://github.com/telegramdesktop/tdesktop.git
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
###Prepare libraries
@ -32,10 +32,6 @@ Install dev libraries
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev
From **/home/user/TBuild/Libraries** run
git clone https://github.com/Microsoft/GSL.git
####zlib 1.2.8
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8, zipfile format**](http://zlib.net/zlib128.zip)

6
doc/building-xcode-old.md
View File

@ -10,7 +10,7 @@ Choose a folder for the future build, for example **/Users/user/TBuild** There y
By git – in Terminal go to **/Users/user/TBuild** and run
git clone https://github.com/telegramdesktop/tdesktop.git
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
then go to **/Users/user/TBuild/tdesktop** and run
@ -32,10 +32,6 @@ In your build Terminal run
to set minimal supported OS version to 10.6 for future console builds.
From **/Users/user/TBuild/Libraries** run
git clone https://github.com/Microsoft/GSL.git
####custom build of libc++
From **/Users/user/TBuild/Libraries/macold** run

6
doc/building-xcode.md
View File

@ -12,7 +12,7 @@ There you will have two folders, **Libraries** for third-party libs and **tdeskt
By git – in Terminal go to **/Users/user/TBuild** and run:
git clone https://github.com/telegramdesktop/tdesktop.git
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
###Prepare libraries
@ -22,10 +22,6 @@ In your build Terminal run:
to set minimal supported OS version to 10.8 for future console builds.
From **/Users/user/TBuild/Libraries** run
git clone https://github.com/Microsoft/GSL.git
####zlib 1.2.8
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8**](http://www.zlib.net/fossils/zlib-1.2.8.tar.gz)

1
third_party/GSL vendored Submodule

@ -0,0 +1 @@
Subproject commit f9c47dd63fe25cc216294fbe7e2fbe4f9a302ca3