STABLE14-xml-versioning-take-two-20090601

LICENSE IPL10

deal with this in a way which does not trip creation of CML state config files

(cherry picked from commit 0a617e33234f6104fdfb0d45593cf313c961f653)

diff --git a/acinclude.m4 b/acinclude.m4
index 6f284842a097f0b9e21b599e954b1382675e180b..774bcc684402a6de91806d7ab67b87eb39deb708 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1461,9 +1461,6 @@ if test "x$enable_kernel_module" = "xyes"; then
 ENABLE_KERNEL_MODULE=libafs
 fi
 
-VERSFILE=AFS_component_version_number
-AC_SUBST(VERSFILE)
-
 AC_SUBST(AFS_SYSNAME)
 AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 75f8f1ae7a67e8e51be91fd38c8a4f5d8a4a8746..6e723856a3310503fdfd748e8c48d0b7253ae575 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -135,6 +135,3 @@ LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
 
 .c.o:
        $(CCOBJ) $(CFLAGS) -c $<
-
-# Default component version file, will be overridden later if necessary
-VERSFILE=@VERSFILE@
\ No newline at end of file

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index 0379b57e70f014971d9a98897edc4abc83809e51..46cf3ff9d8a7ba59cdc69c1ea847629696fb1703 100644 (file)
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -32,7 +32,7 @@ Makefile.version: ${srcdir}/Makefile.version-CML Makefile.version-NOCML
 # AFS component version string file generation targets
 #
 AFS_component_version_number.c: Makefile.version
-       $(MAKE) -f Makefile.component AFS_component_version_number.c
+       $(MAKE) -f Makefile.version AFS_component_version_number.c
 
 #
 # App build/install targets

diff --git a/src/config/Makefile.version-CML.in b/src/config/Makefile.version-CML.in
index e77e110ce79f48aa35d0498b7963d322c3a7a351..45c4b8491be14e9eba81e656d9bd23601de36a54 100644 (file)
--- a/src/config/Makefile.version-CML.in
+++ b/src/config/Makefile.version-CML.in
@@ -8,22 +8,23 @@
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
 
-$(VERSFILE).o: $(VERSFILE).c
+AFS_component_version_number.o: AFS_component_version_number.c $(TOP_SRCDIR)/config/mkvers
+version.xml version.txt: $(TOP_SRCDIR)/config/mkvers
 
 # mkvers checks timestamps
 
-$(VERSFILE).c:
-       $(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).c
+AFS_component_version_number.c:
+       $(TOP_SRCDIR)/config/mkvers -o AFS_component_version_number.c
 # only done for RX in NT
 #      -c $(CML_PREFIX)
 
-$(VERSFILE).h:
-       $(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).h -v
+AFS_component_version_number.h:
+       $(TOP_SRCDIR)/config/mkvers -o AFS_component_version_number.h -v
 
-$(VERSFILE).txt:
-       $(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).txt -t
+version.txt:
+       $(TOP_SRCDIR)/config/mkvers -o version.txt -t
 
-$(VERSFILE).xml:
-       $(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).xml -x
+version.xml:
+       $(TOP_SRCDIR)/config/mkvers -o version.xml -x
 
 noversion: install

diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
index 179a929044daa397b7be3a97025d5207c8c358c9..0d612ddfa21afd70f499825fa00f0794c091c78c 100644 (file)
--- a/src/config/Makefile.version-NOCML.in
+++ b/src/config/Makefile.version-NOCML.in
@@ -8,14 +8,17 @@
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
 
-$(VERSFILE).o: $(VERSFILE).c
+AFS_component_version_number.o: AFS_component_version_number.c
 
-$(VERSFILE).c: @TOP_OBJDIR@/src/config/Makefile.version
-       echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >$(VERSFILE).c
-       echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>$(VERSFILE).c
+AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
+       echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c
+       echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c
 
-$(VERSFILE).xml:
-       echo '<?xml version="1.0" encoding="UTF-8"?>' >$(VERSFILE).xml
-       echo '<revision>' >>$(VERSFILE).xml
-       echo '<revnumber>${VERSION}</revnumber>' >>$(VERSFILE).xml
-       echo '</revision>' >>$(VERSFILE).xml
+version.xml:
+       echo '<?xml version="1.0" encoding="UTF-8"?>' >version.xml
+       echo '<revision>' >>version.xml
+       echo '<revnumber>${VERSION}</revnumber>' >>version.xml
+       echo '</revision>' >>version.xml
+
+version.txt:
+       echo "Base configuration unknown" > version.txt

diff --git a/src/config/mkvers.c b/src/config/mkvers.c
index aea2a4047a3736f610dcee61f2e002e3623d7481..c0227966a64c904c65c76d80a6ffd9e2c6600ffa 100644 (file)
--- a/src/config/mkvers.c
+++ b/src/config/mkvers.c
@@ -300,7 +300,7 @@ PrintStamps(void)
            } else if (cfgFormat == CF_TEXT) {
                fprintf(fpVers, "Base configuration %s\n",
                        stateDeltas[i].name);
-           } else if (cfgFormat == CF_TEXT) {
+           } else if (cfgFormat == CF_XML) {
                 fprintf(fpVers, 
                         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                         "<revision>\n"