DEVEL15-windows-stat-resource-files-20080730

LICENSE MIT

Add version resource info to xstat_cm_test.exe and xstat_fs_test.exe

(cherry picked from commit 8c22d2388af3a2e99aeb70fdb81dbfa158413840)

diff --git a/src/xstat/NTMakefile b/src/xstat/NTMakefile
index def1af40b77291d63697f3e15188e20e02fc4ed6..cdbb9d640a8c554fee0362a0bf41a61ba09eb41b 100644 (file)
--- a/src/xstat/NTMakefile
+++ b/src/xstat/NTMakefile
@@ -47,7 +47,9 @@ FSINCLS= $(INCDIR)\xstat_fs.h $(RPCINCLS)
 $(LIBDIR)\afs_xstat_fs.lib: $(OUT)\xstat_fs.obj $(OUT)\xstat_fs_callback.obj $(OUT)\AFS_component_version_number.obj
        $(LIBARCH)
 
-$(BINDIR)\xstat_fs_test.exe: $(OUT)\xstat_fs_test.obj $(LIBDIR)\afs_xstat_fs.lib $(LIBS)
+$(OUT)\xstat_fs_test.res: xstat_fs_test.rc AFS_component_version_number.h
+
+$(BINDIR)\xstat_fs_test.exe: $(OUT)\xstat_fs_test.obj $(OUT)\xstat_fs_test.res $(LIBDIR)\afs_xstat_fs.lib $(LIBS)
        $(EXECONLINK) rpcrt4.lib
        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
@@ -61,7 +63,9 @@ CMINCLS=$(INCDIR)\xstat_cm.h $(RPCINCLS)
 $(LIBDIR)\afs_xstat_cm.lib: $(OUT)\xstat_cm.obj $(OUT)\AFS_component_version_number.obj
        $(LIBARCH)
 
-$(BINDIR)\xstat_cm_test.exe: $(OUT)\xstat_cm_test.obj $(LIBDIR)\afs_xstat_cm.lib $(LIBS)
+$(OUT)\xstat_cm_test.res: xstat_cm_test.rc AFS_component_version_number.h
+
+$(BINDIR)\xstat_cm_test.exe: $(OUT)\xstat_cm_test.obj $(OUT)\xstat_cm_test.res $(LIBDIR)\afs_xstat_cm.lib $(LIBS)
        $(EXECONLINK) 
        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
@@ -72,6 +76,7 @@ $(BINDIR)\xstat_cm_test.exe: $(OUT)\xstat_cm_test.obj $(LIBDIR)\afs_xstat_cm.lib
 #
 clean::
        $(DEL) -f $(OUT)\*.obj
+       $(DEL) -f $(OUT)\*.res
        $(DEL) -f $(OUT)\*.pdb
        $(DEL) -f $(OUT)\*.ilk
        $(DEL) -f $(INCDIR)\afs\xstat_fs.h
@@ -80,4 +85,4 @@ clean::
        $(DEL) -f $(LIBDIR)\afs_xstat_cm.lib
        $(DEL) -f $(BINDIR)\xstat_cm_test.exe
        $(DEL) -f $(BINDIR)\xstat_fs_test.exe
-       $(DEL) -f AFS_component_version_number.c
+       $(DEL) -f AFS_component_version_number.?

diff --git a/src/xstat/xstat_cm_test.rc b/src/xstat/xstat_cm_test.rc
new file mode 100644 (file)
index 0000000..80d11fc
--- /dev/null
+++ b/src/xstat/xstat_cm_test.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 Cache Manager Statistics Tool"
+#define  AFS_VERINFO_NAME "xstat_cm_test"
+#define  AFS_VERINFO_FILENAME "xstat_cm_test.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\config\NTVersioninfo.rc"

diff --git a/src/xstat/xstat_fs_test.rc b/src/xstat/xstat_fs_test.rc
new file mode 100644 (file)
index 0000000..66fac7b
--- /dev/null
+++ b/src/xstat/xstat_fs_test.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 File Server Statistics Tool"
+#define  AFS_VERINFO_NAME "xstat_fs_test"
+#define  AFS_VERINFO_FILENAME "xstat_fs_test.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\config\NTVersioninfo.rc"