windows-code-signing-20080702

LICENSE MIT

Add code signing with signtool.exe to the build process.
If all three of the required CODESIGN_xxxx environment
variables are defined, signtool will be used to sign each
exe, dll, and installer as they are built.

The three environment variables are:

  CODESIGN_DESC = <description of application>
  CODESIGN_TIMESTAMP = <url of certificate authority timestamp server>
  CODESIGN_URL = <end user help URL>

The default signing certificate is the one that will be used by
signtool.  If these environment variables are not defined, code
signing will be skipped.

diff --git a/src/WINNT/afs_setup_utils/NTMakefile b/src/WINNT/afs_setup_utils/NTMakefile
index d4439f2..c596518 100644 (file)
--- a/src/WINNT/afs_setup_utils/NTMakefile
+++ b/src/WINNT/afs_setup_utils/NTMakefile
@@ -81,8 +81,9 @@ AFSRM_EXELIBS =\
     $(DESTDIR)\lib\afs\afsutil.lib
 
 $(AFSRM_EXEFILE): $(AFSRM_EXEOBJS) $(AFSRM_EXELIBS)
-    $(EXECONLINK)
+        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 
@@ -132,6 +133,7 @@ $(INSTALL_UTILS_DLLFILE) : $(OUT)\afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
     $(DLLGUILINK) -entry:DllEntryPoint /DEF:install_utils.def $(VCLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
     $(DLLPREP)
+        $(CODESIGN_USERLAND)
     $(COPY) $*.lib $(ILIBDIR)
     $(DEL) $*.lib $*.exp
 
@@ -139,6 +141,7 @@ $(SERVER_UNINST_DLLFILE) : $(OUT)\s_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
     $(DLLGUILINK) -entry:DllEntryPoint /DEF:server_uninst.def $(VCLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
     $(DLLPREP)
+        $(CODESIGN_USERLAND)
     $(COPY) $*.lib $(ILIBDIR)
     $(DEL) $*.lib $*.exp
 
@@ -146,6 +149,7 @@ $(CLIENT_UNINST_DLLFILE) : $(OUT)\c_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
     $(DLLGUILINK) -entry:DllEntryPoint /DEF:client_uninst.def $(VCLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
     $(DLLPREP)
+        $(CODESIGN_USERLAND)
     $(COPY) $*.lib $(ILIBDIR)
     $(DEL) $*.lib $*.exp
 
@@ -153,6 +157,7 @@ $(CC_UNINST_DLLFILE) : $(OUT)\cc_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
     $(DLLGUILINK) -entry:DllEntryPoint /DEF:cc_uninst.def $(VCLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
     $(DLLPREP)
+        $(CODESIGN_USERLAND)
     $(COPY) $*.lib $(ILIBDIR)
     $(DEL) $*.lib $*.exp
 
@@ -160,6 +165,7 @@ $(LIGHT_CLIENT_UNINST_DLLFILE) : $(OUT)\lc_afs_setup_utils.obj $(DLLOBJS) $(DLLL
     $(DLLGUILINK) -entry:DllEntryPoint /DEF:light_client_uninst.def $(VCLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
     $(DLLPREP)
+        $(CODESIGN_USERLAND)
     $(COPY) $*.lib $(ILIBDIR)
     $(DEL) $*.lib $*.exp
 
@@ -167,6 +173,7 @@ $(DOCS_UNINST_DLLFILE) : $(OUT)\d_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
     $(DLLGUILINK) -entry:DllEntryPoint /DEF:docs_uninst.def $(VCLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
     $(DLLPREP)
+        $(CODESIGN_USERLAND)
     $(COPY) $*.lib $(ILIBDIR)
     $(DEL) $*.lib $*.exp
 

diff --git a/src/WINNT/afs_setup_utils/lang/NTMakefile b/src/WINNT/afs_setup_utils/lang/NTMakefile
index 89b5de4..e530924 100644 (file)
--- a/src/WINNT/afs_setup_utils/lang/NTMakefile
+++ b/src/WINNT/afs_setup_utils/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/afsadmsvr/NTMakefile b/src/WINNT/afsadmsvr/NTMakefile
index ed5377f..fc96a42 100644 (file)
--- a/src/WINNT/afsadmsvr/NTMakefile
+++ b/src/WINNT/afsadmsvr/NTMakefile
@@ -146,6 +146,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK)  $(VCLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 install : \
        $(IDLFILES) \

diff --git a/src/WINNT/afsapplib/NTMakefile b/src/WINNT/afsapplib/NTMakefile
index 737ddb5..5aef917 100644 (file)
--- a/src/WINNT/afsapplib/NTMakefile
+++ b/src/WINNT/afsapplib/NTMakefile
@@ -129,6 +129,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLLIBS)
        $(DLLGUILINK) $(LOCALLINKFLAGS) $(VCLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/WINNT/afsapplib/lang/NTMakefile b/src/WINNT/afsapplib/lang/NTMakefile
index f6a16a5..c9f9703 100644 (file)
--- a/src/WINNT/afsapplib/lang/NTMakefile
+++ b/src/WINNT/afsapplib/lang/NTMakefile
@@ -46,6 +46,7 @@ $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/afsapplib/test/NTMakefile b/src/WINNT/afsapplib/test/NTMakefile
index 3d92214..b141e9e 100644 (file)
--- a/src/WINNT/afsapplib/test/NTMakefile
+++ b/src/WINNT/afsapplib/test/NTMakefile
@@ -40,6 +40,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXELIBS)
        $(EXEGUILINK) comctl32.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 test : $(EXEFILE)
 

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index 446407b..7345556 100644 (file)
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -191,6 +191,7 @@ $(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS)
        $(DLLGUILINK) -def:libafsconf.def dnsapi.lib mpr.lib shell32.lib
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 
@@ -256,6 +257,7 @@ $(LOGON_DLLFILE): $(LOGON_DLLOBJS) $(LOGON_DLLLIBS)
        $(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslogon.def $(LOGON_DLLSDKLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(DESTDIR)\lib
        $(DEL) $*.lib $*.exp
 
@@ -335,24 +337,28 @@ $(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # tokens.exe
 $(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # unlog.exe
 $(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # afscpcc.exe
 $(EXEDIR)\afscpcc.exe: $(OUT)\afscpcc.obj $(OUT)\afscpcc.res $(LOGON_DLLLIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib userenv.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 
 # afsd.exe
@@ -388,42 +394,49 @@ $(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res  $(RXOBJS) $(AFSD_E
        $(EXEGUILINK) $(AFSD_SDKLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # afsd_service.exe
 $(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_service.res  $(RXOBJS) $(AFSD_EXELIBS)
        $(EXECONLINK) $(AFSD_SDKLIBS) /MAP /LARGEADDRESSAWARE
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # fs.exe
 $(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # cmdebug.exe
 $(EXEDIR)\cmdebug.exe: $(CMDBGOBJS) $(OUT)\cmdebug.res $(EXELIBS2)
        $(EXECONLINK) $(EXELIBS2) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib rpcrt4.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # symlink.exe
 $(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res  $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # afsshare.exe
 $(EXEDIR)\afsshare.exe: $(OUT)\afsshare.obj $(OUT)\afsshare.res $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # afsdacl.exe
 $(EXEDIR)\afsdacl.exe: $(OUT)\afsdacl.obj $(OUT)\afsdacl.res
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 # kpasswd.exe - built in kauth, but rebuild here to make pthread-based,
 #    which is required for Windows 95.  At some point it would be nice
@@ -465,6 +478,7 @@ $(DESTDIR)\bin\kpasswd.exe: $(KPASSWD_OBJS) $(KPASSWD_LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################

diff --git a/src/WINNT/afslegal/NTMakefile b/src/WINNT/afslegal/NTMakefile
index e9089df..4dc70d4 100644 (file)
--- a/src/WINNT/afslegal/NTMakefile
+++ b/src/WINNT/afslegal/NTMakefile
@@ -30,6 +30,7 @@ $(EXEFILE) : $(EXEOBJS)
        $(EXEGUILINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 install : $(EXEFILE) lang

diff --git a/src/WINNT/afslegal/lang/NTMakefile b/src/WINNT/afslegal/lang/NTMakefile
index c80da33..d8cdfd1 100644 (file)
--- a/src/WINNT/afslegal/lang/NTMakefile
+++ b/src/WINNT/afslegal/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/afsreg/test/NTMakefile b/src/WINNT/afsreg/test/NTMakefile
index 9919746..9357dfa 100644 (file)
--- a/src/WINNT/afsreg/test/NTMakefile
+++ b/src/WINNT/afsreg/test/NTMakefile
@@ -13,10 +13,12 @@ test tests: $(OUT)\getifinfo.exe $(OUT)\regman.exe $(OUT)\dupkey.exe
 $(OUT)\getifinfo.exe: $(OUT)\getifinfo.obj $(DESTDIR)\lib\afs\afsreg.lib 
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\dupkey.exe: $(OUT)\dupkey.obj $(DESTDIR)\lib\afs\afsreg.lib
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 REGMAN_EXELIBS =\
        $(DESTDIR)\lib\afs\afsreg.lib \
@@ -27,6 +29,7 @@ REGMAN_EXELIBS =\
 $(OUT)\regman.exe: $(OUT)\regman.obj $(REGMAN_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/WINNT/afssvrcfg/NTMakefile b/src/WINNT/afssvrcfg/NTMakefile
index 6b494b1..56f289c 100644 (file)
--- a/src/WINNT/afssvrcfg/NTMakefile
+++ b/src/WINNT/afssvrcfg/NTMakefile
@@ -65,6 +65,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
        $(EXEGUILINK)  $(VCLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)     
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################

diff --git a/src/WINNT/afssvrcfg/lang/NTMakefile b/src/WINNT/afssvrcfg/lang/NTMakefile
index 333d338..b6ff9b4 100644 (file)
--- a/src/WINNT/afssvrcfg/lang/NTMakefile
+++ b/src/WINNT/afssvrcfg/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/afssvrcpa/NTMakefile b/src/WINNT/afssvrcpa/NTMakefile
index 2f92ecc..b36956c 100644 (file)
--- a/src/WINNT/afssvrcpa/NTMakefile
+++ b/src/WINNT/afssvrcpa/NTMakefile
@@ -30,6 +30,7 @@ $(DLLFILE): $(DLLOBJS)
        $(DLLGUILINK)  $(DLLLIBS) /DEF:$(DEFFILE)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################

diff --git a/src/WINNT/afssvrcpa/lang/NTMakefile b/src/WINNT/afssvrcpa/lang/NTMakefile
index d3c9c18..67e3481 100644 (file)
--- a/src/WINNT/afssvrcpa/lang/NTMakefile
+++ b/src/WINNT/afssvrcpa/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/afssvrmgr/NTMakefile b/src/WINNT/afssvrmgr/NTMakefile
index 489275f..6d71230 100644 (file)
--- a/src/WINNT/afssvrmgr/NTMakefile
+++ b/src/WINNT/afssvrmgr/NTMakefile
@@ -108,6 +108,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXELIBS)
        $(EXEGUILINK) $(VCLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 lang ::
        $(CD) lang

diff --git a/src/WINNT/afssvrmgr/lang/NTMakefile b/src/WINNT/afssvrmgr/lang/NTMakefile
index 1d0f2d8..995799d 100644 (file)
--- a/src/WINNT/afssvrmgr/lang/NTMakefile
+++ b/src/WINNT/afssvrmgr/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/afsusrmgr/NTMakefile b/src/WINNT/afsusrmgr/NTMakefile
index 5b16745..4c86dab 100644 (file)
--- a/src/WINNT/afsusrmgr/NTMakefile
+++ b/src/WINNT/afsusrmgr/NTMakefile
@@ -79,6 +79,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXELIBS)
        $(EXEGUILINK) $(VCLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 lang ::
        $(CD) lang

diff --git a/src/WINNT/afsusrmgr/lang/NTMakefile b/src/WINNT/afsusrmgr/lang/NTMakefile
index b82b55a..2f0fe79 100644 (file)
--- a/src/WINNT/afsusrmgr/lang/NTMakefile
+++ b/src/WINNT/afsusrmgr/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile
index 8ff5c63..c8a0ac0 100644 (file)
--- a/src/WINNT/aklog/NTMakefile
+++ b/src/WINNT/aklog/NTMakefile
@@ -6,6 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 # include the primary makefile
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES)  -DHAVE_KRB5_CREDS_KEYBLOCK=1
 RELDIR=WINNT\aklog
 !INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\config\NTMakefile.version
@@ -61,11 +62,13 @@ $(AKLOG) : $(AKLOGOBJS) $(EXELIBS) $(OUT)\aklog.res
        $(EXECONLINK) $(EXELIBS) $(OTHERLIBS) $(LINKOPTS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 $(ASETKEY) : $(ASETKEYOBJS) $(EXELIBS) $(OUT)\asetkey.res
        $(EXECONLINK) $(EXELIBS) $(OTHERLIBS) $(LINKOPTS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(COPYHEADERS) $(AKLOG) $(ASETKEY)
 
@@ -78,6 +81,8 @@ $(OUT)\aklog.res : aklog.rc AFS_component_version_number.h
 
 $(OUT)\asetkey.res : asetkey.rc AFS_component_version_number.h
 
+$(OUT)\k5log.res : k5log.rc AFS_component_version_number.h
+
 mkdir:
        -mkdir $(OUT)\lang
        cd lang

diff --git a/src/WINNT/bosctlsvc/NTMakefile b/src/WINNT/bosctlsvc/NTMakefile
index 682ce64..ff11211 100644 (file)
--- a/src/WINNT/bosctlsvc/NTMakefile
+++ b/src/WINNT/bosctlsvc/NTMakefile
@@ -34,6 +34,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
        $(EXECONLINK) $(EXESDKLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Definitions for generating versioninfo resource via RC

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index f8c674a..c3dc5e9 100644 (file)
--- a/src/WINNT/client_config/NTMakefile
+++ b/src/WINNT/client_config/NTMakefile
@@ -116,6 +116,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXEOBJSc) $(EXERES) $(AFSDOBJS) $(EXELIBS)
 !ENDIF
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(COPYHEADERS) $(EXEFILE) lang
 

diff --git a/src/WINNT/client_config/lang/NTMakefile b/src/WINNT/client_config/lang/NTMakefile
index 3cba5cb..7681cbc 100644 (file)
--- a/src/WINNT/client_config/lang/NTMakefile
+++ b/src/WINNT/client_config/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/client_cpa/NTMakefile b/src/WINNT/client_cpa/NTMakefile
index 8352af5..fea1c77 100644 (file)
--- a/src/WINNT/client_cpa/NTMakefile
+++ b/src/WINNT/client_cpa/NTMakefile
@@ -30,6 +30,7 @@ $(DLLFILE): $(DLLOBJS)
        $(DLLGUILINK)  $(DLLLIBS) /DEF:$(DEFFILE)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################

diff --git a/src/WINNT/client_cpa/lang/NTMakefile b/src/WINNT/client_cpa/lang/NTMakefile
index f5d0b6a..ac01802 100644 (file)
--- a/src/WINNT/client_cpa/lang/NTMakefile
+++ b/src/WINNT/client_cpa/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index 3331a14..75c5fb9 100644 (file)
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -108,6 +108,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXECOBJS) $(EXERES) $(AFSDOBJS) $(CLIENTOBJS) $(EXELIB
        $(EXEGUILINK) $(VCLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(COPYHEADERS) $(EXEFILE) lang
 

diff --git a/src/WINNT/client_creds/lang/NTMakefile b/src/WINNT/client_creds/lang/NTMakefile
index 7f72591..07dcacc 100644 (file)
--- a/src/WINNT/client_creds/lang/NTMakefile
+++ b/src/WINNT/client_creds/lang/NTMakefile
@@ -44,6 +44,7 @@ DLLOBJS = $(RESFILE)
 $(DLLFILE) : $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP) 
+        $(CODESIGN_USERLAND)
 
 install : $(DLLFILE)
 

diff --git a/src/WINNT/client_exp/NTMakefile b/src/WINNT/client_exp/NTMakefile
index 05ed805..a84d615 100644 (file)
--- a/src/WINNT/client_exp/NTMakefile
+++ b/src/WINNT/client_exp/NTMakefile
@@ -68,6 +68,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:afs_shl_ext.def $(DLLSDKLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Definitions for generating versioninfo resources

diff --git a/src/WINNT/client_osi/NTMakefile b/src/WINNT/client_osi/NTMakefile
index 0e8d079..3756240 100644 (file)
--- a/src/WINNT/client_osi/NTMakefile
+++ b/src/WINNT/client_osi/NTMakefile
@@ -78,6 +78,7 @@ $(DLLFILE): $(DLLOBJS)
        $(DLLGUILINK) $(DLLLIBS) -def:libosi.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 
@@ -107,6 +108,7 @@ $(EXEOBJS) : osidebug.c
 $(EXEFILE) : $(EXEOBJS)
        $(EXEGUILINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # midl on dbrpc.idl

diff --git a/src/WINNT/eventlog/lang/NTMakefile b/src/WINNT/eventlog/lang/NTMakefile
index e711a3e..a982733 100644 (file)
--- a/src/WINNT/eventlog/lang/NTMakefile
+++ b/src/WINNT/eventlog/lang/NTMakefile
@@ -43,6 +43,7 @@ DLLOBJS = $(DLLRESFILE)
 $(DLLFILE): $(DLLOBJS)
        $(DLLRESLINK)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Generate versioninfo resources

diff --git a/src/WINNT/eventlog/test/NTMakefile b/src/WINNT/eventlog/test/NTMakefile
index 8639819..31bc52e 100644 (file)
--- a/src/WINNT/eventlog/test/NTMakefile
+++ b/src/WINNT/eventlog/test/NTMakefile
@@ -14,6 +14,7 @@ $(OUT)\elogtest.exe: $(OUT)\elogtest.obj \
        $(DESTDIR)\lib\afs\afseventlog.lib $(DESTDIR)\lib\afs\afsreg.lib
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index c987796..e6177eb 100644 (file)
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -23,6 +23,7 @@ $(OUT)\Service.res: Service.rc AFS_component_version_number.h
 $(EXEDIR)\Service.exe: $(OUT)\Service.obj $(OUT)\Service.res
       $(EXECONLINK) 
       $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\Killer.res: Killer.rc AFS_component_version_number.h
 
@@ -32,6 +33,7 @@ $(OUT)\Killer.obj: Killer.cpp
 $(EXEDIR)\Killer.exe: $(OUT)\Killer.obj $(OUT)\Killer.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\AdminGroup.res: AdminGroup.rc AFS_component_version_number.h
 
@@ -41,6 +43,7 @@ $(OUT)\AdminGroup.obj: AdminGroup.cpp
 $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 !IF ("$(AFSDEV_BUILDTYPE)"=="FREE")
 !IF ("$(CPU)" == "i386")
@@ -139,6 +142,7 @@ MSVCMSI=$(EXEDIR)\vcruntime.msi
 
 $(MSVCMSI): $(OUT)\vcruntime.wixobj
        light -out $@ $**
+       $(CODESIGN_USERLAND)
 
 $(OUT)\vcruntime.wixobj: vcruntime.wxs
        candle -out $@ $** -dPlatform=$(ARCH) -dConfig=Debug
@@ -149,10 +153,17 @@ MSVCMSI=
 
 runtime: $(MSVCMSI)
 
-build: prebuild
-   "$(NSISDIR)\makensis.exe" /DINCLUDEDIR=$(OUT) OpenAFS.nsi
+!if ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
+NSISEXE=$(DESTDIR)\WinInstall\OpenAFSforWindows-DEBUG.exe
+!else
+NSISEXE=$(DESTDIR)\WinInstall\OpenAFSforWindows.exe
+!endif
+
+$(NSISEXE): prebuild
+       "$(NSISDIR)\makensis.exe" /DINCLUDEDIR=$(OUT) OpenAFS.nsi
+       $(CODESIGN_USERLAND)
 
-install: $(OUT)\Service.obj $(EXEDIR)\Service.exe $(OUT)\Killer.obj $(EXEDIR)\Killer.exe $(EXEDIR)\AdminGroup.exe runtime build
+install: $(OUT)\Service.obj $(EXEDIR)\Service.exe $(OUT)\Killer.obj $(EXEDIR)\Killer.exe $(EXEDIR)\AdminGroup.exe runtime $(NSISEXE)
 
 clean::
    $(DEL) $(OUT)\Service.obj
@@ -168,8 +179,8 @@ clean::
    $(DEL) AFS_component_version_number.h
 #   $(DEL) $(EXEDIR)\Msvcr71.dll
 #   $(DEL) $(EXEDIR)\MFC42.DLL
-#   $(DEL) OpenAFSforWindows.exe
 !if ("$(AFSVER_CL)"=="1400") && ("$(AFSDEV_BUILDTYPE)"!="FREE")
    $(DEL) $(OUT)\vcruntime.wixobj
    $(DEL) $(MSVCMSI)
 !endif
+   $(DEL) $(NSISEXE)

diff --git a/src/WINNT/install/loopback/NTMakefile b/src/WINNT/install/loopback/NTMakefile
index 626d1ee..a14bce2 100644 (file)
--- a/src/WINNT/install/loopback/NTMakefile
+++ b/src/WINNT/install/loopback/NTMakefile
@@ -51,6 +51,7 @@ $(OUT)\wmi.obj: wmi.cpp
 $(DLLFILE): $(DLLOBJFILES) $(DLLRES)
        $(LINK) -DLL $(DLLEXPORTS) -OUT:$@ $** $(DLLLIBFILES)
         $(_VC_MANIFEST_EMBED_DLL)
+        $(CODESIGN_USERLAND)
 
 # instloop.exe
 
@@ -61,8 +62,9 @@ $(OUT)\instloop.obj: instloop.c
       $(STATICC2OBJ) -c -DUNICODE -D_UNICODE /Fo$@ $**
 
 $(EXEFILE): $(EXEOBJFILES) $(EXERES)
-      $(LINK) /OUT:$@ $** $(DLLLIBFILES)
-      $(_VC_MANIFEST_EMBED_EXE)
+        $(LINK) /OUT:$@ $** $(DLLLIBFILES)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 install:  $(DLLFILE) $(EXEFILE)
 

diff --git a/src/WINNT/install/wix/NTMakefile b/src/WINNT/install/wix/NTMakefile
index af5ba38..8ffc5d2 100644 (file)
--- a/src/WINNT/install/wix/NTMakefile
+++ b/src/WINNT/install/wix/NTMakefile
@@ -67,6 +67,7 @@ $(MSIFILE): $(WIXOBJ)
        light -nologo -out $(MSIFILE) \
                -loc lang\$(LANG)\strings.wxl \
                $(WIXOBJ)
+       $(CODESIGN_USERLAND)
        dir $(MSIFILE)
 
 $(WIXOBJ): openafs.wxs $(WIXINCLUDES)
@@ -103,6 +104,7 @@ $(BINMSIFILE): $(BINWIXOBJ)
        light -nologo -out $(BINMSIFILE) \
                -loc lang\en_US\strings.wxl \
                $(BINWIXOBJ)
+       $(CODESIGN_USERLAND)
        dir $(BINMSIFILE)
 !ENDIF
 
@@ -124,3 +126,6 @@ lang_clean:
        -$(DEL) $(BINWIXOBJ)
        -$(DEL) $(BINMSIFILE)
 !ENDIF
+
+
+

diff --git a/src/WINNT/install/wix/custom/NTMakefile b/src/WINNT/install/wix/custom/NTMakefile
index b8ca567..3b95644 100644 (file)
--- a/src/WINNT/install/wix/custom/NTMakefile
+++ b/src/WINNT/install/wix/custom/NTMakefile
@@ -36,6 +36,7 @@ $(DLLFILE): $(OUT)\afscustom.obj $(DLLRES)
        $(LINK) -DLL $(DLLEXPORTS) \
          -OUT:$@ $** $(DLLLIBFILES)
         $(_VC_MANIFEST_EMBED_DLL)
+        $(CODESIGN_USERLAND)
 
 install: $(DLLFILE)
 

diff --git a/src/WINNT/install/wix/uninstall/NTMakefile b/src/WINNT/install/wix/uninstall/NTMakefile
index ebfacc0..e70cfd1 100644 (file)
--- a/src/WINNT/install/wix/uninstall/NTMakefile
+++ b/src/WINNT/install/wix/uninstall/NTMakefile
@@ -19,9 +19,10 @@ $(OBJECTS): $$(@B).c
 $(OUT)\uninstall.res: uninstall.rc AFS_component_version_number.h
 
 $(UNINSTALL): $(OBJECTS) $(OUT)\uninstall.res
-  $(EXECONLINK) msi.lib
+        $(EXECONLINK) msi.lib
         $(_VC_MANIFEST_EMBED_EXE)
-  $(EXEPREP)
+        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 install: $(UNINSTALL)
 

diff --git a/src/WINNT/license/NTMakefile b/src/WINNT/license/NTMakefile
index 9bd99b2..739d327 100644 (file)
--- a/src/WINNT/license/NTMakefile
+++ b/src/WINNT/license/NTMakefile
@@ -32,6 +32,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXERES)
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 install : $(EXEFILE) lang

diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile
index 21a4e07..69be805 100644 (file)
--- a/src/WINNT/netidmgr_plugin/NTMakefile
+++ b/src/WINNT/netidmgr_plugin/NTMakefile
@@ -148,6 +148,7 @@ $(DLLFILE): $(OBJFILES) $(VERRESFILE)
        $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES)
        $(_VC_MANIFEST_EMBED_DLL)
        $(_VC_MANIFEST_CLEAN)
+        $(CODESIGN_USERLAND)
 
 dummy:
 

diff --git a/src/WINNT/pthread/NTMakefile b/src/WINNT/pthread/NTMakefile
index 9fd78a7..ab6a9ae 100644 (file)
--- a/src/WINNT/pthread/NTMakefile
+++ b/src/WINNT/pthread/NTMakefile
@@ -31,6 +31,7 @@ $(PTHR_DLLFILE): $(PTHR_DLLOBJS)
        $(DLLCONLINK) /DEF:pthread.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 install: $(PTHR_DLLFILE) $(LIBINCLUDES)
 

diff --git a/src/WINNT/pthread/test/NTMakefile b/src/WINNT/pthread/test/NTMakefile
index 849605a..265567d 100644 (file)
--- a/src/WINNT/pthread/test/NTMakefile
+++ b/src/WINNT/pthread/test/NTMakefile
@@ -14,14 +14,17 @@ test tests: ptest.exe tsd.exe native.exe
 $(OUT)\ptest.exe: $(OUT)\ptest.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\tsd.exe: $(OUT)\tsd.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\native.exe: $(OUT)\native.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 clean::
        $(DEL) $(DESTDIR)/lib/afspthread.lib

diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile
index 833a509..532e923 100644 (file)
--- a/src/auth/NTMakefile
+++ b/src/auth/NTMakefile
@@ -89,6 +89,7 @@ $(SETKEY_EXEFILE): $(SETKEY_EXEOBJS) $(EXELIBS)
        $(EXECONLINK) dnsapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 # build copyauth
 COPYAUTH_EXEFILE = $(DESTDIR)\etc\copyauth.exe
@@ -100,6 +101,7 @@ $(COPYAUTH_EXEFILE): $(COPYAUTH_EXEOBJS) $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 $(INCFILES):$$(@F)
         $(COPY)  $** $(INCFILEDIR)\.

diff --git a/src/auth/test/NTMakefile b/src/auth/test/NTMakefile
index e01757f..59ba59b 100644 (file)
--- a/src/auth/test/NTMakefile
+++ b/src/auth/test/NTMakefile
@@ -26,6 +26,7 @@ $(CELL_EXEFILE): $(CELL_EXEOBJS)  $(CELL_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 KTC_EXEFILE = $(OUT)\ktctest.exe
@@ -43,6 +44,7 @@ $(KTC_EXEFILE): $(KTC_EXEOBJS)  $(KTC_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 test tests: $(CELL_EXEFILE) $(KTC_EXEFILE)
 

diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile
index 0ed4e43..03c5167 100644 (file)
--- a/src/bozo/NTMakefile
+++ b/src/bozo/NTMakefile
@@ -74,7 +74,7 @@ $(BOSSERVER_EXEFILE): $(BOSSERVER_EXEOBJS) $(BOSSERVER_EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
-
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Build bos.exe
@@ -112,6 +112,7 @@ $(RS_BOS_EXEFILE): $(BOS_EXEOBJS) $(BOS_EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 $(CL_BOS_EXEFILE): $(RS_BOS_EXEFILE)
        $(COPY) $** $@

diff --git a/src/bu_utils/NTMakefile b/src/bu_utils/NTMakefile
index 557c582..b0fa48d 100644 (file)
--- a/src/bu_utils/NTMakefile
+++ b/src/bu_utils/NTMakefile
@@ -29,6 +29,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Definitions for generating versioninfo resources

diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile
index 76708fb..43a56e8 100644 (file)
--- a/src/bucoord/NTMakefile
+++ b/src/bucoord/NTMakefile
@@ -96,6 +96,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################

diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile
index d7d9f4a..48e794b 100644 (file)
--- a/src/budb/NTMakefile
+++ b/src/budb/NTMakefile
@@ -85,6 +85,7 @@ $(EXEFILE): $(EXEOBJS)  $(EXELIBS)
        $(EXECONLINK) dnsapi.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Definitions for generating versioninfo resources

diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile
index 478ed86..6ab9b79 100644 (file)
--- a/src/butc/NTMakefile
+++ b/src/butc/NTMakefile
@@ -62,6 +62,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Install target; primary makefile target
@@ -82,6 +83,7 @@ clean::
 $(OUT)\butc_test.exe: $(OUT)\test.obj
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/butm/NTMakefile b/src/butm/NTMakefile
index 870c010..d19860d 100644 (file)
--- a/src/butm/NTMakefile
+++ b/src/butm/NTMakefile
@@ -46,6 +46,7 @@ TESTLIBS = $(DESTDIR)\lib\afslwp.lib \
 $(OUT)\test_ftm.exe: $(OUT)\test_ftm.obj $(LIBFILE) $(TESTLIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/cmd/test/NTMakefile b/src/cmd/test/NTMakefile
index e791083..20b93f7 100644 (file)
--- a/src/cmd/test/NTMakefile
+++ b/src/cmd/test/NTMakefile
@@ -25,6 +25,7 @@ $(ITEST_EXEFILE): $(ITEST_EXEOBJS)
        $(EXECONLINK) $(EXELIBS)  
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 #build ctest.exe
 CTEST_EXEOBJS =\
@@ -36,6 +37,7 @@ $(CTEST_EXEFILE): $(CTEST_EXEOBJS)
        $(EXECONLINK) $(EXELIBS)  
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 # build dtest.exe
 DTEST_EXEOBJS =\
@@ -47,6 +49,7 @@ $(DTEST_EXEFILE): $(DTEST_EXEOBJS)
        $(EXECONLINK) $(EXELIBS)  
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 all: test
 

diff --git a/src/comerr/NTMakefile b/src/comerr/NTMakefile
index 15bf681..d2c8ba7 100644 (file)
--- a/src/comerr/NTMakefile
+++ b/src/comerr/NTMakefile
@@ -66,6 +66,7 @@ $(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_E
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ####################################################################
 install: prep $(INCFILES) $(COMERR_LIBFILE) $(COMPILE_ET_EXEFILE) 

diff --git a/src/comerr/test/NTMakefile b/src/comerr/test/NTMakefile
index 55e7e51..d138ef8 100644 (file)
--- a/src/comerr/test/NTMakefile
+++ b/src/comerr/test/NTMakefile
@@ -20,6 +20,7 @@ $(EXEFILE): $(EXEOBJS)  # dependents built from predefined inference rules
        $(EXECONLINK) $(EXELIBS) 
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 test1.c test1.h: test1.et 
        $(DEL) test1.c test1.h

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index 1a84a9c..e0fce46 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -508,14 +508,17 @@ $(INCTOOLS):$(OUT)\$$(@F)
 $(OUT)\mkvers.exe : $(OUT)\mkvers.obj
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\touch.exe : $(OUT)\touch.obj
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\util_cr.exe : $(OUT)\util_cr.obj
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 langsetup: $(DESTDIR)\bin\NTLang.bat
 

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index d9fa352..49b1c93 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -289,6 +289,13 @@ _VC_MANIFEST_EMBED_EXE=
 _VC_MANIFEST_EMBED_DLL=
 !ENDIF
 
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
+CODESIGN_USERLAND= signtool.exe sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
+        /t $(CODESIGN_TIMESTAMP) /v $@
+!ELSE
+CODESIGN_USERLAND=
+!ENDIF
+
 # Set compiler warning level
 
 !IFNDEF AFSDEV_WARNLEVEL

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 872a2c9..45b3a29 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -304,6 +304,13 @@ _VC_MANIFEST_EMBED_EXE=
 _VC_MANIFEST_EMBED_DLL=
 !ENDIF
 
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
+_CODESIGN_USERLAND= signtool.exe sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
+        /t $(CODESIGN_TIMESTAMP) /v $@
+!ELSE
+_CODESIGN_USERLAND=
+!ENDIF
+
 # Set compiler warning level
 
 !IFNDEF AFSDEV_WARNLEVEL

diff --git a/src/dir/test/NTMakefile b/src/dir/test/NTMakefile
index b0f93a0..12624bf 100644 (file)
--- a/src/dir/test/NTMakefile
+++ b/src/dir/test/NTMakefile
@@ -13,6 +13,7 @@ tests: $(OUT)\dtest.exe
 $(OUT)\dtest.exe: $(OUT)\dtest.obj $(DESTDIR)\lib\afs\afsdir.lib
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/finale/NTMakefile b/src/finale/NTMakefile
index acce99f..b89cceb 100644 (file)
--- a/src/finale/NTMakefile
+++ b/src/finale/NTMakefile
@@ -27,7 +27,7 @@ $(TRANSLATE_ET_EXEFILE): $(TRANSLATE_ET_EXEOBJS) $(TRANSLATE_ET_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
-
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Definitions for generating versioninfo resources

diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile
index e915961..75a1bc9 100644 (file)
--- a/src/kauth/NTMakefile
+++ b/src/kauth/NTMakefile
@@ -129,6 +129,7 @@ $(KASERVER): $(KASERVER_OBJS) $(AFSLIBS) $(KASERVER_EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 #build $(OUT)\kadatabase.obj
 
@@ -154,6 +155,7 @@ $(KAS): $(KAS_OBJS) $(AFSLIBS) $(KAUTH_LIBFILE) $(TOKENLIB)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ########### Misc Exes #######################################################
 #kpasswd.exe
@@ -168,21 +170,25 @@ $(KPASSWD_EXEFILE): $(KPASSWD_OBJS) $(AFSLIBS) $(KAUTH_LIBFILE) $(TOKENLIB)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 #kpwvalid.exe
 $(OUT)\kpwvalid.exe: $(OUT)\kpwvalid.obj $(AFSLIBS) $(KAUTH_LIBFILE)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 #kdb.exe - Not implemented for NT - because dbm not available on NT
 #kdb.exe: $(OUT)\kdb.obj $(AFSLIBS) $(KAUTH_LIBFILE) 
 #      $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
 #       $(_VC_MANIFEST_EMBED_EXE)
+#        $(CODESIGN_USERLAND)
 
 #rebuild.exe 
 $(OUT)\rebuild.exe: $(OUT)\rebuild.obj $(OUT)\kautils.obj $(AFSLIBS) 
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Definitions for generating versioninfo resources

diff --git a/src/kauth/test/NTMakefile b/src/kauth/test/NTMakefile
index 81541a6..d976faf 100644 (file)
--- a/src/kauth/test/NTMakefile
+++ b/src/kauth/test/NTMakefile
@@ -25,34 +25,42 @@ EXELIBS = \
 $(OUT)\multiklog.exe: $(OUT)\multiklog.obj
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\test_date.exe: $(OUT)\test_date.obj
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\test_badtix.exe: $(OUT)\test_badtix.obj
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\decode_ticket.exe: $(OUT)\decode_ticket.obj
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\test_interim_ktc.exe: $(OUT)\test_interim_ktc.obj
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\test_rxkad_free: test_rxkad_free.o 
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\test_getticket.exe: $(OUT)\test_getticket.obj
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\background.exe: $(OUT)\background.obj
        $(EXECONLINK) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 
 test tests all: $(OUT)\multiklog.exe $(OUT)\test_date.exe $(OUT)\test_badtix.exe $(OUT)\decode_ticket.exe \

diff --git a/src/libadmin/adminutil/NTMakefile b/src/libadmin/adminutil/NTMakefile
index a4ee909..d6b085e 100644 (file)
--- a/src/libadmin/adminutil/NTMakefile
+++ b/src/libadmin/adminutil/NTMakefile
@@ -146,6 +146,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:afsadminutil.def shell32.lib
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/bos/NTMakefile b/src/libadmin/bos/NTMakefile
index 24fa6be..d3e9d06 100644 (file)
--- a/src/libadmin/bos/NTMakefile
+++ b/src/libadmin/bos/NTMakefile
@@ -45,6 +45,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:bosadmin.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/cfg/NTMakefile b/src/libadmin/cfg/NTMakefile
index d780e3f..0867464 100644 (file)
--- a/src/libadmin/cfg/NTMakefile
+++ b/src/libadmin/cfg/NTMakefile
@@ -62,6 +62,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:afscfgadmin.def shell32.lib
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/cfg/test/NTMakefile b/src/libadmin/cfg/test/NTMakefile
index fd0bebd..7772f2e 100644 (file)
--- a/src/libadmin/cfg/test/NTMakefile
+++ b/src/libadmin/cfg/test/NTMakefile
@@ -23,6 +23,7 @@ CFGTEST_EXELIBS =\
 $(OUT)\cfgtest.exe: $(OUT)\cfgtest.obj $(CFGTEST_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/libadmin/client/NTMakefile b/src/libadmin/client/NTMakefile
index f32f92f..2a7f0fd 100644 (file)
--- a/src/libadmin/client/NTMakefile
+++ b/src/libadmin/client/NTMakefile
@@ -33,6 +33,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:clientadmin.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/kas/NTMakefile b/src/libadmin/kas/NTMakefile
index 7af8c27..e138b6d 100644 (file)
--- a/src/libadmin/kas/NTMakefile
+++ b/src/libadmin/kas/NTMakefile
@@ -42,6 +42,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:kasadmin.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/pts/NTMakefile b/src/libadmin/pts/NTMakefile
index 15883fc..1459860 100644 (file)
--- a/src/libadmin/pts/NTMakefile
+++ b/src/libadmin/pts/NTMakefile
@@ -45,6 +45,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:ptsadmin.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/test/NTMakefile b/src/libadmin/test/NTMakefile
index af61254..9f05d6f 100644 (file)
--- a/src/libadmin/test/NTMakefile
+++ b/src/libadmin/test/NTMakefile
@@ -36,6 +36,7 @@ AFSCP_EXEOBJS =\
 $(OUT)\afscp.exe: $(OUT)\afscp.obj $(AFSCP_EXEOBJS) $(AFSCP_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/libadmin/vos/NTMakefile b/src/libadmin/vos/NTMakefile
index db91912..28bf596 100644 (file)
--- a/src/libadmin/vos/NTMakefile
+++ b/src/libadmin/vos/NTMakefile
@@ -66,12 +66,10 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:vosadmin.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 
-
-
-
 install: $(DLLFILE) $(LIBINCLUDES)
 
 $(RXOBJS): $(RX)\$$(@B).c

diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile
index f92b1a8..576e1ce 100644 (file)
--- a/src/libafsauthent/NTMakefile
+++ b/src/libafsauthent/NTMakefile
@@ -148,6 +148,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(RXOBJS)
        $(DLLCONLINK) /DEF:afsauthent.def rpcrt4.lib dnsapi.lib mpr.lib secur32.lib shell32.lib
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 # Definitions for generating versioninfo resources
 $(OUT)\afsauthent.res: AFS_component_version_number.h

diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile
index 5fb24a5..f8d8edb 100644 (file)
--- a/src/libafsrpc/NTMakefile
+++ b/src/libafsrpc/NTMakefile
@@ -98,6 +98,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:afsrpc.def iphlpapi.lib
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 # Definitions for generating versioninfo resources
 $(OUT)\afsrpc.res: AFS_component_version_number.h

diff --git a/src/lwp/NTMakefile b/src/lwp/NTMakefile
index a23439e..ce34bfd 100644 (file)
--- a/src/lwp/NTMakefile
+++ b/src/lwp/NTMakefile
@@ -45,6 +45,7 @@ tests: $(OUT)\rw.exe
 $(OUT)\rw.exe: $(OUT)\rw.obj $(LIBFILE) $(DESTDIR)\lib\afs\afsutil.lib
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 clean::
        $(DEL) $(LIBFILE)

diff --git a/src/lwp/test/NTMakefile b/src/lwp/test/NTMakefile
index 7ebcc36..04bd561 100644 (file)
--- a/src/lwp/test/NTMakefile
+++ b/src/lwp/test/NTMakefile
@@ -18,7 +18,7 @@ TESTKEY = $(OUT)\testkey.exe
 $(OUT)\testkey.exe: $(OUT)\test_key.obj $(LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
-
+        $(CODESIGN_USERLAND)
 
 # test targets
 test testkey: $(TESTKEY)

diff --git a/src/procmgmt/NTMakefile b/src/procmgmt/NTMakefile
index 6fd8367..1bab98d 100644 (file)
--- a/src/procmgmt/NTMakefile
+++ b/src/procmgmt/NTMakefile
@@ -37,6 +37,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLRES) $(DLLLIBS)
        $(DLLCONLINK) /DEF:afsprocmgmt.def
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 
@@ -57,6 +58,7 @@ $(RS_KILL_EXEFILE): $(KILL_EXEOBJS)   $(KILL_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 $(CL_KILL_EXEFILE): $(RS_KILL_EXEFILE)
        $(COPY) $** $@

diff --git a/src/procmgmt/test/NTMakefile b/src/procmgmt/test/NTMakefile
index c218d82..7a6ea86 100644 (file)
--- a/src/procmgmt/test/NTMakefile
+++ b/src/procmgmt/test/NTMakefile
@@ -18,6 +18,7 @@ PMGTTEST_EXELIBS =\
 $(OUT)\pmgttest.exe: $(OUT)\pmgttest.obj $(PMGTTEST_EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile
index a3f5471..3a50501 100644 (file)
--- a/src/ptserver/NTMakefile
+++ b/src/ptserver/NTMakefile
@@ -80,8 +80,7 @@ $(PTSERVER): $(PTSERVER_EXEOBJS) $(RXKADOBJS) $(PTSERVER_EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
-
-
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # build pts.exe
@@ -119,12 +118,13 @@ $(PTS): $(PTS_EXEOBJS) $(PTS_EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 $(PTCLIENT): $(PTCLIENT_EXEOBJS) $(PTS_EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
-
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################
@@ -215,18 +215,22 @@ TEST_LIBS = $(PTS_EXELIBS)
 $(OUT)\readgroup.exe: $(OUT)\readgroup.obj $(LIBFILE) $(TEST_LIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\readpwd.exe: $(OUT)\readpwd.obj $(LIBFILE) $(TEST_LIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\testpt.exe: $(OUT)\testpt.obj $(LIBFILE) $(TEST_LIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\db_verify.exe: $(OUT)\db_verify.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/rx/test/NTMakefile b/src/rx/test/NTMakefile
index 27ea3ba..c182408 100644 (file)
--- a/src/rx/test/NTMakefile
+++ b/src/rx/test/NTMakefile
@@ -25,18 +25,22 @@ tests: $(OUT)\testclient.exe $(OUT)\testserver.exe $(OUT)\tableGen.exe $(OUT)\ge
 $(OUT)\testclient.exe: $(OUT)\testclient.obj $(LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\testserver.exe: $(OUT)\testserver.obj $(LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\tableGen.exe: $(OUT)\tableGen.obj $(LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\generator.exe: $(OUT)\generator.obj $(LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(RXTESTOBJS): ..\rx_clock.h ..\rx_queue.h ..\rx_event.h ..\rx.h
 

diff --git a/src/rxdebug/NTMakefile b/src/rxdebug/NTMakefile
index 6d87004..b747485 100644 (file)
--- a/src/rxdebug/NTMakefile
+++ b/src/rxdebug/NTMakefile
@@ -35,6 +35,7 @@ $(RXDEBUG): $(RXDOBJS) $(RXDLIBS)
        $(EXECONLINK) iphlpapi.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 install: $(RXDEBUG)
 

diff --git a/src/rxgen/NTMakefile b/src/rxgen/NTMakefile
index 3a36337..e5a390c 100644 (file)
--- a/src/rxgen/NTMakefile
+++ b/src/rxgen/NTMakefile
@@ -38,8 +38,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
-
-
+        $(CODESIGN_USERLAND)
 
 install: AFS_component_version_number.c $(EXEFILE) $(INCFILES)
 

diff --git a/src/rxkad/test/NTMakefile b/src/rxkad/test/NTMakefile
index 4a94a2d..40dcad8 100644 (file)
--- a/src/rxkad/test/NTMakefile
+++ b/src/rxkad/test/NTMakefile
@@ -37,6 +37,7 @@ $(EXEFILE): $(EXEOBJS)
        $(EXECONLINK) $(EXELIBS) 
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################

diff --git a/src/shlibafsauthent/NTMakefile b/src/shlibafsauthent/NTMakefile
index c4f179e..54c2567 100644 (file)
--- a/src/shlibafsauthent/NTMakefile
+++ b/src/shlibafsauthent/NTMakefile
@@ -223,6 +223,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:afsauthent.def rpcrt4.lib
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
 
 # Definitions for generating versioninfo resources
 afsauthent.res: afsauthent.rc AFS_component_version_number.h

diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index d915bcd..2f8f350 100644 (file)
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -120,6 +120,7 @@ $(BUTCEXE): $(BUTCOBJS) $(BUTCRES) $(BUTCLIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 .c.$(OUT)\obj:
        $(C2OBJ) -I$(BUCOORD) $<

diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile
index 67420a9..5acfd10 100644 (file)
--- a/src/tviced/NTMakefile
+++ b/src/tviced/NTMakefile
@@ -110,6 +110,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 install:  $(EXEFILE)
 

diff --git a/src/tvolser/NTMakefile b/src/tvolser/NTMakefile
index 87b2852..64bcb2d 100644 (file)
--- a/src/tvolser/NTMakefile
+++ b/src/tvolser/NTMakefile
@@ -74,6 +74,7 @@ $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 $(VOLSEROBJS): $(VOLSER)\$$(@B).c
         $(C2OBJ) -I$(VOLSER) -I$(UTIL) $**

diff --git a/src/ubik/NTMakefile b/src/ubik/NTMakefile
index 59699f0..ac1a40c 100644 (file)
--- a/src/ubik/NTMakefile
+++ b/src/ubik/NTMakefile
@@ -71,6 +71,7 @@ $(RS_UDBG_EXEFILE): $(UDBG_EXEOBJS) $(UDBG_EXELIBS)
        $(EXECONLINK) iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)  
+        $(CODESIGN_USERLAND)
 
 $(CL_UDBG_EXEFILE): $(RS_UDBG_EXEFILE)
        $(COPY) $** $@
@@ -127,10 +128,12 @@ test tests: utst_server utst_client $(EXEFILE)
 utst_server: $(OUT)\utst_server.obj $(OUT)\utst_int.ss.obj $(OUT)\utst_int.xdr.obj  $(EXELIBS)
        $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
        
 utst_client: $(OUT)\utst_client.obj $(OUT)\utst_int.cs.obj $(OUT)\utst_int.xdr.obj $(EXELIBS)
        $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
        
 # rxgen on utst_int.xg
 utst_int.ss.c utst_int.cs.c utst_int.xdr.c utst_int.h: utst_int.xg

diff --git a/src/update/NTMakefile b/src/update/NTMakefile
index f11ca9d..942a356 100644 (file)
--- a/src/update/NTMakefile
+++ b/src/update/NTMakefile
@@ -54,6 +54,7 @@ $(UPSERVER):  $(USVR_OBJS) $(LIBS)
        $(EXECONLINK) dnsapi.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # upclient
@@ -70,6 +71,7 @@ $(UPCLIENT):  $(UCLNT_OBJS)  $(LIBS)
        $(EXECONLINK) dnsapi.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # generate versioninfo resources

diff --git a/src/usd/test/NTMakefile b/src/usd/test/NTMakefile
index 98f0daa..5cd8993 100644 (file)
--- a/src/usd/test/NTMakefile
+++ b/src/usd/test/NTMakefile
@@ -20,6 +20,7 @@ test tests: usd_test.exe
 $(OUT)\usd_test.exe: $(OUT)\usd_test.obj $(LIBFILE) $(LIBUTIL)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/util/test/NTMakefile b/src/util/test/NTMakefile
index c5fa726..2c0d0eb 100644 (file)
--- a/src/util/test/NTMakefile
+++ b/src/util/test/NTMakefile
@@ -16,6 +16,7 @@ LIBS =\
 $(OUT)\dirpath_test.exe: $(OUT)\dirpath_test.obj $(LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 test tests: $(OUT)\dirpath_test.exe
 

diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile
index 9bd4c1f..7ec7a66 100644 (file)
--- a/src/viced/NTMakefile
+++ b/src/viced/NTMakefile
@@ -64,6 +64,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Build cbd - not generally distributed debugging program
@@ -77,6 +78,7 @@ $(OUT)\cbd.obj: callback.c AFS_component_version_number.h
 $(CBD): $(OUT)\cbd.obj $(CBDRES)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # generate versioninfo resources

diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile
index c1654d7..faf11b1 100644 (file)
--- a/src/vlserver/NTMakefile
+++ b/src/vlserver/NTMakefile
@@ -95,6 +95,7 @@ $(VLSERVER): $(VLSERVER_EXEOBJS) $(LIBFILE) $(VLSERVER_EXECLIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # generate versioninfo resources
@@ -123,9 +124,11 @@ $(INCFILEDIR)\vldbint.h: vldbint.h
 # Definitions for generating files via COMPILE_ET
 # Need an explicit copy here, since we've fussed with the general rule.
 
-$(INCFILEDIR)\vlserver.h vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
+vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
        $(DEL) vlserver.h vl_errors.c
        $(COMPILE_ET) vl_errors  -h vlserver
+
+$(INCFILEDIR)\vlserver.h: vlserver.h
        $(COPY) vlserver.h $(INCFILEDIR)\vlserver.h
 
 ############################################################################
@@ -140,6 +143,7 @@ VLDB_CHECK_LIBS =\
 $(OUT)\vldb_check.exe: $(OUT)\vldb_check.obj $(VLDB_CHECK_LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # build local vlclient
@@ -150,6 +154,7 @@ VLCLIENT_LIBS = \
 $(OUT)\vlclient.exe: $(OUT)\vlclient.obj  $(LIBFILE) $(VLSERVER_EXECLIBS) $(VLCLIENT_LIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################

diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile
index b0a3469..5b0d0a9 100644 (file)
--- a/src/vol/NTMakefile
+++ b/src/vol/NTMakefile
@@ -88,6 +88,7 @@ $(SALVAGER): $(SALVAGER_EXEOBJS) $(EXEC_LIBS)
        $(EXECONLINK) shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################
@@ -103,6 +104,7 @@ $(FSSYNC_DEBUG): $(FSSYNC_DEBUG_EXEOBJS) $(EXEC_LIBS)
        $(EXECONLINK) shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # build volinfo
@@ -112,6 +114,7 @@ $(VOLINFO): $(OUT)\vol-info.obj $(OUT)\physio.obj $(OUT)\volinfo.res $(EXEC_LIBS
        $(EXECONLINK) shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # build volinfo
@@ -121,6 +124,7 @@ $(VOLBLESS): $(OUT)\vol-bless.obj $(OUT)\physio.obj $(OUT)\vol-bless.res $(EXEC_
        $(EXECONLINK) shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # generate versioninfo resources

diff --git a/src/vol/test/NTMakefile b/src/vol/test/NTMakefile
index 482e4b0..8f1b31e 100644 (file)
--- a/src/vol/test/NTMakefile
+++ b/src/vol/test/NTMakefile
@@ -29,6 +29,7 @@ ILIST = $(OUT)\ilist.exe
 $(ILIST): $(OUT)\ilist_nt.obj $(EXEC_LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################
@@ -38,6 +39,7 @@ LTLIST = $(OUT)\ltlist.exe
 $(LTLIST): $(OUT)\ltlist.obj $(EXEC_LIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir:
        

diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile
index f797aaf..2b1e6fa 100644 (file)
--- a/src/volser/NTMakefile
+++ b/src/volser/NTMakefile
@@ -101,6 +101,7 @@ $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXEC_LIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # Build vos
@@ -127,6 +128,7 @@ $(RS_VOS_EXEFILE): $(VOS_EXEOBJS) $(VOS_EXELIBS) $(EXEC_LIBS)
        $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 $(CL_VOS_EXEFILE): $(RS_VOS_EXEFILE)
        $(COPY)  $** $@

diff --git a/src/xstat/NTMakefile b/src/xstat/NTMakefile
index c76bf47..def1af4 100644 (file)
--- a/src/xstat/NTMakefile
+++ b/src/xstat/NTMakefile
@@ -51,6 +51,7 @@ $(BINDIR)\xstat_fs_test.exe: $(OUT)\xstat_fs_test.obj $(LIBDIR)\afs_xstat_fs.lib
        $(EXECONLINK) rpcrt4.lib
        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 #
 # Cache Manager data collection
@@ -64,6 +65,7 @@ $(BINDIR)\xstat_cm_test.exe: $(OUT)\xstat_cm_test.obj $(LIBDIR)\afs_xstat_cm.lib
        $(EXECONLINK) 
        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 #
 # Misc targets