From 2b2c26069aee6c0ead2c6ed95de5f181089025ac Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Thu, 12 Nov 2009 11:20:16 -0700
Subject: Implement support for versioning and release engineering procedures -
 version 1.2.5.a1 Instead of changing configure.ac AC_INIT for each version
 change, there is a new file - VERSION.sh.  This file also contains support
 for creating version numbers for pre-releases, and pre-release strings
 containing git commit hashes. One of the complications is that AC_INIT does
 not allow you to override the version and package tarname fields.  We can
 override them after the fact everywhere except in config.h.  AC_INIT defines
 the following which we would like to override but cannot: PACKAGE_VERSION
 PACKAGE_TARNAME PACKAGE_STRING PACKAGE_BUGREPORT Instead, we define DS_
 versions of these e.g. DS_PACKAGE_VERSION etc. and make these available with
 AC_DEFINE(DS_PACKAGE_VERSION,...) etc. As an extra added precaution, we
 undefine these in Makefile.am like this: DS_DEFINES = ... \ 
 -UPACKAGE_VERSION -UPACKAGE_TARNAME -UPACKAGE_STRING -UPACKAGE_BUGREPORT If
 someone tries to use PACKAGE_VERSION in C code, they will not be able to, and
 will have to use DS_PACKAGE_VERSION instead.  All of the DS code that used
 PACKAGE_VERSION has been changed to use DS_PACKAGE_VERSION instead. There is
 a new make target - git-archive - as a convenience for creating source
 tarballs from git.  By default, the source archive will be placed in the
 build directory - you can specify SRCDISTDIR=/path/to/SOURCES to use an
 alternate dir (e.g. make SRCDISTDIR=/path/to/rpmbuild/SOURCES git-archive to
 make a source tarball for rpmbuild) configure will print the branded package
 name and version Reviewed by: nkinder (Thanks!)

---
 Makefile.in | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 8b37e23f..c2d51822 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -904,8 +904,8 @@ am__remove_distdir = \
   { test ! -d $(distdir) \
     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
          && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
@@ -1127,7 +1127,10 @@ QUOTE := $(NULLSTRING)"# a double quote"
 BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
 NQBUILDNUM := $(subst \,,$(subst $(QUOTE),,$(BUILDNUM)))
 DEBUG_DEFINES = @debug_defs@
-DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) -DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand)\"" -DCAPBRAND="\"$(capbrand)\""
+# the -U undefines these symbols - should use the corresponding DS_ ones instead - see configure.ac
+DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) -DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand)\"" -DCAPBRAND="\"$(capbrand)\"" \
+	-UPACKAGE_VERSION -UPACKAGE_TARNAME -UPACKAGE_STRING -UPACKAGE_BUGREPORT
+
 DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
 # these paths are dependent on the settings of prefix and exec_prefix which may be specified
 # at make time.  So we cannot use AC_DEFINE in the configure.ac because that would set the
@@ -9606,7 +9609,6 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
-
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
@@ -9625,7 +9627,7 @@ dist-zip: distdir
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -9952,6 +9954,22 @@ ns-slapd.properties: makstrdb
 %/$(PACKAGE_NAME)-snmp: %/ldap-agent-initscript.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
 	$(fixupcmd) $^ > $@
+
+# if distdir is a git tag, use that for the git archive tag, else
+# just assume a developer build and use HEAD
+git-archive:
+	if [ -n "$(SRCDISTDIR)" -a -d "$(SRCDISTDIR)" ] ; then \
+		srcdistdir=$(SRCDISTDIR) ; \
+	else \
+		srcdistdir=`pwd` ; \
+	fi ; \
+	cd $(srcdir) ; \
+	if git show-ref --tags -q $(distdir) ; then \
+		gittag=$(distdir) ; \
+	else \
+		gittag=HEAD ; \
+	fi ; \
+	git archive --prefix=$(distdir)/ $$gittag | bzip2 > $$srcdistdir/$(distdir).tar.bz2
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-- 
cgit