summaryrefslogtreecommitdiffstats
path: root/ldap/servers/plugins/uiduniq
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2009-11-12 11:20:16 -0700
committerRich Megginson <rmeggins@redhat.com>2009-11-16 11:48:40 -0700
commit2b2c26069aee6c0ead2c6ed95de5f181089025ac (patch)
tree201239e716a3621f76a0bd5351e0342df3751078 /ldap/servers/plugins/uiduniq
parent4c333c131975debacd65bdb5a96b7a56e9012048 (diff)
downloadds-2b2c26069aee6c0ead2c6ed95de5f181089025ac.tar.gz
ds-2b2c26069aee6c0ead2c6ed95de5f181089025ac.tar.xz
ds-2b2c26069aee6c0ead2c6ed95de5f181089025ac.zip
Implement support for versioning and release engineering procedures - version 1.2.5.a1389-ds-base-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!)
Diffstat (limited to 'ldap/servers/plugins/uiduniq')
-rw-r--r--ldap/servers/plugins/uiduniq/7bit.c2
-rw-r--r--ldap/servers/plugins/uiduniq/uid.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c
index 98f216ad..56eef22e 100644
--- a/ldap/servers/plugins/uiduniq/7bit.c
+++ b/ldap/servers/plugins/uiduniq/7bit.c
@@ -85,7 +85,7 @@
*/
static char *plugin_name = "NS7bitAttr";
static Slapi_PluginDesc
-pluginDesc = { "NS7bitAttr", VENDOR, PACKAGE_VERSION,
+pluginDesc = { "NS7bitAttr", VENDOR, DS_PACKAGE_VERSION,
"Enforce 7-bit clean attribute values" };
diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c
index 955e6770..1464b527 100644
--- a/ldap/servers/plugins/uiduniq/uid.c
+++ b/ldap/servers/plugins/uiduniq/uid.c
@@ -95,7 +95,7 @@ static int search_one_berval(const char *baseDN, const char *attrName,
static char *plugin_name = "NSUniqueAttr";
static Slapi_PluginDesc
pluginDesc = {
- "NSUniqueAttr", VENDOR, PACKAGE_VERSION,
+ "NSUniqueAttr", VENDOR, DS_PACKAGE_VERSION,
"Enforce unique attribute values"
};
static void* plugin_identity = NULL;