summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBen Kaduk <kaduk@mit.edu>2012-09-27 15:16:28 -0400
committerBen Kaduk <kaduk@mit.edu>2012-09-27 15:50:57 -0400
commitcdaae4bd07e5b9d9ec0f7b14103f7e43b898d0aa (patch)
treeab40b14a1b616b2c6514289784ed539ae826b2c9 /src
parent6298655a778e58af6f0faaff554e126378ce7c4a (diff)
downloadkrb5-cdaae4bd07e5b9d9ec0f7b14103f7e43b898d0aa.tar.gz
krb5-cdaae4bd07e5b9d9ec0f7b14103f7e43b898d0aa.tar.xz
krb5-cdaae4bd07e5b9d9ec0f7b14103f7e43b898d0aa.zip
Add version info for ccapiserver.exe
Executables and shared libraries should have a file version, so that the upgrade process works as expected. ticket: 7386 (new) tags: pullup target_version: 1.10.4
Diffstat (limited to 'src')
-rw-r--r--src/ccapi/server/win/Makefile.in9
-rw-r--r--src/windows/version.rc7
2 files changed, 14 insertions, 2 deletions
diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
index d5da00136..23cec27e7 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 810d800f6..d2c341d37 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