From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 20 Sep 2007 12:46:07 +0000 (+0000)
Subject: DEVEL15-windows-version-info-20070920
X-Git-Tag: openafs-devel-1_5_26~61
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=587e8b26f394a19004e188d801d7989252821271;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-version-info-20070920


add version info to the threaded version of butc.exe that we ship


(cherry picked from commit c984f03a9185e5b1b69e182ad891caa83541d08c)
---

diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 41c1388d0..ba1f13d6b 100644
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -66,6 +66,9 @@ BUTCOBJS   = $(OUT)\dbentries.obj \
          $(OUT)\butc_xbsa.obj \
          $(LWPOBJS) \
          $(BUCOORDOBJS)
+
+BUTCRES = $(OUT)\butc.res
+
 BUTCINCLUDE= -I. -I$(DESTDIR)\include -I$(XBSADIR)
 BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
 	     $(DESTDIR)\lib\afs\afsbubasics.lib \
@@ -110,7 +113,9 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
 # nmake /nologo /f ntmakefile install
 #----------------------------------------------- BUTC
 
-$(BUTCEXE): $(BUTCOBJS) $(BUTCLIBS)
+$(BUTCRES): butc.rc AFS_component_version_number.h
+
+$(BUTCEXE): $(BUTCOBJS) $(BUTCRES) $(BUTCLIBS)
 	$(EXECONLINK) dnsapi.lib mpr.lib
         $(_VC_MANIFEST_EMBED_EXE)
 	$(EXEPREP)
@@ -186,3 +191,5 @@ noversion: install
 
 mkdir:
 	
+clean::
+	$(DEL) $(BUTCRES)
diff --git a/src/tbutc/butc.rc b/src/tbutc/butc.rc
new file mode 100644
index 000000000..4c14377e2
--- /dev/null
+++ b/src/tbutc/butc.rc
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+/* Define VERSIONINFO resource */
+
+#define  AFS_VERINFO_FILE_DESCRIPTION "AFS Tape Coordinator Server (threaded)"
+#define  AFS_VERINFO_NAME "butc"
+#define  AFS_VERINFO_FILENAME "butc.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\config\NTVersioninfo.rc"