timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build and test improvements

Browse source 
- build both Python2 and Python3 libs by default, and add separate rules
  building Python2 and Python.
- use the libraries as built by setuptools, rather than building again
  separately
This commit is contained in:
Hubert Chathi 2018-10-12 19:06:46 -04:00
parent 29b021b183
commit 718763f8fc
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
python/Makefile
View file

@ -1,41 +1,41 @@
PYTHON ?= python all: olm-python2 olm-python3
all: olm
include/olm/olm.h: ../include/olm/olm.h ../include/olm/inbound_group_session.h ../include/olm/outbound_group_session.h include/olm/olm.h: ../include/olm/olm.h ../include/olm/inbound_group_session.h ../include/olm/outbound_group_session.h
mkdir -p include/olm mkdir -p include/olm
$(CPP) -I dummy -I ../include ../include/olm/olm.h -o include/olm/olm.h $(CPP) -I dummy -I ../include ../include/olm/olm.h -o include/olm/olm.h
olm: include/olm/olm.h olm-python2: include/olm/olm.h
DEVELOP=$(DEVELOP) $(PYTHON) setup.py build DEVELOP=$(DEVELOP) python2 setup.py build
install: olm olm-python3: include/olm/olm.h
$(PYTHON) setup.py install --skip-build -O1 --root=$(DESTDIR) DEVELOP=$(DEVELOP) python3 setup.py build
test: develop py2develop install: install-python2 install-python3
python3 -m pytest
python2 -m pytest install-python2: olm-python2
python3 -m pytest --flake8 --benchmark-disable python2 setup.py install --skip-build -O1 --root=$(DESTDIR)
python3 -m pytest --isort --benchmark-disable
python3 -m pytest --cov --cov-branch --benchmark-disable install-python3: olm-python3
python3 setup.py install --skip-build -O1 --root=$(DESTDIR)
test: olm-python2 olm-python3
rm -rf install-temp
mkdir -p install-temp/2 install-temp/3
PYTHONPATH=install-temp/2 python2 setup.py install --skip-build --install-lib install-temp/2 --install-script install-temp/bin
PYTHONPATH=install-temp/3 python3 setup.py install --skip-build --install-lib install-temp/3 --install-script install-temp/bin
PYTHONPATH=install-temp/3 python3 -m pytest
PYTHONPATH=install-temp/2 python2 -m pytest
PYTHONPATH=install-temp/3 python3 -m pytest --flake8 --benchmark-disable
PYTHONPATH=install-temp/3 python3 -m pytest --isort --benchmark-disable
PYTHONPATH=install-temp/3 python3 -m pytest --cov --cov-branch --benchmark-disable
rm -rf install-temp
clean: clean:
-rm -r python_olm.egg-info/ dist/ __pycache__/ rm -rf python_olm.egg-info/ dist/ __pycache__/
-rm *.so _libolm.o rm -rf *.so _libolm.o
-rm -r packages/ rm -rf packages/
-rm -r build/ rm -rf build/
rm -rf install-temp/
rm -rf include/
develop: _libolm.o .PHONY: all olm-python2 olm-python3 install install-python2 install-python3 clean test
py2develop: _libolm.so
_libolm.so: DEVELOP ?= 1
_libolm.so: include/olm/olm.h olm_build.py
DEVELOP=$(DEVELOP) python2 olm_build.py
-rm _libolm.c
_libolm.o: DEVELOP ?= 1
_libolm.o: include/olm/olm.h olm_build.py
DEVELOP=$(DEVELOP) python3 olm_build.py
-rm _libolm.c
.PHONY: all olm install clean test develop