diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-11-03 16:39:40 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-12-17 10:52:57 +0100 |
| commit | 53b60546e43caecdfb0d9e1b91cd5f309d08cf52 (patch) | |
| tree | 91f22d1e2d2df978eb309b067ca63c466d9b8fc7 /ipapython | |
| parent | 58331208a5ded367e521d42d99de2835f329fab7 (diff) | |
| download | freeipa-53b60546e43caecdfb0d9e1b91cd5f309d08cf52.tar.gz freeipa-53b60546e43caecdfb0d9e1b91cd5f309d08cf52.tar.xz freeipa-53b60546e43caecdfb0d9e1b91cd5f309d08cf52.zip | |
Package ipapython, ipalib, ipaplatform, ipatests for Python 3
Running make with PYTHON=/usr/bin/python3 will build/install the
bits for Python 3.
Executable scripts in ipatests have symlinks Python version suffixes
as per Fedora guidelines. Suffix-less names point to the Python 2 versions.
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/Makefile | 18 | ||||
| -rw-r--r-- | ipapython/ipap11helper/Makefile | 11 | ||||
| -rw-r--r-- | ipapython/py_default_encoding/Makefile | 21 |
3 files changed, 23 insertions, 27 deletions
diff --git a/ipapython/Makefile b/ipapython/Makefile index a865ca758..833f3cdc5 100644 --- a/ipapython/Makefile +++ b/ipapython/Makefile @@ -1,7 +1,5 @@ -PYTHONLIBDIR ?= $(shell python2 -c "from distutils.sysconfig import *; print get_python_lib()") -PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa -CONFIGDIR ?= $(DESTDIR)/etc/ipa -TESTS = $(wildcard test/*.py) +PYTHON ?= /usr/bin/python2 +PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib())") SUBDIRS = py_default_encoding ipap11helper @@ -15,16 +13,16 @@ check: .PHONY: install install: if [ "$(DESTDIR)" = "" ]; then \ - python2 setup.py install; \ + $(PYTHON) setup.py install; \ else \ - python2 setup.py install --root $(DESTDIR); \ + $(PYTHON) setup.py install --root $(DESTDIR); \ fi @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done clean: - rm -f *~ *.pyc + rm -f *~ *.pyc __pycache__/ @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done @@ -40,9 +38,3 @@ maintainer-clean: distclean @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done - -.PHONY: test -test: $(subst .py,.tst,$(TESTS)) - -%.tst: %.py - python2 $< diff --git a/ipapython/ipap11helper/Makefile b/ipapython/ipap11helper/Makefile index 88f17f705..f66edb82e 100644 --- a/ipapython/ipap11helper/Makefile +++ b/ipapython/ipap11helper/Makefile @@ -1,15 +1,14 @@ -PYTHONLIBDIR ?= $(shell python2 -c "from distutils.sysconfig import *; print get_python_lib()") -PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa -CONFIGDIR ?= $(DESTDIR)/etc/ipa +PYTHON ?= /usr/bin/python2 +PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib())") all: - python2 setup.py build + $(PYTHON) setup.py build install: if [ "$(DESTDIR)" = "" ]; then \ - python2 setup.py install; \ + $(PYTHON) setup.py install; \ else \ - python2 setup.py install --root $(DESTDIR); \ + $(PYTHON) setup.py install --root $(DESTDIR); \ fi clean: diff --git a/ipapython/py_default_encoding/Makefile b/ipapython/py_default_encoding/Makefile index 88f17f705..a73f429db 100644 --- a/ipapython/py_default_encoding/Makefile +++ b/ipapython/py_default_encoding/Makefile @@ -1,15 +1,20 @@ -PYTHONLIBDIR ?= $(shell python2 -c "from distutils.sysconfig import *; print get_python_lib()") -PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa -CONFIGDIR ?= $(DESTDIR)/etc/ipa +PYTHON ?= /usr/bin/python2 +PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib())") +PYTHONVERSION ?= $(shell $(PYTHON) -c "import sys; print(sys.version_info[0])") all: - python2 setup.py build + if [ "$(PYTHONVERSION)" = "2" ]; then \ + python2 setup.py build; \ + fi install: - if [ "$(DESTDIR)" = "" ]; then \ - python2 setup.py install; \ - else \ - python2 setup.py install --root $(DESTDIR); \ + # Skip this module under Python 3 + if [ "$(PYTHONVERSION)" = "2" ]; then \ + if [ "$(DESTDIR)" = "" ]; then \ + python2 setup.py install; \ + else \ + python2 setup.py install --root $(DESTDIR); \ + fi; \ fi clean: |