[27047] in CVS-changelog-for-Kerberos-V5
krb5 commit: Add version info for ccapiserver.exe
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Sep 27 16:34:12 2012
Date: Thu, 27 Sep 2012 16:33:54 -0400
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201209272033.q8RKXsFK015212@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/cdaae4bd07e5b9d9ec0f7b14103f7e43b898d0aa
commit cdaae4bd07e5b9d9ec0f7b14103f7e43b898d0aa
Author: Ben Kaduk <kaduk@mit.edu>
Date: Thu Sep 27 15:16:28 2012 -0400
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
src/ccapi/server/win/Makefile.in | 9 +++++++--
src/windows/version.rc | 7 +++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
index d5da001..23cec27 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 810d800..d2c341d 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
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
