mirrors
/
olm
mirror of https://git.matrix.org/git/olm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

python: Build the build headers with setup.py. 

This allows downstream users to install this python module with pip as
well as allowing people to declare it as a dependency in their setup.py.

Signed-off-by: Damir Jelić <poljar@termina.org.uk>
poljar/cmake_sas
Damir Jelić 2018-11-28 14:54:11 +01:00 committed by Hubert Chathi
parent f1d45c2cd3
commit 709687a7b5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/Makefile
View File

@ -12,10 +12,12 @@ include/olm/olm.h: $(OLM_HEADERS)
include/olm/pk.h: include/olm/olm.h ../include/olm/pk.h
$(CPP) -I dummy -I ../include ../include/olm/pk.h -o include/olm/pk.h
olm-python2: include/olm/olm.h include/olm/pk.h
headers: include/olm/olm.h include/olm/pk.h
olm-python2: headers
DEVELOP=$(DEVELOP) python2 setup.py build
olm-python3: include/olm/olm.h include/olm/pk.h
olm-python3: headers
DEVELOP=$(DEVELOP) python3 setup.py build
install: install-python2 install-python3

3
python/olm_build.py
View File

@ -18,6 +18,7 @@
from __future__ import unicode_literals
import os
import subprocess
from cffi import FFI
@ -32,6 +33,8 @@ link_args = ["-L../build"]
if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]:
link_args.append('-Wl,-rpath=../build')
headers_build = subprocess.Popen("make headers", shell=True)
headers_build.wait()
ffibuilder.set_source(
"_libolm",