diff --git a/Makefile b/Makefile index 54d15901beb263a9eb7f2c9edf14fd62ec451c7b..7c42fc293ac58960a1247d3ad4ebff85d0eff82d 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,8 @@ ARCHIVE_BASE_NAME=avocado PYTHON_MODULE_NAME=avocado-framework RPM_BASE_NAME=python-avocado +include Makefile.include + all: @echo @echo "Development related targets:" @@ -54,14 +56,6 @@ all: @echo "propagate-version: Propagate './VERSION' to all plugins/modules" @echo -source: clean - if test ! -d SOURCES; then mkdir SOURCES; fi - git archive --prefix="$(ARCHIVE_BASE_NAME)-$(COMMIT)/" -o "SOURCES/$(ARCHIVE_BASE_NAME)-$(SHORT_COMMIT).tar.gz" HEAD - -source-release: clean - if test ! -d SOURCES; then mkdir SOURCES; fi - git archive --prefix="$(ARCHIVE_BASE_NAME)-$(VERSION)/" -o "SOURCES/$(ARCHIVE_BASE_NAME)-$(VERSION).tar.gz" $(VERSION) - source-pypi: clean if test ! -d PYPI_UPLOAD; then mkdir PYPI_UPLOAD; fi git archive --format="tar" --prefix="$(PYTHON_MODULE_NAME)/" $(VERSION) | tar --file - --delete '$(PYTHON_MODULE_NAME)/optional_plugins' > "PYPI_UPLOAD/$(PYTHON_MODULE_NAME)-$(VERSION).tar" @@ -102,25 +96,6 @@ pypi: wheel source-pypi develop @echo " twine upload -u PYPI_UPLOAD/*.{tar.gz,whl}" @echo -install: - $(PYTHON) setup.py install --root $(DESTDIR) $(COMPILE) - -srpm: source - if test ! -d BUILD/SRPM; then mkdir -p BUILD/SRPM; fi - mock -r $(MOCK_CONFIG) --resultdir BUILD/SRPM -D "rel_build 0" -D "commit $(COMMIT)" -D "commit_date $(COMMIT_DATE)" --buildsrpm --spec $(RPM_BASE_NAME).spec --sources SOURCES - -rpm: srpm - if test ! -d BUILD/RPM; then mkdir -p BUILD/RPM; fi - mock -r $(MOCK_CONFIG) --resultdir BUILD/RPM -D "rel_build 0" -D "commit $(COMMIT)" -D "commit_date $(COMMIT_DATE)" --rebuild BUILD/SRPM/$(RPM_BASE_NAME)-$(VERSION)-*.src.rpm - -srpm-release: source-release - if test ! -d BUILD/SRPM; then mkdir -p BUILD/SRPM; fi - mock -r $(MOCK_CONFIG) --resultdir BUILD/SRPM -D "rel_build 1" --buildsrpm --spec $(RPM_BASE_NAME).spec --sources SOURCES - -rpm-release: srpm-release - if test ! -d BUILD/RPM; then mkdir -p BUILD/RPM; fi - mock -r $(MOCK_CONFIG) --resultdir BUILD/RPM -D "rel_build 1" --rebuild BUILD/SRPM/$(RPM_BASE_NAME)-$(VERSION)-*.src.rpm - clean: $(PYTHON) setup.py clean $(MAKE) -f $(CURDIR)/debian/rules clean || true @@ -142,16 +117,6 @@ clean: find . -name '*.pyc' -delete find $(AVOCADO_OPTIONAL_PLUGINS) -name '*.egg-info' -exec rm -r {} + -pip: - $(PYTHON) -m pip --version || $(PYTHON) -m ensurepip $(PYTHON_DEVELOP_ARGS) || $(PYTHON) -c "import os; import sys; import urllib; f = urllib.urlretrieve('https://bootstrap.pypa.io/get-pip.py')[0]; os.system('%s %s' % (sys.executable, f))" - -requirements: pip - - pip install "pip>=6.0.1" - - pip install -r requirements.txt - -requirements-selftests: requirements - - pip install -r requirements-selftests.txt - requirements-plugins: requirements for MAKEFILE in $(AVOCADO_PLUGINS);do\ if test -f $$MAKEFILE/Makefile; then echo ">> REQUIREMENTS (Makefile) $$MAKEFILE"; AVOCADO_DIRNAME=$(AVOCADO_DIRNAME) make -C $$MAKEFILE requirement &>/dev/null;\ diff --git a/Makefile.include b/Makefile.include new file mode 100644 index 0000000000000000000000000000000000000000..c82ec8ebf5b2a6537a425cb479cbdcc6b9a805f1 --- /dev/null +++ b/Makefile.include @@ -0,0 +1,36 @@ +source: clean + if test ! -d SOURCES; then mkdir SOURCES; fi + git archive --prefix="$(ARCHIVE_BASE_NAME)-$(COMMIT)/" -o "SOURCES/$(ARCHIVE_BASE_NAME)-$(SHORT_COMMIT).tar.gz" HEAD + +source-release: clean + if test ! -d SOURCES; then mkdir SOURCES; fi + git archive --prefix="$(ARCHIVE_BASE_NAME)-$(VERSION)/" -o "SOURCES/$(ARCHIVE_BASE_NAME)-$(VERSION).tar.gz" $(VERSION) + +install: + $(PYTHON) setup.py install --root $(DESTDIR) $(COMPILE) + +srpm: source + if test ! -d BUILD/SRPM; then mkdir -p BUILD/SRPM; fi + mock -r $(MOCK_CONFIG) --resultdir BUILD/SRPM -D "rel_build 0" -D "commit $(COMMIT)" -D "commit_date $(COMMIT_DATE)" --buildsrpm --spec $(RPM_BASE_NAME).spec --sources SOURCES + +rpm: srpm + if test ! -d BUILD/RPM; then mkdir -p BUILD/RPM; fi + mock -r $(MOCK_CONFIG) --resultdir BUILD/RPM -D "rel_build 0" -D "commit $(COMMIT)" -D "commit_date $(COMMIT_DATE)" --rebuild BUILD/SRPM/$(RPM_BASE_NAME)-$(VERSION)-*.src.rpm + +srpm-release: source-release + if test ! -d BUILD/SRPM; then mkdir -p BUILD/SRPM; fi + mock -r $(MOCK_CONFIG) --resultdir BUILD/SRPM -D "rel_build 1" --buildsrpm --spec $(RPM_BASE_NAME).spec --sources SOURCES + +rpm-release: srpm-release + if test ! -d BUILD/RPM; then mkdir -p BUILD/RPM; fi + mock -r $(MOCK_CONFIG) --resultdir BUILD/RPM -D "rel_build 1" --rebuild BUILD/SRPM/$(RPM_BASE_NAME)-$(VERSION)-*.src.rpm + +pip: + $(PYTHON) -m pip --version || $(PYTHON) -m ensurepip $(PYTHON_DEVELOP_ARGS) || $(PYTHON) -c "import os; import sys; import urllib; f = urllib.urlretrieve('https://bootstrap.pypa.io/get-pip.py')[0]; os.system('%s %s' % (sys.executable, f))" + +requirements: pip + - pip install "pip>=6.0.1" + - pip install -r requirements.txt + +requirements-selftests: requirements + - pip install -r requirements-selftests.txt