aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge pull request #1056 from paulfariello/feature/omemo_travis

Browse Source 
Build OMEMO support in travis
This commit is contained in:
Michael Vetter 2019-04-13 10:27:20 +02:00 committed by GitHub
commit c7d7e70b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.travis.yml
View File

@ -5,7 +5,7 @@ install:
- lsb_release -a - lsb_release -a
- uname -a - uname -a
- sudo apt-get update - sudo apt-get update
- sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev libsignal-protocol-c-dev - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev libcmocka-dev
- git clone git://github.com/boothj5/libmesode.git - git clone git://github.com/boothj5/libmesode.git
- cd libmesode - cd libmesode
- mkdir m4 - mkdir m4
@ -15,16 +15,6 @@ install:
- sudo make install - sudo make install
- cd .. - cd ..
- rm -rf libmesode - rm -rf libmesode
- wget https://cmocka.org/files/1.0/cmocka-1.0.0.tar.xz
- tar -xvf cmocka-1.0.0.tar.xz
- cd cmocka-1.0.0
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ..
- make
- sudo make install
- cd ../..
- rm -rf cmocka-1.0.0
- sudo apt-get install libmicrohttpd-dev - sudo apt-get install libmicrohttpd-dev
- git clone git://github.com/boothj5/stabber.git - git clone git://github.com/boothj5/stabber.git
- cd stabber - cd stabber
@ -34,4 +24,15 @@ install:
- sudo make install - sudo make install
- cd .. - cd ..
- rm -rf stabber - rm -rf stabber
- git clone https://github.com/signalapp/libsignal-protocol-c.git
- cd libsignal-protocol-c
- git checkout v2.3.2
- mkdir build
- cd build
- cmake -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../
- make
- sudo make install
- cd ../../
- rm -rf libsignal-protocol-c
- cat /usr/include/gcrypt.h
script: ./travis-build.sh script: ./travis-build.sh

6
configure.ac
View File

@ -280,12 +280,12 @@ if test "x$enable_omemo" != xno; then
[AC_MSG_ERROR([libsignal-protocol-c is required for OMEMO support])], [AC_MSG_ERROR([libsignal-protocol-c is required for OMEMO support])],
[AC_MSG_NOTICE([libsignal-protocol-c not found, OMEMO support not enabled])])])]) [AC_MSG_NOTICE([libsignal-protocol-c not found, OMEMO support not enabled])])])])
AC_CHECK_LIB([gcrypt], [gcry_check_version], AC_CHECK_LIB([gcrypt], [gcry_md_extract],
[LIBS="-lgcrypt $LIBS"], [LIBS="-lgcrypt $LIBS"],
[AM_CONDITIONAL([BUILD_OMEMO], [false]) [AM_CONDITIONAL([BUILD_OMEMO], [false])
AS_IF([test "x$enable_omemo" = xyes], AS_IF([test "x$enable_omemo" = xyes],
[AC_MSG_ERROR([gcrypt is required for OMEMO support])], [AC_MSG_ERROR([gcrypt >= 1.7.0 is required for OMEMO support])],
[AC_MSG_NOTICE([gcrypt not found, OMEMO support not enabled])])]) [AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])])
AM_COND_IF([BUILD_OMEMO], [AC_DEFINE([HAVE_OMEMO], [1], [Have OMEMO])]) AM_COND_IF([BUILD_OMEMO], [AC_DEFINE([HAVE_OMEMO], [1], [Have OMEMO])])
fi fi