removed python buid/installation from makefiles, poetry will handle
This commit is contained in:
parent
50f331d93e
commit
df01f04444
3 changed files with 5 additions and 39 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -39,6 +39,7 @@ coverage.xml
|
||||||
|
|
||||||
# python files
|
# python files
|
||||||
*.egg-info
|
*.egg-info
|
||||||
|
*.pyc
|
||||||
|
|
||||||
# ignore package files
|
# ignore package files
|
||||||
*.rpm
|
*.rpm
|
||||||
|
@ -55,8 +56,5 @@ coverage.xml
|
||||||
netns/setup.py
|
netns/setup.py
|
||||||
daemon/setup.py
|
daemon/setup.py
|
||||||
|
|
||||||
# ignore corefx build
|
|
||||||
corefx/target
|
|
||||||
|
|
||||||
# python
|
# python
|
||||||
__pycache__
|
__pycache__
|
||||||
|
|
2
daemon/.gitignore
vendored
2
daemon/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
||||||
*.pyc
|
|
||||||
build
|
|
|
@ -7,43 +7,12 @@
|
||||||
# Makefile for building netns components.
|
# Makefile for building netns components.
|
||||||
#
|
#
|
||||||
|
|
||||||
SETUPPY = setup.py
|
|
||||||
SETUPPYFLAGS = -v
|
|
||||||
|
|
||||||
if WANT_DOCS
|
if WANT_DOCS
|
||||||
DOCS = doc
|
DOCS = doc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = proto $(DOCS)
|
SUBDIRS = proto $(DOCS)
|
||||||
|
|
||||||
SCRIPT_FILES := $(notdir $(wildcard scripts/*))
|
|
||||||
MAN_FILES := $(notdir $(wildcard ../man/*.1))
|
|
||||||
|
|
||||||
# Python package build
|
|
||||||
noinst_SCRIPTS = build
|
|
||||||
build:
|
|
||||||
$(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) build
|
|
||||||
|
|
||||||
# Python package install
|
|
||||||
install-exec-hook:
|
|
||||||
$(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
|
|
||||||
--root=/$(DESTDIR) \
|
|
||||||
--prefix=$(prefix) \
|
|
||||||
--single-version-externally-managed
|
|
||||||
|
|
||||||
# Python package uninstall
|
|
||||||
uninstall-hook:
|
|
||||||
rm -rf $(DESTDIR)/etc/core
|
|
||||||
rm -rf $(DESTDIR)/$(datadir)/core
|
|
||||||
rm -f $(addprefix $(DESTDIR)/$(datarootdir)/man/man1/, $(MAN_FILES))
|
|
||||||
rm -f $(addprefix $(DESTDIR)/$(bindir)/,$(SCRIPT_FILES))
|
|
||||||
rm -rf $(DESTDIR)/$(pythondir)/core-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg-info
|
|
||||||
rm -rf $(DESTDIR)/$(pythondir)/core
|
|
||||||
|
|
||||||
# Python package cleanup
|
|
||||||
clean-local:
|
|
||||||
-rm -rf build
|
|
||||||
|
|
||||||
# because we include entire directories with EXTRA_DIST, we need to clean up
|
# because we include entire directories with EXTRA_DIST, we need to clean up
|
||||||
# the source control files
|
# the source control files
|
||||||
dist-hook:
|
dist-hook:
|
||||||
|
@ -52,17 +21,18 @@ dist-hook:
|
||||||
distclean-local:
|
distclean-local:
|
||||||
-rm -rf core.egg-info
|
-rm -rf core.egg-info
|
||||||
|
|
||||||
|
|
||||||
DISTCLEANFILES = Makefile.in
|
DISTCLEANFILES = Makefile.in
|
||||||
|
|
||||||
# files to include with distribution tarball
|
# files to include with distribution tarball
|
||||||
EXTRA_DIST = $(SETUPPY) \
|
EXTRA_DIST = setup.py \
|
||||||
core \
|
core \
|
||||||
data \
|
data \
|
||||||
doc/conf.py.in \
|
doc/conf.py.in \
|
||||||
examples \
|
examples \
|
||||||
scripts \
|
scripts \
|
||||||
tests \
|
tests \
|
||||||
test.py \
|
|
||||||
setup.cfg \
|
setup.cfg \
|
||||||
|
MANIFEST.in \
|
||||||
|
poetry.lock \
|
||||||
|
pyproject.toml \
|
||||||
requirements.txt
|
requirements.txt
|
||||||
|
|
Loading…
Reference in a new issue