DEVEL15-windows-version-info-20070919

FIXES 71397

Many of the OpenAFS binaries that are installed on end user machines
did not have version information.  This is problematic as it is impossible
to determine which version of a binary the crash report was filed against
when a report is received by Microsoft Windows Error Reporting service.

(cherry picked from commit feab12b929564a27a77bb84278291493003b605f)

diff --git a/src/WINNT/afsadmsvr/NTMakefile b/src/WINNT/afsadmsvr/NTMakefile
index d656416..242fbda 100644 (file)
--- a/src/WINNT/afsadmsvr/NTMakefile
+++ b/src/WINNT/afsadmsvr/NTMakefile
@@ -57,8 +57,7 @@ LIBOBJS = \
 EXERES = $(OUT)\AfsAdmSvr.res
 
 
-$(EXERES):$$(@B).rc
-       $(RC) $**
+$(EXERES): AfsAdmSvr.rc AFS_component_version_number.h
 
 EXEOBJS = \
        $(OUT)\TaAfsAdmSvr.obj \
@@ -143,7 +142,7 @@ afsclass_clean :
        nmake /nologo /f ntmakefile clean
        $(CD) ..\afsadmsvr
 
-$(EXEFILE) : $(EXEOBJS) $(EXELIBS)
+$(EXEFILE) : $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK)  $(VCLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
@@ -161,14 +160,14 @@ clean:: afsclass_clean afsapplib_clean
        if exist ITaAfsAdmSvr*.cpp del ITaAfsAdmSvr*.cpp
        if exist ITaAfsAdmSvr*.c del ITaAfsAdmSvr*.c
        if exist ITaAfsAdmSvr*.h del ITaAfsAdmSvr*.h
+       $(DEL) AFS_component_version_number.h
+       $(DEL) $(EXERES)
 
 ############################################################################
 #
 # Dependencies
 #
 
-$(OUT)\AfsAdmSvr.res : AFS_component_version_number.h
-
 mkdir:
        -mkdir $(OUT)\..\afsapplib
        cd ..\afsapplib

diff --git a/src/WINNT/install/NSIS/AdminGroup.rc b/src/WINNT/install/NSIS/AdminGroup.rc
new file mode 100644 (file)
index 0000000..75eacfe
--- /dev/null
+++ b/src/WINNT/install/NSIS/AdminGroup.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 "OpenAFS Admin Group Creator"
+#define  AFS_VERINFO_NAME "AdminGroup"
+#define  AFS_VERINFO_FILENAME "AdminGroup.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\..\..\config\NTVersioninfo.rc"

diff --git a/src/WINNT/install/NSIS/Killer.rc b/src/WINNT/install/NSIS/Killer.rc
new file mode 100644 (file)
index 0000000..4bd55a1
--- /dev/null
+++ b/src/WINNT/install/NSIS/Killer.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 "OpenAFS Process Killer Utility"
+#define  AFS_VERINFO_NAME "Killer"
+#define  AFS_VERINFO_FILENAME "Killer.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\..\..\config\NTVersioninfo.rc"

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index f2c2456..50228f3 100644 (file)
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -13,21 +13,27 @@ LOOPBACK_LIBS = wbemuuid.lib setupapi.lib msi.lib ole32.lib shell32.lib oleaut32
 $(OUT)\Service.obj: Service.cpp
           $(C2OBJ) Service.cpp
 
-$(EXEDIR)\Service.exe: $(OUT)\Service.obj
+$(OUT)\Service.res: Service.rc AFS_component_version_number.h
+
+$(EXEDIR)\Service.exe: $(OUT)\Service.obj $(OUT)\Service.res
       $(EXECONLINK) 
-        $(_VC_MANIFEST_EMBED_EXE)
+      $(_VC_MANIFEST_EMBED_EXE)
+
+$(OUT)\Killer.res: Killer.rc AFS_component_version_number.h
 
 $(OUT)\Killer.obj: Killer.cpp
       $(C2OBJ) Killer.cpp
 
-$(EXEDIR)\Killer.exe: $(OUT)\Killer.obj
+$(EXEDIR)\Killer.exe: $(OUT)\Killer.obj $(OUT)\Killer.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
 
+$(OUT)\AdminGroup.res: AdminGroup.rc AFS_component_version_number.h
+
 $(OUT)\AdminGroup.obj: AdminGroup.cpp
       $(C2OBJ) AdminGroup.cpp
 
-$(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj
+$(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
 
@@ -104,11 +110,19 @@ build: prebuild
 
 install: $(OUT)\Service.obj $(EXEDIR)\Service.exe $(OUT)\Killer.obj $(EXEDIR)\Killer.exe $(EXEDIR)\AdminGroup.exe build
 
-#clean:
-#   $(DEL) $(OUT)\Service.obj
-#   $(DEL) $(EXEDIR)\Service.exe
+clean::
+   $(DEL) $(OUT)\Service.obj
+   $(DEL) $(OUT)\Service.res
+   $(DEL) $(EXEDIR)\Service.exe
+   $(DEL) $(OUT)\Killer.obj
+   $(DEL) $(OUT)\Killer.res
+   $(DEL) $(EXEDIR)\Killer.exe
+   $(DEL) $(OUT)\AdminGroup.obj
+   $(DEL) $(OUT)\AdminGroup.res
+   $(DEL) $(EXEDIR)\AdminGroup.exe
+   $(DEL) nsi-include.nsi
+   $(DEL) AFS_component_version_number.h
 #   $(DEL) $(EXEDIR)\Msvcr71.dll
 #   $(DEL) $(EXEDIR)\MFC42.DLL
 #   $(DEL) OpenAFSforWindows.exe
-#   $(DEL) nsi-include.nsi
 

diff --git a/src/WINNT/install/NSIS/Service.rc b/src/WINNT/install/NSIS/Service.rc
new file mode 100644 (file)
index 0000000..700079c
--- /dev/null
+++ b/src/WINNT/install/NSIS/Service.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 "OpenAFS Service Creation / Deletion Utility"
+#define  AFS_VERINFO_NAME "Service"
+#define  AFS_VERINFO_FILENAME "Service.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\..\..\config\NTVersioninfo.rc"

diff --git a/src/WINNT/install/loopback/NTMakefile b/src/WINNT/install/loopback/NTMakefile
index 23efb38..626d1ee 100644 (file)
--- a/src/WINNT/install/loopback/NTMakefile
+++ b/src/WINNT/install/loopback/NTMakefile
@@ -8,8 +8,12 @@ MEDIABINDIR = $(DESTDIR)\WinInstall\Config
 
 EXEFILE = $(MEDIABINDIR)\instloop.exe
 
+EXERES = $(OUT)\instloop.res
+
 DLLFILE = $(MEDIABINDIR)\afsloopback.dll
 
+DLLRES = $(OUT)\afsloopback.res
+
 DLLEXPORTS=\
        -EXPORT:UnInstallLoopBack \
        -EXPORT:IsLoopbackInstalled \
@@ -29,6 +33,10 @@ LINK=link
 DLLSOURCEFILES = loopbackutils.cpp renameconnection.cpp wmi.cpp
 DLLOBJFILES =  $(OUT)\loopbackutils.obj $(OUT)\renameconnection.obj $(OUT)\wmi.obj
 
+$(EXERES) : instloop.rc AFS_component_version_number.h
+
+$(DLLRES) : afsloopback.rc AFS_component_version_number.h
+
 STATICC2OBJ=$(CC) $(cflags) $(afscflags) $(afscdefs) -ML
 
 $(OUT)\loopbackutils.obj: loopbackutils.cpp
@@ -40,8 +48,8 @@ $(OUT)\renameconnection.obj: renameconnection.cpp
 $(OUT)\wmi.obj: wmi.cpp
        $(STATICC2OBJ)  -I$(NTDDKDIR) -c -DUNICODE -D_UNICODE /Fo$@ $**
 
-$(DLLFILE): $(DLLOBJFILES)
-       $(LINK) -DLL $(DLLEXPORTS) -OUT:$@ $(DLLOBJFILES) $(DLLLIBFILES)
+$(DLLFILE): $(DLLOBJFILES) $(DLLRES)
+       $(LINK) -DLL $(DLLEXPORTS) -OUT:$@ $** $(DLLLIBFILES)
         $(_VC_MANIFEST_EMBED_DLL)
 
 # instloop.exe
@@ -52,11 +60,15 @@ EXEOBJFILES = $(OUT)\instloop.obj $(DLLOBJFILES)
 $(OUT)\instloop.obj: instloop.c
       $(STATICC2OBJ) -c -DUNICODE -D_UNICODE /Fo$@ $**
 
-$(EXEFILE): $(EXEOBJFILES)
-      $(LINK) /OUT:$@ $(EXEOBJFILES) $(DLLLIBFILES)
-        $(_VC_MANIFEST_EMBED_EXE)
+$(EXEFILE): $(EXEOBJFILES) $(EXERES)
+      $(LINK) /OUT:$@ $** $(DLLLIBFILES)
+      $(_VC_MANIFEST_EMBED_EXE)
 
 install:  $(DLLFILE) $(EXEFILE)
 
 clean  ::
        $(DEL) *.pdb
+       $(DEL) $(EXERES)
+       $(DEL) $(DLLRES)
+       $(DEL) AFS_component_version_number.h
+

diff --git a/src/WINNT/install/loopback/afsloopback.rc b/src/WINNT/install/loopback/afsloopback.rc
new file mode 100644 (file)
index 0000000..6acc1b0
--- /dev/null
+++ b/src/WINNT/install/loopback/afsloopback.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 "OpenAFS Loopback Installer DLL"
+#define  AFS_VERINFO_NAME "loopback"
+#define  AFS_VERINFO_FILENAME "loopback.dll"
+
+#include "AFS_component_version_number.h"
+#include "..\..\..\config\NTVersioninfo.rc"

diff --git a/src/WINNT/install/loopback/instloop.rc b/src/WINNT/install/loopback/instloop.rc
new file mode 100644 (file)
index 0000000..90835b6
--- /dev/null
+++ b/src/WINNT/install/loopback/instloop.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 "OpenAFS Loopback Adapter Installer"
+#define  AFS_VERINFO_NAME "instloop"
+#define  AFS_VERINFO_FILENAME "instloop.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\..\..\config\NTVersioninfo.rc"

diff --git a/src/WINNT/install/wix/custom/NTMakefile b/src/WINNT/install/wix/custom/NTMakefile
index e5a6b6d..b8ca567 100644 (file)
--- a/src/WINNT/install/wix/custom/NTMakefile
+++ b/src/WINNT/install/wix/custom/NTMakefile
@@ -8,6 +8,8 @@ MEDIABINDIR = $(DESTDIR)\WinInstall\Dll
 
 DLLFILE = $(MEDIABINDIR)\afscustom.dll
 
+DLLRES = $(OUT)\afscustom.res
+
 DLLEXPORTS=\
        -EXPORT:InstallNetProvider \
        -EXPORT:UninstallNetProvider \
@@ -28,7 +30,9 @@ LINK=link
 $(OUT)\afscustom.obj: afscustom.cpp
        $(CC) -ML -c /Fo$@ $**
 
-$(DLLFILE): $(OUT)\afscustom.obj
+$(DLLRES): afscustom.rc AFS_component_version_number.h
+
+$(DLLFILE): $(OUT)\afscustom.obj $(DLLRES)
        $(LINK) -DLL $(DLLEXPORTS) \
          -OUT:$@ $** $(DLLLIBFILES)
         $(_VC_MANIFEST_EMBED_DLL)
@@ -36,3 +40,7 @@ $(DLLFILE): $(OUT)\afscustom.obj
 install: $(DLLFILE)
 
 clean  ::
+       $(DEL) $(DLLRES)
+       $(DEL) $(OUT)\afscustom.obj
+       $(DEL) $(DLLFILE)
+       $(DEL) AFS_component_version_number.h

diff --git a/src/WINNT/install/wix/custom/afscustom.rc b/src/WINNT/install/wix/custom/afscustom.rc
new file mode 100644 (file)
index 0000000..808388f
--- /dev/null
+++ b/src/WINNT/install/wix/custom/afscustom.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 "OpenAFS MSI Custom DLL"
+#define  AFS_VERINFO_NAME "afscustom"
+#define  AFS_VERINFO_FILENAME "afscustom.dll"
+
+#include "AFS_component_version_number.h"
+#include "..\..\..\..\config\NTVersioninfo.rc"

diff --git a/src/WINNT/license/NTMakefile b/src/WINNT/license/NTMakefile
index c86e932..9bd99b2 100644 (file)
--- a/src/WINNT/license/NTMakefile
+++ b/src/WINNT/license/NTMakefile
@@ -17,6 +17,8 @@ RELDIR=WINNT\license
 
 EXEFILE = $(DESTDIR)\bin\sgml2rtf.exe
 
+EXERES = $(OUT)\sgml2rtf.res
+
 EXEOBJS = \
        $(OUT)\main.obj \
        $(OUT)\multistring.obj
@@ -24,7 +26,9 @@ EXEOBJS = \
 EXELIBS = \
        user32.lib
 
-$(EXEFILE) : $(EXEOBJS)
+$(EXERES): sgml2rtf.rc AFS_component_version_number.h
+
+$(EXEFILE) : $(EXEOBJS) $(EXERES)
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
@@ -44,6 +48,7 @@ mkdir:
        cd ..
 
 clean ::
+       $(DEL) $(EXERES)
        $(CD) lang
        @$(MAKECMD) /nologo /f NTMakefile clean
        $(CD) ..

diff --git a/src/WINNT/license/sgml2rtf.rc b/src/WINNT/license/sgml2rtf.rc
new file mode 100644 (file)
index 0000000..f994c80
--- /dev/null
+++ b/src/WINNT/license/sgml2rtf.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 SGML to RTF Conversion Tool"
+#define  AFS_VERINFO_NAME "sgml2rtf"
+#define  AFS_VERINFO_FILENAME "sgml2rtf.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\..\config\NTVersioninfo.rc"

diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile
index 66c97e5..67fa54b 100644 (file)
--- a/src/bucoord/NTMakefile
+++ b/src/bucoord/NTMakefile
@@ -37,6 +37,8 @@ $(LIBFILE): $(LIBOBJS)
 
 EXEFILE = $(DESTDIR)\etc\backup.exe
 
+EXERES = $(OUT)/backup.res
+
 EXEOBJS =\
        $(OUT)\main.obj \
        $(OUT)\config.obj \
@@ -58,8 +60,7 @@ EXEOBJS =\
        $(OUT)\dlq.obj \
 
 
-$(OUT)/backup.res:AFS_component_version_number.h
-       $(RC) backup.rc
+$(EXERES): backup.rc AFS_component_version_number.h
 
 $(EXEOBJS):$$(@B).c
        $(C2OBJ) $**
@@ -90,7 +91,7 @@ EXELIBS =\
      $(DESTDIR)\lib\cm_dns.obj
        
 
-$(EXEFILE): $(EXEOBJS) $(EXELIBS)
+$(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
@@ -119,6 +120,8 @@ install: $(INCFILES) $(LIBFILE) $(EXEFILE)
 
 clean::
        $(DEL) bc.h bucoord_errs.c
+       $(DEL) $(EXERES)
+       $(DEL) AFS_component_version_number.h
 
 
 mkdir:

diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile
index f0d2ad3..b384803 100644 (file)
--- a/src/butc/NTMakefile
+++ b/src/butc/NTMakefile
@@ -15,6 +15,8 @@ AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DNOGDI -DWIN32_LEAN_AND_MEAN
 
 EXEFILE = $(DESTDIR)\etc\butc.exe
 
+EXERES = $(OUT)\butc.res
+
 EXEOBJS =\
        $(OUT)\dbentries.obj \
        $(OUT)\tcprocs.obj \
@@ -24,8 +26,7 @@ EXEOBJS =\
        $(OUT)\tcudbprocs.obj \
        $(OUT)\dump.obj \
        $(OUT)\tcstatus.obj \
-       $(OUT)\tcmain.obj  \
-       $(OUT)\butc.res
+       $(OUT)\tcmain.obj
 
 EXELIBS =\
        $(DESTDIR)\lib\afs\afsbudb.lib \
@@ -53,17 +54,14 @@ EXELIBS =\
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\cm_dns.obj
 
-$(EXEFILE): $(EXEOBJS) $(EXELIBS)
+$(EXERES): butc.rc AFS_component_version_number.h
+
+$(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
 
 ############################################################################
-# Definitions for generating versioninfo resources
-
-$(OUT)\butc.res: AFS_component_version_number.h
-
-############################################################################
 # Install target; primary makefile target
 
 install: $(EXEFILE)
@@ -73,6 +71,8 @@ install: $(EXEFILE)
 # Local clean target; augments predefined clean target
 
 clean::
+       $(DEL) $(EXERES)
+       $(DEL) AFS_component_version_number.h
 
 
 ############################################################################

diff --git a/src/comerr/NTMakefile b/src/comerr/NTMakefile
index e110524..15bf681 100644 (file)
--- a/src/comerr/NTMakefile
+++ b/src/comerr/NTMakefile
@@ -37,6 +37,8 @@ $(COMERR_LIBFILE): $(COMERR_LIBOBJS)
 # build and install the compile_et executable
 COMPILE_ET_EXEFILE = $(DESTDIR)\bin\compile_et.exe
 
+COMPILE_ET_EXERES  = $(OUT)\compile_et.res
+
 prep:
        $(DESTDIR)\bin\touch et_lex.lex_nt.c
        $(DESTDIR)\bin\touch error_table_nt.c
@@ -52,13 +54,15 @@ COMPILE_ET_EXEOBJS =\
                $(OUT)\compile_et.obj \
                $(OUT)\error_table_nt.obj
 
+$(COMPILE_ET_EXERES): compile_et.rc AFS_component_version_number.h
+
 $(COMPILE_ET_EXEOBJS): $$(@B).c
     $(C2OBJ) $**
 
 COMPILE_ET_EXELIBS =\
        $(DESTDIR)\lib\afs\afsutil.lib
 
-$(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXELIBS)  
+$(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_EXELIBS)  
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
@@ -71,6 +75,7 @@ install9x: install
 clean::
        $(DEL) $(COMERR_LIBFILE) $(OUT)\AFS_component_version_number.obj
        $(DEL) $(COMPILE_ET_EXEFILE)
+       $(DEL) $(COMPILE_ET_EXERES);
        $(DEL) *~ *.bak \
                  *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
                  *.cp *.fn *.ky *.log *.pg *.tp *.vr \

diff --git a/src/comerr/compile_et.rc b/src/comerr/compile_et.rc
new file mode 100644 (file)
index 0000000..b2bb18e
--- /dev/null
+++ b/src/comerr/compile_et.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 Common Error Table Compilation Tool"
+#define  AFS_VERINFO_NAME "compile_et"
+#define  AFS_VERINFO_FILENAME "compile_et.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\config\NTVersioninfo.rc"

diff --git a/src/rxgen/NTMakefile b/src/rxgen/NTMakefile
index 363ffa4..3a36337 100644 (file)
--- a/src/rxgen/NTMakefile
+++ b/src/rxgen/NTMakefile
@@ -17,6 +17,8 @@ INCFILES =\
 # build rxgen
 EXEFILE = $(DESTDIR)\bin\rxgen.exe
 
+EXERES = $(OUT)\rxgen.res
+
 EXEOBJS =\
        $(OUT)\rpc_main.obj \
        $(OUT)\rpc_hout.obj \
@@ -30,7 +32,9 @@ EXEOBJS =\
 $(EXEOBJS): $$(@B).c
     $(C2OBJ) $**
 
-$(EXEFILE): $(EXEOBJS) $(EXELIBS)
+$(EXERES): rxgen.rc AFS_component_version_number.h
+
+$(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
@@ -42,7 +46,8 @@ install: AFS_component_version_number.c $(EXEFILE) $(INCFILES)
 install9x: install
 
 clean::
-       $(DEL) $(EXEFILE)       
+       $(DEL) $(EXEFILE)
+       $(DEL) $(EXERES)
 
 mkdir:
        

diff --git a/src/rxgen/rxgen.rc b/src/rxgen/rxgen.rc
new file mode 100644 (file)
index 0000000..b489dee
--- /dev/null
+++ b/src/rxgen/rxgen.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 "RX RPC Code Generator"
+#define  AFS_VERINFO_NAME "rxgen"
+#define  AFS_VERINFO_FILENAME "rxgen.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\config\NTVersioninfo.rc"

diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile
index 2818389..c9e199f 100644 (file)
--- a/src/viced/NTMakefile
+++ b/src/viced/NTMakefile
@@ -27,14 +27,15 @@ INCFILES =\
 
 EXEFILE = $(DESTDIR)\root.server\usr\afs\bin\fileserver.exe
 
+EXERES = $(OUT)\fileserver.res
+
 EXEOBJS =\
        $(OUT)\afsfileprocs.obj \
        $(OUT)\callback.obj \
        $(OUT)\host.obj \
        $(OUT)\physio.obj \
        $(OUT)\viced.obj \
-       $(OUT)\AFS_component_version_number.obj \
-       $(OUT)\fileserver.res
+       $(OUT)\AFS_component_version_number.obj
 
 EXELIBS = \
        $(DESTDIR)\lib\afs\afscmd.lib \
@@ -59,7 +60,7 @@ EXELIBS = \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib
 
-$(EXEFILE): $(EXEOBJS) $(EXELIBS)
+$(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
@@ -68,18 +69,22 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
 # Build cbd - not generally distributed debugging program
 CBD = $(DESTDIR)\root.server\usr\afs\bin\cbd.exe
 
+CBDRES = $(OUT)\cbd.res
+
 $(OUT)\cbd.obj: callback.c AFS_component_version_number.h
        $(C2OBJ) callback.c -DINTERPRET_DUMP
 
-$(CBD): $(OUT)\cbd.obj 
+$(CBD): $(OUT)\cbd.obj $(CBDRES)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
 
 ############################################################################
 # generate versioninfo resources
-$(OUT)\fileserver.res: AFS_component_version_number.h
+$(EXERES): AFS_component_version_number.h
+
+$(CBDRES): AFS_component_version_number.h
 
-install:  $(INCFILES) $(OUT)\fileserver.res $(CBD)
+install:  $(INCFILES) $(EXERES) $(CBD) $(CBDRES)
 
 mkdir:
        

diff --git a/src/viced/cbd.rc b/src/viced/cbd.rc
new file mode 100644 (file)
index 0000000..16bbfeb
--- /dev/null
+++ b/src/viced/cbd.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 Callback Debugging Tool"
+#define  AFS_VERINFO_NAME "cbd"
+#define  AFS_VERINFO_FILENAME "cbd.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\config\NTVersioninfo.rc"