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>
This commit is contained in:
1 parent
58331208a5
commit
53b60546e4
10 files changed
+289
-32
No files matched your search
+5
-13
@@ -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 $<
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user