Second half of the redoing how the version is managed.

1 files changed, 55 insertions, 58 deletions

diff --git a/Makefile b/Makefile
index b2fe87c9..9e6fb356 100644
--- a/Makefile
+++ b/Makefile
@@ -1,59 +1,52 @@
+include VERSION
+
 SUBDIRS=ipa-server ipa-admintools ipa-python ipa-client ipa-radius-server ipa-radius-admintools
 
 PRJ_PREFIX=ipa
 
 RPMBUILD ?= $(PWD)/rpmbuild
 
-# Version numbers - this is for the entire server. After
-# updating this you should run the version-update
+# After updating the version in VERSION you should run the version-update
 # target.
-SERV_MAJOR=1
-SERV_MINOR=0
-SERV_RELEASE=0
-SERV_VERSION=$(SERV_MAJOR).$(SERV_MINOR).$(SERV_RELEASE)
-SERV_TARBALL_PREFIX=$(PRJ_PREFIX)-server-$(SERV_VERSION)
+
+ifeq ($(IPA_VERSION_IS_GIT_SNAPSHOT),"yes")
+GIT_VERSION=$(shell git show --pretty=format:"%h" --stat HEAD 2>/dev/null|head -1)
+ifneq ($(GIT_VERSION),)
+IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE)GIT$(GIT_VERSION)
+endif # in a git tree and git returned a version
+endif # git
+
+ifndef IPA_VERSION
+ifdef IPA_VERSION_PRE_RELEASE
+IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).pre$(IPA_VERSION_PRE_RELEASE)
+else
+ifdef IPA_VERSION_RC_RELEASE
+IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).rc$(IPA_VERSION_RC_RELEASE)
+else
+IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE)
+endif # rc
+endif # pre
+endif # ipa_version
+
+SERV_TARBALL_PREFIX=$(PRJ_PREFIX)-server-$(IPA_VERSION)
 SERV_TARBALL=$(SERV_TARBALL_PREFIX).tgz
 
-ADMIN_MAJOR=1
-ADMIN_MINOR=0
-ADMIN_RELEASE=0
-ADMIN_VERSION=$(ADMIN_MAJOR).$(ADMIN_MINOR).$(ADMIN_RELEASE)
-ADMIN_TARBALL_PREFIX=$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION)
+ADMIN_TARBALL_PREFIX=$(PRJ_PREFIX)-admintools-$(IPA_VERSION)
 ADMIN_TARBALL=$(ADMIN_TARBALL_PREFIX).tgz
 
-PYTHON_MAJOR=1
-PYTHON_MINOR=0
-PYTHON_RELEASE=0
-PYTHON_VERSION=$(PYTHON_MAJOR).$(PYTHON_MINOR).$(PYTHON_RELEASE)
-PYTHON_TARBALL_PREFIX=$(PRJ_PREFIX)-python-$(PYTHON_VERSION)
+PYTHON_TARBALL_PREFIX=$(PRJ_PREFIX)-python-$(IPA_VERSION)
 PYTHON_TARBALL=$(PYTHON_TARBALL_PREFIX).tgz
 
-CLI_MAJOR=1
-CLI_MINOR=0
-CLI_RELEASE=0
-CLI_VERSION=$(CLI_MAJOR).$(CLI_MINOR).$(CLI_RELEASE)
-CLI_TARBALL_PREFIX=$(PRJ_PREFIX)-client-$(CLI_VERSION)
+CLI_TARBALL_PREFIX=$(PRJ_PREFIX)-client-$(IPA_VERSION)
 CLI_TARBALL=$(CLI_TARBALL_PREFIX).tgz
 
-RADIUS_SERVER_MAJOR=1
-RADIUS_SERVER_MINOR=0
-RADIUS_SERVER_RELEASE=0
-RADIUS_SERVER_VERSION=$(RADIUS_SERVER_MAJOR).$(RADIUS_SERVER_MINOR).$(RADIUS_SERVER_RELEASE)
-RADIUS_SERVER_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)
+RADIUS_SERVER_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-server-$(IPA_VERSION)
 RADIUS_SERVER_TARBALL=$(RADIUS_SERVER_TARBALL_PREFIX).tgz
 
-RADIUS_ADMINTOOLS_MAJOR=1
-RADIUS_ADMINTOOLS_MINOR=0
-RADIUS_ADMINTOOLS_RELEASE=0
-RADIUS_ADMINTOOLS_VERSION=$(RADIUS_ADMINTOOLS_MAJOR).$(RADIUS_ADMINTOOLS_MINOR).$(RADIUS_ADMINTOOLS_RELEASE)
-RADIUS_ADMINTOOLS_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)
+RADIUS_ADMINTOOLS_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-admintools-$(IPA_VERSION)
 RADIUS_ADMINTOOLS_TARBALL=$(RADIUS_ADMINTOOLS_TARBALL_PREFIX).tgz
 
-SERV_SELINUX_MAJOR=1
-SERV_SELINUX_MINOR=0
-SERV_SELINUX_RELEASE=0
-SERV_SELINUX_VERSION=$(SERV_SELINUX_MAJOR).$(SERV_SELINUX_MINOR).$(SERV_SELINUX_RELEASE)
-SERV_SELINUX_TARBALL_PREFIX=$(PRJ_PREFIX)-server-selinux-$(SERV_SELINUX_VERSION)
+SERV_SELINUX_TARBALL_PREFIX=$(PRJ_PREFIX)-server-selinux-$(IPA_VERSION)
 SERV_SELINUX_TARBALL=$(SERV_SELINUX_TARBALL_PREFIX).tgz
 
 LIBDIR ?= /usr/lib
@@ -64,10 +57,12 @@ all: bootstrap-autogen
 	done
 
 bootstrap-autogen:
+	@echo "Building IPA $(IPA_VERSION)"
 	cd ipa-server; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
 	cd ipa-client; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
 
 autogen:
+	@echo "Building IPA $(IPA_VERSION)"
 	cd ipa-server; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR)
 	cd ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR)
 
@@ -86,26 +81,28 @@ test:
 	done
 
 version-update:
-	sed s/VERSION/$(SERV_VERSION)/ ipa-server/ipa-server.spec.in \
+	sed s/VERSION/$(IPA_VERSION)/ ipa-server/ipa-server.spec.in \
 		> ipa-server/ipa-server.spec
 
-	sed s/VERSION/$(ADMIN_VERSION)/ ipa-admintools/ipa-admintools.spec.in \
+	sed s/VERSION/$(IPA_VERSION)/ ipa-admintools/ipa-admintools.spec.in \
 		> ipa-admintools/ipa-admintools.spec
 
-	sed s/VERSION/$(PYTHON_VERSION)/ ipa-python/ipa-python.spec.in \
+	sed s/VERSION/$(IPA_VERSION)/ ipa-python/ipa-python.spec.in \
 		> ipa-python/ipa-python.spec
 
-	sed s/VERSION/$(CLI_VERSION)/ ipa-client/ipa-client.spec.in \
+	sed s/VERSION/$(IPA_VERSION)/ ipa-client/ipa-client.spec.in \
 		> ipa-client/ipa-client.spec
 
-	sed s/VERSION/$(RADIUS_SERVER_VERSION)/ ipa-radius-server/ipa-radius-server.spec.in \
+	sed s/VERSION/$(IPA_VERSION)/ ipa-radius-server/ipa-radius-server.spec.in \
 		> ipa-radius-server/ipa-radius-server.spec
 
-	sed s/VERSION/$(RADIUS_ADMINTOOLS_VERSION)/ ipa-radius-admintools/ipa-radius-admintools.spec.in \
+	sed s/VERSION/$(IPA_VERSION)/ ipa-radius-admintools/ipa-radius-admintools.spec.in \
 		> ipa-radius-admintools/ipa-radius-admintools.spec
 
-	sed s/VERSION/$(SERV_SELINUX_VERSION)/ ipa-server/selinux/ipa-server-selinux.spec.in \
+	sed s/VERSION/$(IPA_VERSION)/ ipa-server/selinux/ipa-server-selinux.spec.in \
 		> ipa-server/selinux/ipa-server-selinux.spec
+	sed s/VERSION/$(IPA_VERSION)/ ipa-python/setup.py.in \
+		> ipa-python/setup.py
 
 
 archive:
@@ -180,44 +177,44 @@ rpmdistdir:
 rpm-ipa-server:
 	cp dist/sources/$(SERV_TARBALL) $(RPMBUILD)/SOURCES/.
 	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-server/ipa-server.spec
-	cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-server-$(SERV_VERSION)-*.rpm dist/rpms/
-	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-server-$(SERV_VERSION)-*.src.rpm dist/srpms/
+	cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-server-$(IPA_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-server-$(IPA_VERSION)-*.src.rpm dist/srpms/
 
 rpm-ipa-admin:
 	cp dist/sources/$(ADMIN_TARBALL) $(RPMBUILD)/SOURCES/.
 	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-admintools/ipa-admintools.spec
-	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION)-*.rpm dist/rpms/
-	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION)-*.src.rpm dist/srpms/
+	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-admintools-$(IPA_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-admintools-$(IPA_VERSION)-*.src.rpm dist/srpms/
 
 rpm-ipa-python:
 	cp dist/sources/$(PYTHON_TARBALL) $(RPMBUILD)/SOURCES/.
 	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-python/ipa-python.spec
-	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-python-$(PYTHON_VERSION)-*.rpm dist/rpms/
-	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-python-$(PYTHON_VERSION)-*.src.rpm dist/srpms/
+	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-python-$(IPA_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-python-$(IPA_VERSION)-*.src.rpm dist/srpms/
 
 rpm-ipa-client:
 	cp dist/sources/$(CLI_TARBALL) $(RPMBUILD)/SOURCES/.
 	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-client/ipa-client.spec
-	cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-client-$(CLI_VERSION)-*.rpm dist/rpms/
-	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-client-$(CLI_VERSION)-*.src.rpm dist/srpms/
+	cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-client-$(IPA_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-client-$(IPA_VERSION)-*.src.rpm dist/srpms/
 
 rpm-ipa-radius-server:
 	cp dist/sources/$(RADIUS_SERVER_TARBALL) $(RPMBUILD)/SOURCES/.
 	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-radius-server/ipa-radius-server.spec
-	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)-*.rpm dist/rpms/
-	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)-*.src.rpm dist/srpms/
+	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-radius-server-$(IPA_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-radius-server-$(IPA_VERSION)-*.src.rpm dist/srpms/
 
 rpm-ipa-radius-admintools:
 	cp dist/sources/$(RADIUS_ADMINTOOLS_TARBALL) $(RPMBUILD)/SOURCES/.
 	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-radius-admintools/ipa-radius-admintools.spec
-	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)-*.rpm dist/rpms/
-	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)-*.src.rpm dist/srpms/
+	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-radius-admintools-$(IPA_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-radius-admintools-$(IPA_VERSION)-*.src.rpm dist/srpms/
 
 rpm-ipa-server-selinux:
 	cp dist/sources/$(SERV_SELINUX_TARBALL) $(RPMBUILD)/SOURCES/.
 	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-server/selinux/ipa-server-selinux.spec
-	cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-server-selinux-$(SERV_SELINUX_VERSION)-*.rpm dist/rpms/
-	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-server-selinux-$(SERV_SELINUX_VERSION)-*.src.rpm dist/srpms/
+	cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-server-selinux-$(IPA_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-server-selinux-$(IPA_VERSION)-*.src.rpm dist/srpms/
 
 rpms: rpmroot rpmdistdir rpm-ipa-server rpm-ipa-admin rpm-ipa-python rpm-ipa-client rpm-ipa-radius-server rpm-ipa-radius-admintools rpm-ipa-server-selinux