Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build cleanup #67

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Build cleanup #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1ced20
Add missing items to .gitignore
mz-pdm Jan 28, 2020
6367e80
Add `clean' make target to .PHONY
mz-pdm Jan 28, 2020
0abcad8
Add missing items to clean in Makefile
mz-pdm Jan 28, 2020
6dad380
Use $(CURDIR) instead of ${PWD}
mz-pdm Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*.py[co]
__pycache__
*.spec
.*.sw[o-z]
MANIFEST
Expand All @@ -13,12 +14,22 @@ docs/ovirtlago.rst
docs/lago.rst
docs/lago.plugins.rst
docs/lago_template_repo.rst
docs/_build/
docs/_static/ChangeLog.txt
*ChangeLog
rpmbuild
lago.egg-info
AUTHORS
*/*venv
.bash*
.cache*
.coverage
.eggs/
.tox/
coverage.xml
flake8.txt
htmlcov/
tags
cscope.out
lago.junit.xml
lago_ovirt.egg-info/
20 changes: 18 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ TARBALL_FILE=${TAR_FILE}.gz
SPECFILE=${NAME}.spec
# this is needed to use the libs from venv

OUTPUT_DIR=${PWD}
OUTPUT_DIR=$(CURDIR)
RPM_DIR=${OUTPUT_DIR}/rpmbuild
DIST_DIR=${OUTPUT_DIR}/dist

TAR_DIST_LOCATION=${DIST_DIR}/${TAR_FILE}
TARBALL_DIST_LOCATION=${DIST_DIR}/${TARBALL_FILE}

.PHONY: build rpm srpm ${TARBALL_DIST_LOCATION} check-local dist check ${SPECFILE} docs fullchangelog changelog python-sdist add-extra-files-sdist
.PHONY: build rpm srpm ${TARBALL_DIST_LOCATION} check-local dist check ${SPECFILE} docs fullchangelog changelog python-sdist add-extra-files-sdist clean distclean

changelog:
echo Creating RPM compatible ChangeLog \
Expand Down Expand Up @@ -90,8 +90,24 @@ clean:
rm -rf ${DIST_DIR}
rm -rf ${RPM_DIR}
rm -rf build "$(REPO_LOCAL_REL_PATH)"
rm -rf docs/_build
rm -rf htmlcov
find -name __pycache__ -type d | xargs -r rm -r
find -name flake8.txt -exec rm {} \;
rm -f ${SPECFILE}
rm -f AUTHORS
rm -f ChangeLog
rm -f FullChangeLog
rm -f .coverage
rm -f coverage.xml
rm -f lago.junit.xml
rm -f docs/_static/ChangeLog.txt
rm -f docs/ovirtlago.rst

distclean: clean
rm -rf .eggs
rm -rf .tox
rm -rf lago_ovirt.egg-info

docs:
tox -r -e docs
Expand Down