From: Ben Kaduk <kaduk@mit.edu>
Date: Thu, 27 Sep 2012 19:16:28 +0000 (-0400)
Subject: Add version info for ccapiserver.exe
X-Git-Tag: kfw-4.0-final~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f49aa3a8d1061fd921bdb9f888602ce514ee397;p=thirdparty%2Fkrb5.git

Add version info for ccapiserver.exe

Executables and shared libraries should have a file version, so
that the upgrade process works as expected.

(cherry picked from commit cdaae4bd07e5b9d9ec0f7b14103f7e43b898d0aa)

ticket: 7386
version_fixed: 1.10.4
status: resolved
---

diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
index d5da00136b..23cec27e71 100644
--- a/src/ccapi/server/win/Makefile.in
+++ b/src/ccapi/server/win/Makefile.in
@@ -92,8 +92,13 @@ copysrc :
 
 midl : ccs_request.h ccs_reply.h
 
-$(OUTPRE)ccapiserver.exe: $(OBJS)
-	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(LIBS) $(conlibsdll) $(conflags)
+VERSIONRC = $(BUILDTOP)\..\windows\version.rc
+CCAPISERVERRES = $(OUTPRE)ccapiserver.res
+$(CCAPISERVERRES): $(VERSIONRC)
+	$(RC) $(RCFLAGS) -DCCAPISERVER_APP -fo $@ -r $**
+
+$(OUTPRE)ccapiserver.exe: $(OBJS) $(CCAPISERVERRES)
+	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(LIBS) $(CCAPISERVERRES) $(conlibsdll) $(conflags)
 
 finish :
     @echo "Finished building ccapiserver.exe"
diff --git a/src/windows/version.rc b/src/windows/version.rc
index 810d800f69..d2c341d37e 100644
--- a/src/windows/version.rc
+++ b/src/windows/version.rc
@@ -119,6 +119,13 @@
 #endif
 #endif /* CCAPI_LIB */
 
+#ifdef CCAPISERVER_APP
+#define K5_DESCRIPTION "Kerberos Credentials Cache API Server\0"
+#define K5_FILETYPE	VFT_APP
+#define K5_INTERNAL_NAME "CCAPISERVER\0"
+#define K5_ORIGINAL_NAME "ccapiserver.exe\0"
+#endif /* CCAPISERVER_APP */
+
 #ifdef LEASH_APP
 #define K5_DESCRIPTION "MIT Kerberos Ticket Manager - " KRB5_PRODUCTNAME_STR "\0"
 #define K5_FILETYPE	VFT_APP