There's no reason to have another level of inderection for project name,
it just makes the spec file more obscure.
---
Makefile | 100 ++++++++++++++++++++++++++++++-------------------------------
1 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
index 11ec691..8ddbc62 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,10 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-NAME=autoqa
-
# Common autoqa paths
PREFIX=
-EVENT_DIR=/usr/share/$(NAME)/events
-WATCHER_DIR=/usr/share/$(NAME)/watchers
+EVENT_DIR=/usr/share/autoqa/events
+WATCHER_DIR=/usr/share/autoqa/watchers
AUTOTEST_DIR=/usr/share/autotest
TEST_DIR=$(AUTOTEST_DIR)/client/site_tests
HTTPCONF_DIR=/etc/httpd/conf.d/
@@ -49,7 +47,7 @@ EL5_DEFINES= --define "_source_filedigest_algorithm 1" \
--define "_binary_filedigest_algorithm 1"
# Variables used for packaging
-SPECFILE=$(NAME).spec
+SPECFILE=autoqa.spec
BASEARCH=$(shell uname -i)
VERSION=$(shell echo `gawk '$$1~/^Version:/{print $$2}' $(SPECFILE)`)
@@ -92,61 +90,61 @@ all: build
clean:
find . -name "*.py[co]" -exec rm -f {} +
- rm -f $(NAME)-$(VERSION).tar.gz
- rm -rf lib/$(NAME)/build
+ rm -f autoqa-$(VERSION).tar.gz
+ rm -rf lib/autoqa/build
rm -rf $(WORKDIR)
install: build
install -d $(PREFIX)/usr/bin
- install -d -m 0775 $(PREFIX)/var/cache/$(NAME)
- install $(NAME) $(PREFIX)/usr/bin/
- install -d $(PREFIX)/etc/$(NAME)
- [ -f $(PREFIX)/etc/$(NAME)/$(NAME).conf ] || install -m 0644 conf/$(NAME).conf
$(PREFIX)/etc/$(NAME)/
- [ -f $(PREFIX)/etc/$(NAME)/fas.conf ] || install -m 0640 conf/fas.conf
$(PREFIX)/etc/$(NAME)
- [ -f $(PREFIX)/etc/$(NAME)/yourls.conf ] || install -m 0640 conf/yourls.conf
$(PREFIX)/etc/$(NAME)
+ install -d -m 0775 $(PREFIX)/var/cache/autoqa
+ install autoqa $(PREFIX)/usr/bin/
+ install -d $(PREFIX)/etc/autoqa
+ [ -f $(PREFIX)/etc/autoqa/autoqa.conf ] || install -m 0644 conf/autoqa.conf
$(PREFIX)/etc/autoqa/
+ [ -f $(PREFIX)/etc/autoqa/fas.conf ] || install -m 0640 conf/fas.conf
$(PREFIX)/etc/autoqa
+ [ -f $(PREFIX)/etc/autoqa/yourls.conf ] || install -m 0640 conf/yourls.conf
$(PREFIX)/etc/autoqa
# if running under root, then we're not building the package in mock, but rather \
# installing from source on a developer machine; because rpm will not change \
# configs' ownership for us, we have to do it manually here \
- if [ `id -u` -eq 0 ]; then chgrp autotest $(PREFIX)/etc/$(NAME)/{fas,yourls}.conf; fi
- install -m 0644 conf/repoinfo.conf $(PREFIX)/etc/$(NAME)/
- install -m 0644 conf/log_template.html $(PREFIX)/etc/$(NAME)/
- install -m 0644 conf/client-deps.conf $(PREFIX)/etc/$(NAME)/
+ if [ `id -u` -eq 0 ]; then chgrp autotest $(PREFIX)/etc/autoqa/{fas,yourls}.conf; fi
+ install -m 0644 conf/repoinfo.conf $(PREFIX)/etc/autoqa/
+ install -m 0644 conf/log_template.html $(PREFIX)/etc/autoqa/
+ install -m 0644 conf/client-deps.conf $(PREFIX)/etc/autoqa/
## run directory
- install -d $(PREFIX)/var/run/$(NAME)
+ install -d $(PREFIX)/var/run/autoqa
## logrotate conf
install -d $(PREFIX)/etc/logrotate.d
install -m 0644 conf/logrotate.d/autoqa $(PREFIX)/etc/logrotate.d/
## log directory
- install -d $(PREFIX)/var/log/$(NAME)
+ install -d $(PREFIX)/var/log/autoqa
install -d $(PREFIX)$(EVENT_DIR)
for h in events/*; do cp -a $$h $(PREFIX)$(EVENT_DIR); done
install -d $(PREFIX)$(WATCHER_DIR)
for h in watchers/*; do cp -a $$h $(PREFIX)$(WATCHER_DIR); done
## git-post-receive setup
install -d $(PREFIX)/usr/sbin
- mv $(PREFIX)$(WATCHER_DIR)/git-post-receive/$(NAME)-git-hook.wsgi $(PREFIX)/usr/sbin/
+ mv $(PREFIX)$(WATCHER_DIR)/git-post-receive/autoqa-git-hook.wsgi $(PREFIX)/usr/sbin/
install -d $(PREFIX)/$(HTTPCONF_DIR)
- mv $(PREFIX)$(WATCHER_DIR)/git-post-receive/$(NAME)-git-hook.conf
$(PREFIX)/$(HTTPCONF_DIR)/
- [ -f $(PREFIX)$(WATCHER_DIR)/$(NAME).cron ] || install -m 0644 conf/$(NAME).cron
$(PREFIX)$(WATCHER_DIR)/
+ mv $(PREFIX)$(WATCHER_DIR)/git-post-receive/autoqa-git-hook.conf
$(PREFIX)/$(HTTPCONF_DIR)/
+ [ -f $(PREFIX)$(WATCHER_DIR)/autoqa.cron ] || install -m 0644 conf/autoqa.cron
$(PREFIX)$(WATCHER_DIR)/
install -d $(PREFIX)$(TEST_DIR)
for t in tests/*; do cp -a $$t $(PREFIX)$(TEST_DIR); done
install -d $(PREFIX)$(AUTOTEST_DIR)/client/{bin,common_lib}
install -m 0644 lib/autotest/site_utils.py $(PREFIX)$(AUTOTEST_DIR)/client/bin/
install -d $(PREFIX)$(AUTOTEST_DIR)/server
install -m 0644 lib/autotest/site_autotest.py $(PREFIX)$(AUTOTEST_DIR)/server/
- ( cd lib/$(NAME); $(PYTHON) setup.py install --skip-build --root $(PREFIX)/ )
+ ( cd lib/autoqa; $(PYTHON) setup.py install --skip-build --root $(PREFIX)/ )
## 404 page
install -d $(PREFIX)$(ERRDOCS_DIR)
install -m 0644 static/404.html $(PREFIX)$(ERRDOCS_DIR)
- install -m 0644 -T conf/autoqa-apache.conf $(PREFIX)/etc/httpd/conf.d/$(NAME).conf
+ install -m 0644 -T conf/autoqa-apache.conf $(PREFIX)/etc/httpd/conf.d/autoqa.conf
## populate client-deps.conf
# we don't need some packages on the client, filter them out
- echo "$(REQS)" | grep -Ev '^(autotest|mod_wsgi|httpd|yourls)$$'
>> $(PREFIX)/etc/$(NAME)/client-deps.conf
+ echo "$(REQS)" | grep -Ev '^(autotest|mod_wsgi|httpd|yourls)$$'
>> $(PREFIX)/etc/autoqa/client-deps.conf
-build: lib/$(NAME)/build
+build: lib/autoqa/build
-lib/$(NAME)/build:
- ( cd lib/$(NAME); $(PYTHON) setup.py build )
+lib/autoqa/build:
+ ( cd lib/autoqa; $(PYTHON) setup.py build )
test:
bash runtests.sh
@@ -155,22 +153,22 @@ test:
# Tarball
#
-archive: $(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
+archive: $(SOURCEDIR)/autoqa-$(VERSION).tar.gz
-upload: $(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
- @scp $(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz fedorahosted.org:$(NAME)
+upload: $(SOURCEDIR)/autoqa-$(VERSION).tar.gz
+ @scp $(SOURCEDIR)/autoqa-$(VERSION).tar.gz fedorahosted.org:autoqa
-$(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz: $(SPECDIR)/$(SPECFILE)
+$(SOURCEDIR)/autoqa-$(VERSION).tar.gz: $(SPECDIR)/$(SPECFILE)
[ -d .git ] # CHECKING TO SEE IF THIS IS A GIT TREE
mkdir -p $(SOURCEDIR)
- git archive HEAD --prefix=$(NAME)-$(VERSION)/ | gzip -c9 > /$@
+ git archive HEAD --prefix=autoqa-$(VERSION)/ | gzip -c9 > /$@
#
# BUILD RPMS either with or without the EL5_DEFINES (EPEL-5)
#
nvr:
- @echo $(NAME)-$(VERSION)-$(RELEASE)$(DIST)
+ @echo autoqa-$(VERSION)-$(RELEASE)$(DIST)
list-requires:
@echo "$(REQS)"
@@ -190,29 +188,29 @@ $(SPECDIR)/$(SPECFILE): $(SPECFILE)
@mkdir -p $(SPECDIR)
@cp $(SPECFILE) $(SPECDIR)/
-$(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).fc%.src.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
+$(SRCRPMDIR)/autoqa-$(VERSION)-$(RELEASE).fc%.src.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/autoqa-$(VERSION).tar.gz
mkdir -p $(SRCRPMDIR) $(BUILDDIR) $(RPMDIR)
rpmbuild $(RPM_DEFINES) -bs --nodeps $<
-$(RPMDIR)/noarch/$(NAME)-$(VERSION)-$(RELEASE).fc%.noarch.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
+$(RPMDIR)/noarch/autoqa-$(VERSION)-$(RELEASE).fc%.noarch.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/autoqa-$(VERSION).tar.gz
mkdir -p $(SRCRPMDIR) $(BUILDDIR) $(RPMDIR)
rpmbuild $(RPM_DEFINES) -ba $<
-$(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).el%.src.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
+$(SRCRPMDIR)/autoqa-$(VERSION)-$(RELEASE).el%.src.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/autoqa-$(VERSION).tar.gz
mkdir -p $(SRCRPMDIR) $(BUILDDIR) $(RPMDIR)
rpmbuild $(RPM_DEFINES) $(EL5_DEFINES) -bs --nodeps $<
-$(RPMDIR)/noarch/$(NAME)-$(VERSION)-$(RELEASE).el%.noarch.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
+$(RPMDIR)/noarch/autoqa-$(VERSION)-$(RELEASE).el%.noarch.rpm: $(SPECDIR)/$(SPECFILE)
$(SOURCEDIR)/autoqa-$(VERSION).tar.gz
mkdir -p $(SRCRPMDIR) $(BUILDDIR) $(RPMDIR)
rpmbuild $(RPM_DEFINES) $(EL5_DEFINES) -ba $<
-srpm: $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE)$(DIST).src.rpm
-rpm: $(RPMDIR)/noarch/$(NAME)-$(VERSION)-$(RELEASE)$(DIST).noarch.rpm
+srpm: $(SRCRPMDIR)/autoqa-$(VERSION)-$(RELEASE)$(DIST).src.rpm
+rpm: $(RPMDIR)/noarch/autoqa-$(VERSION)-$(RELEASE)$(DIST).noarch.rpm
-srpm.el5: $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).el5.src.rpm
-rpm.el5: $(RPMDIR)/noarch/$(NAME)-$(VERSION)-$(RELEASE).el5.noarch.rpm
-srpm.el6: $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).el6.src.rpm
-rpm.el6: $(RPMDIR)/noarch/$(NAME)-$(VERSION)-$(RELEASE).el6.noarch.rpm
+srpm.el5: $(SRCRPMDIR)/autoqa-$(VERSION)-$(RELEASE).el5.src.rpm
+rpm.el5: $(RPMDIR)/noarch/autoqa-$(VERSION)-$(RELEASE).el5.noarch.rpm
+srpm.el6: $(SRCRPMDIR)/autoqa-$(VERSION)-$(RELEASE).el6.src.rpm
+rpm.el6: $(RPMDIR)/noarch/autoqa-$(VERSION)-$(RELEASE).el6.noarch.rpm
#
# Mock builds
@@ -229,7 +227,7 @@ RELEASEVER=fedora-$(subst .fc,,$(DIST))
endif
RELEASEVER?=fedora-devel
-$(MOCKDIR)/$(RELEASEVER)-$(BASEARCH):
$(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE)$(DIST).src.rpm
+$(MOCKDIR)/$(RELEASEVER)-$(BASEARCH):
$(SRCRPMDIR)/autoqa-$(VERSION)-$(RELEASE)$(DIST).src.rpm
mock -r $(RELEASEVER)-$(BASEARCH) --rebuild
--resultdir=$(MOCKDIR)/$(RELEASEVER)-$(BASEARCH) $<
mock: $(MOCKDIR)/$(RELEASEVER)-$(BASEARCH)
@@ -246,17 +244,17 @@ help:
@echo "General targets:"
@echo " help Show this text"
@echo " clean Remove any interim build files and the build directory
($(WORKDIR))"
- @echo " build Run python setup.py to build $(NAME) python library"
+ @echo " build Run python setup.py to build autoqa python library"
@echo " test Execute self-tests"
@echo " install Install source files into system-wide locations"
- @echo " archive Create source tarball $(NAME)-$(VERSION).tar.gz"
- @echo " upload Upload source tarball to fedorahosted.org"
+ @echo " archive Create source tarball autoqa-$(VERSION).tar.gz"
+ @echo " upload Upload source tarball to
https://fedorahosted.org/released/autoqa/"
@echo
@echo "RPM targets:"
@echo " srpm [DIST=<val>]"
- @echo " Create a srpm
($(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE)$(DIST).src.rpm)"
+ @echo " Create a srpm
($(SRCRPMDIR)/autoqa-$(VERSION)-$(RELEASE)$(DIST).src.rpm)"
@echo " rpm [DIST=<val>]"
- @echo " Create a rpm
($(RPMDIR)/noarch/$(NAME)-$(VERSION)-$(RELEASE)$(DIST).noarch.rpm"
+ @echo " Create a rpm
($(RPMDIR)/noarch/autoqa-$(VERSION)-$(RELEASE)$(DIST).noarch.rpm"
@echo " nvr [DIST=<val>]"
@echo " Display '%{name}-%{version}-%{release}' used for
packaging"
@echo " list-requires "
@@ -277,4 +275,4 @@ help:
@echo "https://fedoraproject.org/wiki/AutoQA_Release_Process"
@echo
@echo "For AutoQA bug reports or patch submissions, please use the TRAC"
- @echo "instance at
https://fedorahosted.org/$(NAME)"
+ @echo "instance at
https://fedorahosted.org/autoqa"
--
1.7.7.3