diff --git a/.cvsignore b/.cvsignore index c72fdd1b..3fac3108 100644 --- a/.cvsignore +++ b/.cvsignore @@ -39,3 +39,4 @@ INSTALL install-sh missing mkinstalldirs +libgtopconfig.h diff --git a/ChangeLog b/ChangeLog index ccc8634f..0384593e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-11-18 Benoît Dejean + + * LIBGTOP-VERSION: + * libgtop-mirror.sh: Removed unused files. + + * libgtopconfig.h.in: Added. + * Makefile.am: + * configure.in: + * glibtop.h: Added libgtopconfig.h and LIBGTOP_VERSION_CHECK(X, Y, Z). + This can be used in build tests. + 2004-11-15 Benoît Dejean * copyright.txt: Added myself. diff --git a/LIBGTOP-VERSION b/LIBGTOP-VERSION deleted file mode 100644 index 3c641468..00000000 --- a/LIBGTOP-VERSION +++ /dev/null @@ -1,28 +0,0 @@ -# Making releases: -# LIBGTOP_MICRO_VERSION += 1; -# LIBGTOP_INTERFACE_AGE += 1; -# LIBGTOP_BINARY_AGE += 1; -# if any functions have been added, set LIBGTOP_INTERFACE_AGE to 0. -# if backwards compatibility has been broken, -# set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0. -# -LIBGTOP_MAJOR_VERSION=1 -LIBGTOP_MINOR_VERSION=90 -LIBGTOP_MICRO_VERSION=0 - -LIBGTOP_INTERFACE_AGE=0 -LIBGTOP_BINARY_AGE=0 -# you can set this to `-snap' for instance to create -# a `libgtop-1.x.y-snap.tar.gz' tarball. -LIBGTOP_VERSION_SUFFIX= - -# Increase each time you change the client/server protocol. -LIBGTOP_SERVER_VERSION=5 - -# Don't change this -LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION -LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc` - -# For automake. -VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX -PACKAGE=libgtop diff --git a/Makefile.am b/Makefile.am index 674af636..f256d8d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,9 +5,9 @@ libgtopinclude_HEADERS = glibtop.h libgtopincludedir = $(includedir)/libgtop-2.0 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \ - LIBGTOP-VERSION features.def \ + features.def libgtopconfig.h.in \ libgtop-sysdeps.m4 README \ - libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4 + libgtop-2.0.pc.in acinclude.m4 dist-hook: cp libgtop.spec $(distdir) diff --git a/configure.in b/configure.in index 7a52582e..297c9496 100644 --- a/configure.in +++ b/configure.in @@ -410,4 +410,5 @@ lib/Makefile examples/Makefile doc/Makefile libgtop-2.0.pc +libgtopconfig.h ]) diff --git a/glibtop.h b/glibtop.h index 16717283..c90ae18b 100644 --- a/glibtop.h +++ b/glibtop.h @@ -26,6 +26,27 @@ typedef struct _glibtop glibtop; +/** + * LIBGTOP_CHECK_VERSION + * @major: Major version number + * @minor: Minor version number + * @micro: Micro version number + * + * Checks if the version given is compatable with this version of the + * library. For example, LIBGTOP_CHECK_VERSION(1.2.3) would return TRUE + * if the version is 1.2.5, and FALSE if 1.1.0. This can be used in + * build tests. + * + **/ + +#include + +#define LIBGTOP_CHECK_VERSION(major, minor, micro) \ +(LIBGTOP_MAJOR_VERSION > (major) || \ +(LIBGTOP_MAJOR_VERSION == (major) && LIBGTOP_MINOR_VERSION > (minor)) || \ +(LIBGTOP_MAJOR_VERSION == (major) && LIBGTOP_MINOR_VERSION == (minor) && \ +LIBGTOP_MICRO_VERSION >= (micro))) + #include diff --git a/libgtop-mirror.sh b/libgtop-mirror.sh deleted file mode 100755 index 385ad0b1..00000000 --- a/libgtop-mirror.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -AUTODIR=/home/norwegen/auto -CVSROOT=/pub/master/home-of-linux -CVSHOST=cvs: -MODULE=libgtop - -rm -rf $AUTODIR || exit 1 -mkdir $AUTODIR || exit 1 -cd $AUTODIR || exit 1 - -echo "Making cpio archive out of $CVSROOT/$MODULE ..." - -find $CVSROOT/$MODULE | cpio -o --format=crc | gzip -9f > $MODULE-current-cvs.cpio.gz || exit 1 - -echo "Checking out $MODULE" - -cvs -d $CVSHOST$CVSROOT co $MODULE || exit 1 - -echo "Making cpio archive out of checked out sources ..." - -find $MODULE | cpio -o --format=crc | gzip -9f > $MODULE-current.cpio.gz || exit 1 - -for file in README LIESMICH NEWS ChangeLog ; do - if [ -s $MODULE/$file ] ; then - cp $MODULE/$file . || exit 1 - fi -done - -tar cvf - $MODULE | gzip -9f > $MODULE-current.tar.gz || exit 1 - -find $MODULE/doc -maxdepth 1 -type f -exec cp {} . \; - -# echo "Making documentation ..." -# jade -D /usr/lib/sgml/jade_dsl -d libgtop.dsl -t sgml -V %no-make-index% libgtop.sgml > /dev/null || exit 1 - -# echo "Making TeX documentation ..." -# jade -D /usr/lib/sgml/jade_dsl -D /usr/lib/sgml/stylesheets -d docbook.dsl -t tex libgtop.sgml || exit 1 -# jadetex libgtop.tex || exit 1 -# jadetex libgtop.tex || exit 1 -# dvips libgtop || exit 1 - -echo "Cleaning up ..." - -rm -rf $MODULE - -echo "Done." diff --git a/libgtopconfig.h.in b/libgtopconfig.h.in new file mode 100644 index 00000000..c164e937 --- /dev/null +++ b/libgtopconfig.h.in @@ -0,0 +1,8 @@ +#ifndef LIBGTOPCONFIG_H +#define LIBGTOPCONFIG_H + +#define LIBGTOP_MAJOR_VERSION @LIBGTOP_MAJOR_VERSION@ +#define LIBGTOP_MINOR_VERSION @LIBGTOP_MINOR_VERSION@ +#define LIBGTOP_MICRO_VERSION @LIBGTOP_MICRO_VERSION@ + +#endif /* LIBGTOPCONFIG_H */