create package-version.txt in each dir during bootstrap

diff --git a/citadel/.gitignore b/citadel/.gitignore
index 3a3798b8e06e3f9fc50c5265037b2835b397da06..81bb5c37ab638c41bef7776cce8931d9e1a10ffa 100644 (file)
--- a/citadel/.gitignore
+++ b/citadel/.gitignore
@@ -45,3 +45,4 @@ refcount_adjustments.dat
 keys
 netconfigs
 data
 keys
 netconfigs
 data

+package-version.txt

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index f6c5084c635f5605fb2173892f95c238ea7474ca..c71cb9ed74cb81323562023b0f8212c1a778f9d3 100644 (file)
--- 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 
 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 \
        rm -vf utils/*.d ;
        rm -vf utillib/*.d ;
        for i in $(srcdir)/modules/* ; do \

diff --git a/citadel/bootstrap b/citadel/bootstrap
index 636a4b1687313a320736e6cdd3aac72894acc1a4..354aed11092472e0a0fff49e1f41ef7708841072 100755 (executable)
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -2,11 +2,8 @@
 #
 # run me after checking Citadel out of the source code repository.
 
 #
 # 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 ...
 echo ... running aclocal ...

-aclocal  -I m4
+aclocal -I m4

 
 echo ... running autoconf ...
 autoconf
 
 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
 
 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
 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 a6d683369d89da7bd9e4763842323ba084a4a11f..be07d01d87e68409a9b1e46d626bf641e023dee2 100644 (file)
--- a/libcitadel/.gitignore
+++ b/libcitadel/.gitignore
@@ -17,3 +17,4 @@ libtool
 sysdep.h
 sysdep.h.in
 autom4te.cache
 sysdep.h
 sysdep.h.in
 autom4te.cache

+package-version.txt

diff --git a/libcitadel/bootstrap b/libcitadel/bootstrap
index de2cdf71c13059159a839bc826be3b516fd11a0e..e12b8645fef5b2134bc0660f336adb73f9c1ecd0 100755 (executable)
--- a/libcitadel/bootstrap
+++ b/libcitadel/bootstrap
@@ -2,3 +2,4 @@
    
 autoconf
 autoheader
    
 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 3a3798b8e06e3f9fc50c5265037b2835b397da06..81bb5c37ab638c41bef7776cce8931d9e1a10ffa 100644 (file)
--- a/textclient/.gitignore
+++ b/textclient/.gitignore
@@ -45,3 +45,4 @@ refcount_adjustments.dat
 keys
 netconfigs
 data
 keys
 netconfigs
 data

+package-version.txt

diff --git a/textclient/bootstrap b/textclient/bootstrap
index 9f4f846431a5cc1e750ff654927644968663a49d..d4c23fcf2749d8804e3b0563a4eb55fd3b2f9448 100755 (executable)
--- 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
 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 9f9d712afd453edf486c5245fed6dbe419605a2a..22d784a68bd3c96fcd44722f314c231fa96c7d31 100755 (executable)
--- a/webcit/bootstrap
+++ b/webcit/bootstrap
@@ -35,3 +35,5 @@ if ./scripts/get_ical_data.sh; then
     echo with the same prefix.
     echo
 fi
     echo with the same prefix.
     echo
 fi

+
+grep '^#define CLIENT_VERSION' webcit.h | sed 's/[^0-9]*//g' >package-version.txt