From b47178f2ea4a082fdb925bd62311bd4229bd9c0f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 4 Jan 2018 00:43:44 -0500 Subject: [PATCH] create package-version.txt in each dir during bootstrap --- citadel/.gitignore | 1 + citadel/Makefile.in | 2 +- citadel/bootstrap | 7 +++---- libcitadel/.gitignore | 1 + libcitadel/bootstrap | 1 + textclient/.gitignore | 1 + textclient/bootstrap | 2 ++ webcit/bootstrap | 2 ++ 8 files changed, 12 insertions(+), 5 deletions(-) diff --git a/citadel/.gitignore b/citadel/.gitignore index 3a3798b8e..81bb5c37a 100644 --- a/citadel/.gitignore +++ b/citadel/.gitignore @@ -45,3 +45,4 @@ refcount_adjustments.dat keys netconfigs data +package-version.txt diff --git a/citadel/Makefile.in b/citadel/Makefile.in index f6c5084c6..c71cb9ed7 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -348,7 +348,7 @@ cleaner: clean distclean: cleaner find . -name '*~' -o -name '.#*' | xargs rm -vf rm -vf po/Makefile - rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d + rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d package-version.txt rm -vf utils/*.d ; rm -vf utillib/*.d ; for i in $(srcdir)/modules/* ; do \ diff --git a/citadel/bootstrap b/citadel/bootstrap index 636a4b168..354aed110 100755 --- a/citadel/bootstrap +++ b/citadel/bootstrap @@ -2,11 +2,8 @@ # # run me after checking Citadel out of the source code repository. -# Remove any vestiges of pre-6.05 build environments -rm -f .libs modules *.so *.lo *.la 2>/dev/null - echo ... running aclocal ... -aclocal -I m4 +aclocal -I m4 echo ... running autoconf ... autoconf @@ -25,6 +22,8 @@ echo ... running mk_svn_revision.sh ... echo ... running mk_module_init.sh ... ./scripts/mk_module_init.sh +grep '#define REV_LEVEL' citadel.h | sed 's/[^0-9]*//g' >package-version.txt + echo echo This script has been tested with autoconf 2.53 and echo automake 1.5. Other versions may work, but we recommend diff --git a/libcitadel/.gitignore b/libcitadel/.gitignore index a6d683369..be07d01d8 100644 --- a/libcitadel/.gitignore +++ b/libcitadel/.gitignore @@ -17,3 +17,4 @@ libtool sysdep.h sysdep.h.in autom4te.cache +package-version.txt diff --git a/libcitadel/bootstrap b/libcitadel/bootstrap index de2cdf71c..e12b8645f 100755 --- a/libcitadel/bootstrap +++ b/libcitadel/bootstrap @@ -2,3 +2,4 @@ autoconf autoheader +grep '^#define LIBCITADEL_VERSION_NUMBER' lib/libcitadel.h | sed 's/[^0-9]*//g' >package-version.txt diff --git a/textclient/.gitignore b/textclient/.gitignore index 3a3798b8e..81bb5c37a 100644 --- a/textclient/.gitignore +++ b/textclient/.gitignore @@ -45,3 +45,4 @@ refcount_adjustments.dat keys netconfigs data +package-version.txt diff --git a/textclient/bootstrap b/textclient/bootstrap index 9f4f84643..d4c23fcf2 100755 --- a/textclient/bootstrap +++ b/textclient/bootstrap @@ -30,3 +30,5 @@ echo echo Also note that autoconf and automake should be configured echo with the same prefix. echo + +grep '^#define CLIENT_VERSION' src/include/citadel_ipc.h | sed 's/[^0-9]*//g' >package-version.txt diff --git a/webcit/bootstrap b/webcit/bootstrap index 9f9d712af..22d784a68 100755 --- a/webcit/bootstrap +++ b/webcit/bootstrap @@ -35,3 +35,5 @@ if ./scripts/get_ical_data.sh; then echo with the same prefix. echo fi + +grep '^#define CLIENT_VERSION' webcit.h | sed 's/[^0-9]*//g' >package-version.txt -- 2.30.2