From: Jeffrey Altman Date: Wed, 19 Aug 2009 12:04:30 +0000 (-0400) Subject: Windows: Permit build system to update symbol store X-Git-Tag: openafs-devel-1_5_62~38 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1c12747818d1bbd327f94ba66808f5d705f8b618;p=packages%2Fo%2Fopenafs.git Windows: Permit build system to update symbol store Microsoft Debugging Tools for Windows, Visual Studio Debugger, and SysInternals tools can all make use of a Symbol Server. http://msdn.microsoft.com/en-us/magazine/cc163563.aspx The commit adds functionality to the build system to automatically add binaries and symbols to a symbol store during the build. This functionality is only enabled if two environment variables are defined: SYMSTORE_EXE - specifies the location of symstore.exe SYMSTORE_ROOT - specifies the location of the symbol store an optional environment variable permits an arbitrary comment to be added to the symbol store history file. SYMSTORE_COMMENT - arbitrary text to be added to the history LICENSE MIT Reviewed-on: http://gerrit.openafs.org/324 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- diff --git a/src/WINNT/afs_setup_utils/NTMakefile b/src/WINNT/afs_setup_utils/NTMakefile index c59651848..2b13bbb14 100644 --- a/src/WINNT/afs_setup_utils/NTMakefile +++ b/src/WINNT/afs_setup_utils/NTMakefile @@ -84,6 +84,7 @@ $(AFSRM_EXEFILE): $(AFSRM_EXEOBJS) $(AFSRM_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ @@ -134,6 +135,7 @@ $(INSTALL_UTILS_DLLFILE) : $(OUT)\afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp @@ -142,6 +144,7 @@ $(SERVER_UNINST_DLLFILE) : $(OUT)\s_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp @@ -150,6 +153,7 @@ $(CLIENT_UNINST_DLLFILE) : $(OUT)\c_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp @@ -158,6 +162,7 @@ $(CC_UNINST_DLLFILE) : $(OUT)\cc_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp @@ -166,6 +171,7 @@ $(LIGHT_CLIENT_UNINST_DLLFILE) : $(OUT)\lc_afs_setup_utils.obj $(DLLOBJS) $(DLLL $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp @@ -174,6 +180,7 @@ $(DOCS_UNINST_DLLFILE) : $(OUT)\d_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(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 e530924e0..14d91bb04 100644 --- a/src/WINNT/afs_setup_utils/lang/NTMakefile +++ b/src/WINNT/afs_setup_utils/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/afsadmsvr/NTMakefile b/src/WINNT/afsadmsvr/NTMakefile index fc96a42db..d0115c5f8 100644 --- a/src/WINNT/afsadmsvr/NTMakefile +++ b/src/WINNT/afsadmsvr/NTMakefile @@ -147,6 +147,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXERES) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : \ $(IDLFILES) \ diff --git a/src/WINNT/afsapplib/NTMakefile b/src/WINNT/afsapplib/NTMakefile index 5aef917b2..d9835b1b1 100644 --- a/src/WINNT/afsapplib/NTMakefile +++ b/src/WINNT/afsapplib/NTMakefile @@ -130,6 +130,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/WINNT/afsapplib/lang/NTMakefile b/src/WINNT/afsapplib/lang/NTMakefile index c9f9703ba..f73fe560e 100644 --- a/src/WINNT/afsapplib/lang/NTMakefile +++ b/src/WINNT/afsapplib/lang/NTMakefile @@ -47,6 +47,7 @@ $(DLLFILE) : $(DLLOBJS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/afsapplib/test/NTMakefile b/src/WINNT/afsapplib/test/NTMakefile index b141e9e24..d390a54da 100644 --- a/src/WINNT/afsapplib/test/NTMakefile +++ b/src/WINNT/afsapplib/test/NTMakefile @@ -41,6 +41,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) test : $(EXEFILE) diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile index 0e728b4d2..3097fbb00 100644 --- a/src/WINNT/afsd/NTMakefile +++ b/src/WINNT/afsd/NTMakefile @@ -213,6 +213,7 @@ $(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def libafsconf.def $(DEL) $*.exp @@ -279,6 +280,7 @@ $(LOGON_DLLFILE): $(LOGON_DLLOBJS) $(LOGON_DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(COPY) $*.lib $(DESTDIR)\lib $(DEL) $*.lib $*.exp @@ -355,6 +357,7 @@ $(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # tokens.exe $(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res $(EXELIBS) @@ -362,6 +365,7 @@ $(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # unlog.exe $(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res $(EXELIBS) @@ -369,6 +373,7 @@ $(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # afscpcc.exe $(EXEDIR)\afscpcc.exe: $(OUT)\afscpcc.obj $(OUT)\afscpcc.res $(LOGON_DLLLIBS) @@ -376,6 +381,7 @@ $(EXEDIR)\afscpcc.exe: $(OUT)\afscpcc.obj $(OUT)\afscpcc.res $(LOGON_DLLLIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # afsd.exe @@ -412,6 +418,7 @@ $(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res $(RXOBJS) $(AFSD_E $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # afsd_service.exe $(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_service.res $(RXOBJS) $(AFSD_EXELIBS) @@ -419,6 +426,7 @@ $(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_serv $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # fs.exe $(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res $(EXELIBS) @@ -426,6 +434,7 @@ $(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # cmdebug.exe $(EXEDIR)\cmdebug.exe: $(CMDBGOBJS) $(OUT)\cmdebug.res $(EXELIBS2) @@ -433,6 +442,7 @@ $(EXEDIR)\cmdebug.exe: $(CMDBGOBJS) $(OUT)\cmdebug.res $(EXELIBS2) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # symlink.exe $(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res $(EXELIBS) @@ -440,6 +450,7 @@ $(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # afsshare.exe $(EXEDIR)\afsshare.exe: $(OUT)\afsshare.obj $(OUT)\afsshare.res $(EXELIBS) @@ -447,6 +458,7 @@ $(EXEDIR)\afsshare.exe: $(OUT)\afsshare.obj $(OUT)\afsshare.res $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # afsdacl.exe $(EXEDIR)\afsdacl.exe: $(OUT)\afsdacl.obj $(OUT)\afsdacl.res @@ -454,6 +466,7 @@ $(EXEDIR)\afsdacl.exe: $(OUT)\afsdacl.obj $(OUT)\afsdacl.res $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # 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 @@ -495,6 +508,7 @@ $(DESTDIR)\bin\kpasswd.exe: $(KPASSWD_OBJS) $(KPASSWD_LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ diff --git a/src/WINNT/afslegal/NTMakefile b/src/WINNT/afslegal/NTMakefile index 4dc70d433..d33f51813 100644 --- a/src/WINNT/afslegal/NTMakefile +++ b/src/WINNT/afslegal/NTMakefile @@ -31,6 +31,7 @@ $(EXEFILE) : $(EXEOBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ install : $(EXEFILE) lang diff --git a/src/WINNT/afslegal/lang/NTMakefile b/src/WINNT/afslegal/lang/NTMakefile index d8cdfd18f..e73d97300 100644 --- a/src/WINNT/afslegal/lang/NTMakefile +++ b/src/WINNT/afslegal/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/afsreg/test/NTMakefile b/src/WINNT/afsreg/test/NTMakefile index 9357dfa7a..299aa9646 100644 --- a/src/WINNT/afsreg/test/NTMakefile +++ b/src/WINNT/afsreg/test/NTMakefile @@ -14,11 +14,13 @@ $(OUT)\getifinfo.exe: $(OUT)\getifinfo.obj $(DESTDIR)\lib\afs\afsreg.lib $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\dupkey.exe: $(OUT)\dupkey.obj $(DESTDIR)\lib\afs\afsreg.lib $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) REGMAN_EXELIBS =\ $(DESTDIR)\lib\afs\afsreg.lib \ @@ -30,6 +32,7 @@ $(OUT)\regman.exe: $(OUT)\regman.obj $(REGMAN_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/WINNT/afssvrcfg/NTMakefile b/src/WINNT/afssvrcfg/NTMakefile index 56f289ca7..3472275cc 100644 --- a/src/WINNT/afssvrcfg/NTMakefile +++ b/src/WINNT/afssvrcfg/NTMakefile @@ -66,6 +66,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ diff --git a/src/WINNT/afssvrcfg/lang/NTMakefile b/src/WINNT/afssvrcfg/lang/NTMakefile index b6ff9b4cd..79c970874 100644 --- a/src/WINNT/afssvrcfg/lang/NTMakefile +++ b/src/WINNT/afssvrcfg/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/afssvrcpa/NTMakefile b/src/WINNT/afssvrcpa/NTMakefile index b36956cb2..cbbdba4ab 100644 --- a/src/WINNT/afssvrcpa/NTMakefile +++ b/src/WINNT/afssvrcpa/NTMakefile @@ -31,6 +31,7 @@ $(DLLFILE): $(DLLOBJS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ diff --git a/src/WINNT/afssvrcpa/lang/NTMakefile b/src/WINNT/afssvrcpa/lang/NTMakefile index 67e34810e..db86d20d9 100644 --- a/src/WINNT/afssvrcpa/lang/NTMakefile +++ b/src/WINNT/afssvrcpa/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/afssvrmgr/NTMakefile b/src/WINNT/afssvrmgr/NTMakefile index 6d71230f8..a6c7e735f 100644 --- a/src/WINNT/afssvrmgr/NTMakefile +++ b/src/WINNT/afssvrmgr/NTMakefile @@ -109,6 +109,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) lang :: $(CD) lang diff --git a/src/WINNT/afssvrmgr/lang/NTMakefile b/src/WINNT/afssvrmgr/lang/NTMakefile index 995799dae..80fc488d1 100644 --- a/src/WINNT/afssvrmgr/lang/NTMakefile +++ b/src/WINNT/afssvrmgr/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/afsusrmgr/NTMakefile b/src/WINNT/afsusrmgr/NTMakefile index 4c86dabec..068adffc5 100644 --- a/src/WINNT/afsusrmgr/NTMakefile +++ b/src/WINNT/afsusrmgr/NTMakefile @@ -80,6 +80,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) lang :: $(CD) lang diff --git a/src/WINNT/afsusrmgr/lang/NTMakefile b/src/WINNT/afsusrmgr/lang/NTMakefile index 2f0fe7905..2df26aafa 100644 --- a/src/WINNT/afsusrmgr/lang/NTMakefile +++ b/src/WINNT/afsusrmgr/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile index c8a0ac0d9..ed93308e8 100644 --- a/src/WINNT/aklog/NTMakefile +++ b/src/WINNT/aklog/NTMakefile @@ -63,12 +63,14 @@ $(AKLOG) : $(AKLOGOBJS) $(EXELIBS) $(OUT)\aklog.res $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(ASETKEY) : $(ASETKEYOBJS) $(EXELIBS) $(OUT)\asetkey.res $(EXECONLINK) $(EXELIBS) $(OTHERLIBS) $(LINKOPTS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(COPYHEADERS) $(AKLOG) $(ASETKEY) diff --git a/src/WINNT/bosctlsvc/NTMakefile b/src/WINNT/bosctlsvc/NTMakefile index ff1121190..2e4f4a0af 100644 --- a/src/WINNT/bosctlsvc/NTMakefile +++ b/src/WINNT/bosctlsvc/NTMakefile @@ -35,6 +35,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Definitions for generating versioninfo resource via RC diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile index 34a337501..654482da1 100644 --- a/src/WINNT/client_config/NTMakefile +++ b/src/WINNT/client_config/NTMakefile @@ -117,6 +117,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXEOBJSc) $(EXERES) $(AFSDOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(COPYHEADERS) $(EXEFILE) lang diff --git a/src/WINNT/client_config/lang/NTMakefile b/src/WINNT/client_config/lang/NTMakefile index 7681cbc27..5e70ebb2b 100644 --- a/src/WINNT/client_config/lang/NTMakefile +++ b/src/WINNT/client_config/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/client_cpa/NTMakefile b/src/WINNT/client_cpa/NTMakefile index fea1c77c4..0c1bbe74b 100644 --- a/src/WINNT/client_cpa/NTMakefile +++ b/src/WINNT/client_cpa/NTMakefile @@ -31,6 +31,7 @@ $(DLLFILE): $(DLLOBJS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ diff --git a/src/WINNT/client_cpa/lang/NTMakefile b/src/WINNT/client_cpa/lang/NTMakefile index ac0180246..452cd3403 100644 --- a/src/WINNT/client_cpa/lang/NTMakefile +++ b/src/WINNT/client_cpa/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile index 75c5fb981..f68046e30 100644 --- a/src/WINNT/client_creds/NTMakefile +++ b/src/WINNT/client_creds/NTMakefile @@ -109,6 +109,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXECOBJS) $(EXERES) $(AFSDOBJS) $(CLIENTOBJS) $(EXELIB $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(COPYHEADERS) $(EXEFILE) lang diff --git a/src/WINNT/client_creds/lang/NTMakefile b/src/WINNT/client_creds/lang/NTMakefile index 07dcacc84..1d80bb0e0 100644 --- a/src/WINNT/client_creds/lang/NTMakefile +++ b/src/WINNT/client_creds/lang/NTMakefile @@ -45,6 +45,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install : $(DLLFILE) diff --git a/src/WINNT/client_exp/NTMakefile b/src/WINNT/client_exp/NTMakefile index 74ec970cd..934a5efb8 100644 --- a/src/WINNT/client_exp/NTMakefile +++ b/src/WINNT/client_exp/NTMakefile @@ -69,6 +69,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Definitions for generating versioninfo resources diff --git a/src/WINNT/client_osi/NTMakefile b/src/WINNT/client_osi/NTMakefile index 1f0524aac..0aed23100 100644 --- a/src/WINNT/client_osi/NTMakefile +++ b/src/WINNT/client_osi/NTMakefile @@ -79,6 +79,7 @@ $(DLLFILE): $(DLLOBJS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def libosi.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp @@ -110,6 +111,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXEGUILINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # midl on dbrpc.idl diff --git a/src/WINNT/eventlog/lang/NTMakefile b/src/WINNT/eventlog/lang/NTMakefile index a98273325..953982a57 100644 --- a/src/WINNT/eventlog/lang/NTMakefile +++ b/src/WINNT/eventlog/lang/NTMakefile @@ -44,6 +44,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLRESLINK) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Generate versioninfo resources diff --git a/src/WINNT/eventlog/test/NTMakefile b/src/WINNT/eventlog/test/NTMakefile index 31bc52ed5..dc978025f 100644 --- a/src/WINNT/eventlog/test/NTMakefile +++ b/src/WINNT/eventlog/test/NTMakefile @@ -15,6 +15,7 @@ $(OUT)\elogtest.exe: $(OUT)\elogtest.obj \ $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile index b13ac7fed..2b1c12adf 100644 --- a/src/WINNT/install/NSIS/NTMakefile +++ b/src/WINNT/install/NSIS/NTMakefile @@ -26,6 +26,7 @@ $(EXEDIR)\Service.exe: $(OUT)\Service.obj $(OUT)\Service.res $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\Killer.res: Killer.rc AFS_component_version_number.h @@ -36,6 +37,7 @@ $(EXEDIR)\Killer.exe: $(OUT)\Killer.obj $(OUT)\Killer.res $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\AdminGroup.res: AdminGroup.rc AFS_component_version_number.h @@ -46,6 +48,7 @@ $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) !IF ("$(AFSDEV_BUILDTYPE)"=="FREE") !IF ("$(CPU)" == "i386") diff --git a/src/WINNT/install/loopback/NTMakefile b/src/WINNT/install/loopback/NTMakefile index eed3c94ce..72f6e86a5 100644 --- a/src/WINNT/install/loopback/NTMakefile +++ b/src/WINNT/install/loopback/NTMakefile @@ -72,6 +72,7 @@ $(DLLFILE): $(DLLOBJFILES) $(DLLRES) $(LINK) -DLL $(DLLEXPORTS) -OUT:$@ $** $(DLLLIBFILES) $(_VC_MANIFEST_EMBED_DLL) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # instloop.exe @@ -85,6 +86,7 @@ $(EXEFILE): $(EXEOBJFILES) $(EXERES) $(LINK) /OUT:$@ $** $(DLLLIBFILES) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: $(DLLFILE) $(EXEFILE) diff --git a/src/WINNT/install/wix/custom/NTMakefile b/src/WINNT/install/wix/custom/NTMakefile index 3b956443e..ddd1c8b3b 100644 --- a/src/WINNT/install/wix/custom/NTMakefile +++ b/src/WINNT/install/wix/custom/NTMakefile @@ -37,6 +37,7 @@ $(DLLFILE): $(OUT)\afscustom.obj $(DLLRES) -OUT:$@ $** $(DLLLIBFILES) $(_VC_MANIFEST_EMBED_DLL) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: $(DLLFILE) diff --git a/src/WINNT/install/wix/uninstall/NTMakefile b/src/WINNT/install/wix/uninstall/NTMakefile index e70cfd1b3..d6c9b98f2 100644 --- a/src/WINNT/install/wix/uninstall/NTMakefile +++ b/src/WINNT/install/wix/uninstall/NTMakefile @@ -23,6 +23,7 @@ $(UNINSTALL): $(OBJECTS) $(OUT)\uninstall.res $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: $(UNINSTALL) diff --git a/src/WINNT/license/NTMakefile b/src/WINNT/license/NTMakefile index 739d32752..828f8602f 100644 --- a/src/WINNT/license/NTMakefile +++ b/src/WINNT/license/NTMakefile @@ -33,6 +33,7 @@ $(EXEFILE) : $(EXEOBJS) $(EXERES) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ install : $(EXEFILE) lang diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile index 69be805c7..bce08bc5e 100644 --- a/src/WINNT/netidmgr_plugin/NTMakefile +++ b/src/WINNT/netidmgr_plugin/NTMakefile @@ -149,6 +149,7 @@ $(DLLFILE): $(OBJFILES) $(VERRESFILE) $(_VC_MANIFEST_EMBED_DLL) $(_VC_MANIFEST_CLEAN) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) dummy: diff --git a/src/WINNT/pthread/NTMakefile b/src/WINNT/pthread/NTMakefile index 27ada43db..09cfca9ed 100644 --- a/src/WINNT/pthread/NTMakefile +++ b/src/WINNT/pthread/NTMakefile @@ -32,6 +32,7 @@ $(PTHR_DLLFILE): $(PTHR_DLLOBJS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def pthread.def install: $(PTHR_DLLFILE) $(LIBINCLUDES) diff --git a/src/WINNT/pthread/test/NTMakefile b/src/WINNT/pthread/test/NTMakefile index 265567d75..a80483670 100644 --- a/src/WINNT/pthread/test/NTMakefile +++ b/src/WINNT/pthread/test/NTMakefile @@ -15,16 +15,19 @@ $(OUT)\ptest.exe: $(OUT)\ptest.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/ $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\tsd.exe: $(OUT)\tsd.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\native.exe: $(OUT)\native.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) clean:: $(DEL) $(DESTDIR)/lib/afspthread.lib diff --git a/src/WINNT/tests/largefiles/NTMakefile b/src/WINNT/tests/largefiles/NTMakefile index 1b596c8c1..7c072d613 100644 --- a/src/WINNT/tests/largefiles/NTMakefile +++ b/src/WINNT/tests/largefiles/NTMakefile @@ -23,6 +23,7 @@ $(EXEDIR)\lftest.exe: $(OBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: idirs $(EXEDIR)\lftest.exe diff --git a/src/WINNT/tests/nmtest/NTMakefile b/src/WINNT/tests/nmtest/NTMakefile index ba7fc9f60..fe2de51e4 100644 --- a/src/WINNT/tests/nmtest/NTMakefile +++ b/src/WINNT/tests/nmtest/NTMakefile @@ -23,6 +23,7 @@ $(EXEDIR)\nmtest.exe: $(OBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: idirs $(EXEDIR)\nmtest.exe diff --git a/src/WINNT/tests/torture/DumpAfsLog/NTMakefile b/src/WINNT/tests/torture/DumpAfsLog/NTMakefile index bce1e03c9..e1e9670e6 100644 --- a/src/WINNT/tests/torture/DumpAfsLog/NTMakefile +++ b/src/WINNT/tests/torture/DumpAfsLog/NTMakefile @@ -27,6 +27,7 @@ $(EXEDIR)\DumpAfsLog.exe: $(OBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: idirs $(EXEDIR)\DumpAfsLog.exe diff --git a/src/WINNT/tests/torture/Source/NTMakefile b/src/WINNT/tests/torture/Source/NTMakefile index 2bbc5f621..8f4c17d81 100644 --- a/src/WINNT/tests/torture/Source/NTMakefile +++ b/src/WINNT/tests/torture/Source/NTMakefile @@ -31,6 +31,7 @@ $(EXEDIR)\wintorture.exe: $(OBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: idirs $(EXEDIR)\wintorture.exe diff --git a/src/WINNT/tests/torture/StopStressTest/NTMakefile b/src/WINNT/tests/torture/StopStressTest/NTMakefile index d26625df7..4e1928f3e 100644 --- a/src/WINNT/tests/torture/StopStressTest/NTMakefile +++ b/src/WINNT/tests/torture/StopStressTest/NTMakefile @@ -27,6 +27,7 @@ $(EXEDIR)\StopStressTest.exe: $(OBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: idirs $(EXEDIR)\StopStressTest.exe diff --git a/src/WINNT/tests/torture/Stress/NTMakefile b/src/WINNT/tests/torture/Stress/NTMakefile index f9c25300d..8f290bfb9 100644 --- a/src/WINNT/tests/torture/Stress/NTMakefile +++ b/src/WINNT/tests/torture/Stress/NTMakefile @@ -27,6 +27,7 @@ $(EXEDIR)\Stress.exe: $(OBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: idirs $(EXEDIR)\Stress.exe diff --git a/src/WINNT/tests/winflock/NTMakefile b/src/WINNT/tests/winflock/NTMakefile index 1ad0655ee..6c90c4c99 100644 --- a/src/WINNT/tests/winflock/NTMakefile +++ b/src/WINNT/tests/winflock/NTMakefile @@ -27,6 +27,7 @@ $(EXEDIR)\winflock.exe: $(OBJS) $(LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: idirs $(EXEDIR)\winflock.exe diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile index da767ade5..839d5928c 100644 --- a/src/auth/NTMakefile +++ b/src/auth/NTMakefile @@ -88,6 +88,7 @@ $(SETKEY_EXEFILE): $(SETKEY_EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # build copyauth COPYAUTH_EXEFILE = $(DESTDIR)\etc\copyauth.exe @@ -100,6 +101,7 @@ $(COPYAUTH_EXEFILE): $(COPYAUTH_EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(INCFILES):$$(@F) $(COPY) $** $(INCFILEDIR)\. diff --git a/src/auth/test/NTMakefile b/src/auth/test/NTMakefile index b4e5a0432..340d17b99 100644 --- a/src/auth/test/NTMakefile +++ b/src/auth/test/NTMakefile @@ -28,6 +28,7 @@ $(CELL_EXEFILE): $(CELL_EXEOBJS) $(CELL_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ KTC_EXEFILE = $(OUT)\ktctest.exe @@ -46,6 +47,7 @@ $(KTC_EXEFILE): $(KTC_EXEOBJS) $(KTC_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) test tests: $(CELL_EXEFILE) $(KTC_EXEFILE) diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile index 64d46dcc3..58f05ef3e 100644 --- a/src/bozo/NTMakefile +++ b/src/bozo/NTMakefile @@ -74,6 +74,7 @@ $(BOSSERVER_EXEFILE): $(BOSSERVER_EXEOBJS) $(BOSSERVER_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Build bos.exe @@ -111,6 +112,7 @@ $(RS_BOS_EXEFILE): $(BOS_EXEOBJS) $(BOS_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(CL_BOS_EXEFILE): $(RS_BOS_EXEFILE) $(COPY) $** $@ diff --git a/src/bu_utils/NTMakefile b/src/bu_utils/NTMakefile index b0fa48d17..520ed05e6 100644 --- a/src/bu_utils/NTMakefile +++ b/src/bu_utils/NTMakefile @@ -30,6 +30,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Definitions for generating versioninfo resources diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile index bf5d49fe4..aa63e5441 100644 --- a/src/bucoord/NTMakefile +++ b/src/bucoord/NTMakefile @@ -97,6 +97,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile index c0ebcb36a..fe54b551e 100644 --- a/src/budb/NTMakefile +++ b/src/budb/NTMakefile @@ -85,6 +85,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Definitions for generating versioninfo resources diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile index 45c3b7bf5..4e602dd04 100644 --- a/src/butc/NTMakefile +++ b/src/butc/NTMakefile @@ -62,6 +62,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Install target; primary makefile target @@ -83,6 +84,7 @@ $(OUT)\butc_test.exe: $(OUT)\test.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/butm/NTMakefile b/src/butm/NTMakefile index 938a36920..63e785720 100644 --- a/src/butm/NTMakefile +++ b/src/butm/NTMakefile @@ -51,6 +51,7 @@ $(OUT)\test_ftm.exe: $(OUT)\test_ftm.obj $(LIBFILE) $(TESTLIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/cmd/test/NTMakefile b/src/cmd/test/NTMakefile index 20b93f71d..75f15d674 100644 --- a/src/cmd/test/NTMakefile +++ b/src/cmd/test/NTMakefile @@ -26,6 +26,7 @@ $(ITEST_EXEFILE): $(ITEST_EXEOBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) #build ctest.exe CTEST_EXEOBJS =\ @@ -38,6 +39,7 @@ $(CTEST_EXEFILE): $(CTEST_EXEOBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # build dtest.exe DTEST_EXEOBJS =\ @@ -50,6 +52,7 @@ $(DTEST_EXEFILE): $(DTEST_EXEOBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) all: test diff --git a/src/comerr/NTMakefile b/src/comerr/NTMakefile index d2c8ba7d1..331f287a9 100644 --- a/src/comerr/NTMakefile +++ b/src/comerr/NTMakefile @@ -67,6 +67,7 @@ $(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_E $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) #################################################################### install: prep $(INCFILES) $(COMERR_LIBFILE) $(COMPILE_ET_EXEFILE) diff --git a/src/comerr/test/NTMakefile b/src/comerr/test/NTMakefile index d138ef815..7c68e4a48 100644 --- a/src/comerr/test/NTMakefile +++ b/src/comerr/test/NTMakefile @@ -21,6 +21,7 @@ $(EXEFILE): $(EXEOBJS) # dependents built from predefined inference rules $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) test1.c test1.h: test1.et $(DEL) test1.c test1.h diff --git a/src/config/NTMakefile b/src/config/NTMakefile index 8b9aa88a4..893274cdb 100644 --- a/src/config/NTMakefile +++ b/src/config/NTMakefile @@ -512,16 +512,19 @@ $(OUT)\mkvers.exe : $(OUT)\mkvers.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\touch.exe : $(OUT)\touch.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\util_cr.exe : $(OUT)\util_cr.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) langsetup: $(DESTDIR)\bin\NTLang.bat diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 2f9de4889..9b822bcb2 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -320,6 +320,16 @@ CODESIGN_USERLAND= signtool.exe sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL CODESIGN_USERLAND= !ENDIF +!IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT) +!IF "$(SYMSTORE_COMMENT)" != "" +SYMSTORE_COMMENT = |$(SYMSTORE_COMMENT) +!ENDIF +SYMSTORE_IMPORT= \ +$(SYMSTORE_EXE) add /s $(SYMSTORE_ROOT) /t "OpenAFS for Windows" /v "$(AFSBLD_TYPE)-$(CPU)-$(AFSPRODUCT_VERSION)" /c "$(@F)$(SYMSTORE_COMMENT)" /f $*.* +!ELSE +SYMSTORE_IMPORT= +!ENDIF + # Set compiler warning level !IFNDEF AFSDEV_WARNLEVEL diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index 1512415f2..d6b4b5aee 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -328,6 +328,16 @@ CODESIGN_USERLAND= signtool.exe sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL CODESIGN_USERLAND= !ENDIF +!IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT) +!IF "$(SYMSTORE_COMMENT)" != "" +SYMSTORE_COMMENT = |$(SYMSTORE_COMMENT) +!ENDIF +SYMSTORE_IMPORT= \ +$(SYMSTORE_EXE) add /s $(SYMSTORE_ROOT) /t "OpenAFS for Windows" /v "$(AFSBLD_TYPE)-$(CPU)-$(AFSPRODUCT_VERSION)" /c "$(@F)$(SYMSTORE_COMMENT)" /f $*.* +!ELSE +SYMSTORE_IMPORT= +!ENDIF + # Set compiler warning level !IFNDEF AFSDEV_WARNLEVEL diff --git a/src/des/NTMakefile b/src/des/NTMakefile index f1b879e62..35fe386c6 100644 --- a/src/des/NTMakefile +++ b/src/des/NTMakefile @@ -121,41 +121,49 @@ $(OUT)\make_keyperm.exe: $(OUT)\make_keyperm.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\make_p_table.exe: $(OUT)\make_p_table.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\make_s_table.exe: $(OUT)\make_s_table.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\make_odd.exe: $(OUT)\make_odd.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\make_p.exe: $(OUT)\make_p.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\make_s.exe: $(OUT)\make_s.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\make_fp.exe: $(OUT)\make_fp.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\make_ip.exe: $(OUT)\make_ip.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) GENOBJS = $(OUT)\make_keyperm.obj \ $(OUT)\make_p_table.obj \ diff --git a/src/dir/test/NTMakefile b/src/dir/test/NTMakefile index 12624bfb2..bdb344a28 100644 --- a/src/dir/test/NTMakefile +++ b/src/dir/test/NTMakefile @@ -14,6 +14,7 @@ $(OUT)\dtest.exe: $(OUT)\dtest.obj $(DESTDIR)\lib\afs\afsdir.lib $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/finale/NTMakefile b/src/finale/NTMakefile index b89ccebe2..77f121f51 100644 --- a/src/finale/NTMakefile +++ b/src/finale/NTMakefile @@ -28,6 +28,7 @@ $(TRANSLATE_ET_EXEFILE): $(TRANSLATE_ET_EXEOBJS) $(TRANSLATE_ET_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Definitions for generating versioninfo resources diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile index 29835483b..770dbbaef 100644 --- a/src/kauth/NTMakefile +++ b/src/kauth/NTMakefile @@ -122,6 +122,7 @@ $(KASERVER): $(KASERVER_OBJS) $(AFSLIBS) $(KASERVER_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) #build $(OUT)\kadatabase.obj @@ -148,6 +149,7 @@ $(KAS): $(KAS_OBJS) $(AFSLIBS) $(KAUTH_LIBFILE) $(TOKENLIB) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ########### Misc Exes ####################################################### #kpasswd.exe @@ -163,24 +165,28 @@ $(KPASSWD_EXEFILE): $(KPASSWD_OBJS) $(AFSLIBS) $(KAUTH_LIBFILE) $(TOKENLIB) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) #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) + $(SYMSTORE_IMPORT) #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) +# $(SYMSTORE_IMPORT) #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) + $(SYMSTORE_IMPORT) ############################################################################ # Definitions for generating versioninfo resources diff --git a/src/kauth/test/NTMakefile b/src/kauth/test/NTMakefile index d976faf99..b9a45bf46 100644 --- a/src/kauth/test/NTMakefile +++ b/src/kauth/test/NTMakefile @@ -26,41 +26,49 @@ $(OUT)\multiklog.exe: $(OUT)\multiklog.obj $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\test_date.exe: $(OUT)\test_date.obj $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\test_badtix.exe: $(OUT)\test_badtix.obj $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\decode_ticket.exe: $(OUT)\decode_ticket.obj $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\test_interim_ktc.exe: $(OUT)\test_interim_ktc.obj $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\test_rxkad_free: test_rxkad_free.o $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\test_getticket.exe: $(OUT)\test_getticket.obj $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\background.exe: $(OUT)\background.obj $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) 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 7f754481c..a55bf3ffe 100644 --- a/src/libadmin/adminutil/NTMakefile +++ b/src/libadmin/adminutil/NTMakefile @@ -147,6 +147,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def afsadminutil.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/libadmin/bos/NTMakefile b/src/libadmin/bos/NTMakefile index 1610a2ef4..8dcf1fd21 100644 --- a/src/libadmin/bos/NTMakefile +++ b/src/libadmin/bos/NTMakefile @@ -46,6 +46,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def bosadmin.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/libadmin/cfg/NTMakefile b/src/libadmin/cfg/NTMakefile index 4fd146d95..509f0fcf8 100644 --- a/src/libadmin/cfg/NTMakefile +++ b/src/libadmin/cfg/NTMakefile @@ -63,6 +63,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def afscfgadmin.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/libadmin/cfg/test/NTMakefile b/src/libadmin/cfg/test/NTMakefile index 7772f2e82..c161129ea 100644 --- a/src/libadmin/cfg/test/NTMakefile +++ b/src/libadmin/cfg/test/NTMakefile @@ -24,6 +24,7 @@ $(OUT)\cfgtest.exe: $(OUT)\cfgtest.obj $(CFGTEST_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/libadmin/client/NTMakefile b/src/libadmin/client/NTMakefile index 3008eeb3e..8f51cc46d 100644 --- a/src/libadmin/client/NTMakefile +++ b/src/libadmin/client/NTMakefile @@ -34,6 +34,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def clientadmin.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/libadmin/kas/NTMakefile b/src/libadmin/kas/NTMakefile index 8419e881f..16c5edd3a 100644 --- a/src/libadmin/kas/NTMakefile +++ b/src/libadmin/kas/NTMakefile @@ -43,6 +43,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def kasadmin.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/libadmin/pts/NTMakefile b/src/libadmin/pts/NTMakefile index 1db68b0d5..76627ca5e 100644 --- a/src/libadmin/pts/NTMakefile +++ b/src/libadmin/pts/NTMakefile @@ -46,6 +46,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def ptsadmin.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/libadmin/test/NTMakefile b/src/libadmin/test/NTMakefile index 9f05d6f94..85cd63240 100644 --- a/src/libadmin/test/NTMakefile +++ b/src/libadmin/test/NTMakefile @@ -37,6 +37,7 @@ $(OUT)\afscp.exe: $(OUT)\afscp.obj $(AFSCP_EXEOBJS) $(AFSCP_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/libadmin/vos/NTMakefile b/src/libadmin/vos/NTMakefile index e1e1dfad5..e893169ee 100644 --- a/src/libadmin/vos/NTMakefile +++ b/src/libadmin/vos/NTMakefile @@ -67,6 +67,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def vosadmin.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile index 64c8b8aa2..21094f32b 100644 --- a/src/libafsauthent/NTMakefile +++ b/src/libafsauthent/NTMakefile @@ -149,6 +149,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(RXOBJS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def afsauthent.def # Definitions for generating versioninfo resources diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile index 6491bb0b7..ec41a7281 100644 --- a/src/libafsrpc/NTMakefile +++ b/src/libafsrpc/NTMakefile @@ -99,6 +99,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def afsrpc.def # Definitions for generating versioninfo resources diff --git a/src/lwp/NTMakefile b/src/lwp/NTMakefile index ce34bfd0a..ec65981c5 100644 --- a/src/lwp/NTMakefile +++ b/src/lwp/NTMakefile @@ -46,6 +46,7 @@ $(OUT)\rw.exe: $(OUT)\rw.obj $(LIBFILE) $(DESTDIR)\lib\afs\afsutil.lib $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) clean:: $(DEL) $(LIBFILE) diff --git a/src/lwp/test/NTMakefile b/src/lwp/test/NTMakefile index 04bd561cb..e211b0233 100644 --- a/src/lwp/test/NTMakefile +++ b/src/lwp/test/NTMakefile @@ -19,6 +19,7 @@ $(OUT)\testkey.exe: $(OUT)\test_key.obj $(LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # test targets test testkey: $(TESTKEY) diff --git a/src/procmgmt/NTMakefile b/src/procmgmt/NTMakefile index c1571e5d5..8ef0f808b 100644 --- a/src/procmgmt/NTMakefile +++ b/src/procmgmt/NTMakefile @@ -38,6 +38,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLRES) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(MAKECYGLIB) --input-def afsprocmgmt.def $(COPY) $*.lib $(ILIBDIR) $(DEL) $*.lib $*.exp @@ -60,6 +61,7 @@ $(RS_KILL_EXEFILE): $(KILL_EXEOBJS) $(KILL_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(CL_KILL_EXEFILE): $(RS_KILL_EXEFILE) $(COPY) $** $@ diff --git a/src/procmgmt/test/NTMakefile b/src/procmgmt/test/NTMakefile index 7a6ea8614..73e1a430e 100644 --- a/src/procmgmt/test/NTMakefile +++ b/src/procmgmt/test/NTMakefile @@ -19,6 +19,7 @@ $(OUT)\pmgttest.exe: $(OUT)\pmgttest.obj $(PMGTTEST_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile index 5592050b5..fa893c530 100644 --- a/src/ptserver/NTMakefile +++ b/src/ptserver/NTMakefile @@ -80,6 +80,7 @@ $(PTSERVER): $(PTSERVER_EXEOBJS) $(RXKADOBJS) $(PTSERVER_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # build pts.exe @@ -126,18 +127,21 @@ $(PTS): $(PTS_EXEOBJS) $(PTS_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(PTCLIENT): $(PTCLIENT_EXEOBJS) $(PTS_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(PT_UTIL): $(PT_UTIL_EXEOBJS) $(PTS_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ @@ -235,21 +239,25 @@ $(OUT)\readgroup.exe: $(OUT)\readgroup.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\readpwd.exe: $(OUT)\readpwd.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\testpt.exe: $(OUT)\testpt.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(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) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/rx/test/NTMakefile b/src/rx/test/NTMakefile index c1824081c..c25338d9b 100644 --- a/src/rx/test/NTMakefile +++ b/src/rx/test/NTMakefile @@ -26,21 +26,25 @@ $(OUT)\testclient.exe: $(OUT)\testclient.obj $(LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\testserver.exe: $(OUT)\testserver.obj $(LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\tableGen.exe: $(OUT)\tableGen.obj $(LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\generator.exe: $(OUT)\generator.obj $(LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(RXTESTOBJS): ..\rx_clock.h ..\rx_queue.h ..\rx_event.h ..\rx.h diff --git a/src/rxdebug/NTMakefile b/src/rxdebug/NTMakefile index b74748566..63ba5e860 100644 --- a/src/rxdebug/NTMakefile +++ b/src/rxdebug/NTMakefile @@ -36,6 +36,7 @@ $(RXDEBUG): $(RXDOBJS) $(RXDLIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: $(RXDEBUG) diff --git a/src/rxgen/NTMakefile b/src/rxgen/NTMakefile index e5a390c1e..e2119a534 100644 --- a/src/rxgen/NTMakefile +++ b/src/rxgen/NTMakefile @@ -39,6 +39,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: AFS_component_version_number.c $(EXEFILE) $(INCFILES) diff --git a/src/rxkad/test/NTMakefile b/src/rxkad/test/NTMakefile index 40dcad87a..d514e20fa 100644 --- a/src/rxkad/test/NTMakefile +++ b/src/rxkad/test/NTMakefile @@ -38,6 +38,7 @@ $(EXEFILE): $(EXEOBJS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ diff --git a/src/shlibafsauthent/NTMakefile b/src/shlibafsauthent/NTMakefile index 54c256756..d1ab06c8f 100644 --- a/src/shlibafsauthent/NTMakefile +++ b/src/shlibafsauthent/NTMakefile @@ -224,6 +224,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(_VC_MANIFEST_EMBED_DLL) $(DLLPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # 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 bd04c807a..83802e129 100644 --- a/src/tbutc/NTMakefile +++ b/src/tbutc/NTMakefile @@ -98,6 +98,7 @@ $(BUTCEXE): $(BUTCOBJS) $(BUTCRES) $(BUTCLIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) .c.$(OUT)\obj: $(C2OBJ) -I$(BUCOORD) $< diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile index 0cf3ebe55..182a36e24 100644 --- a/src/tviced/NTMakefile +++ b/src/tviced/NTMakefile @@ -93,6 +93,7 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) install: $(EXEFILE) diff --git a/src/tvolser/NTMakefile b/src/tvolser/NTMakefile index 375dd594f..75e58238d 100644 --- a/src/tvolser/NTMakefile +++ b/src/tvolser/NTMakefile @@ -100,6 +100,7 @@ $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\vscommon.obj: $(VOLSER)\common.c $(C2OBJ) /Fo$(OUT)\vscommon.obj -I$(VOLSER) -I$(UTIL) $** diff --git a/src/ubik/NTMakefile b/src/ubik/NTMakefile index 17118b378..c91845114 100644 --- a/src/ubik/NTMakefile +++ b/src/ubik/NTMakefile @@ -110,6 +110,7 @@ $(RS_UDBG_EXEFILE): $(UDBG_EXEOBJS) $(UDBG_EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(CL_UDBG_EXEFILE): $(RS_UDBG_EXEFILE) $(COPY) $** $@ @@ -167,11 +168,13 @@ utst_server: $(OUT)\utst_server.obj $(OUT)\utst_int.ss.obj $(OUT)\utst_int.xdr.o $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) utst_client: $(OUT)\utst_client.obj $(OUT)\utst_int.cs.obj $(OUT)\utst_int.xdr.obj $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # 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 d8500320f..112983225 100644 --- a/src/update/NTMakefile +++ b/src/update/NTMakefile @@ -55,6 +55,7 @@ $(UPSERVER): $(USVR_OBJS) $(LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # upclient @@ -72,6 +73,7 @@ $(UPCLIENT): $(UCLNT_OBJS) $(LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # generate versioninfo resources diff --git a/src/usd/test/NTMakefile b/src/usd/test/NTMakefile index 5cd899318..e7da58784 100644 --- a/src/usd/test/NTMakefile +++ b/src/usd/test/NTMakefile @@ -21,6 +21,7 @@ $(OUT)\usd_test.exe: $(OUT)\usd_test.obj $(LIBFILE) $(LIBUTIL) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/util/test/NTMakefile b/src/util/test/NTMakefile index c393c9505..8295dd35e 100644 --- a/src/util/test/NTMakefile +++ b/src/util/test/NTMakefile @@ -17,11 +17,13 @@ $(OUT)\dirpath_test.exe: $(OUT)\dirpath_test.obj $(LIBS) $(EXECONLINK) shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(OUT)\snprintf_test.exe: $(OUT)\snprintf_test.obj $(LIBS) $(EXECONLINK) shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) test tests: $(OUT)\dirpath_test.exe $(OUT)\snprintf_test.exe diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile index 7ec7a6628..83671e793 100644 --- a/src/viced/NTMakefile +++ b/src/viced/NTMakefile @@ -65,6 +65,7 @@ $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Build cbd - not generally distributed debugging program @@ -79,6 +80,7 @@ $(CBD): $(OUT)\cbd.obj $(CBDRES) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # generate versioninfo resources diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile index 59e62744c..7f753d327 100644 --- a/src/vlserver/NTMakefile +++ b/src/vlserver/NTMakefile @@ -95,6 +95,7 @@ $(VLSERVER): $(VLSERVER_EXEOBJS) $(LIBFILE) $(VLSERVER_EXECLIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # generate versioninfo resources @@ -143,6 +144,7 @@ $(OUT)\vldb_check.exe: $(OUT)\vldb_check.obj $(VLDB_CHECK_LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # build local vlclient @@ -154,6 +156,7 @@ $(OUT)\vlclient.exe: $(OUT)\vlclient.obj $(LIBFILE) $(VLSERVER_EXECLIBS) $(VLCL $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile index c48d7fdbb..f10ae67d3 100644 --- a/src/vol/NTMakefile +++ b/src/vol/NTMakefile @@ -137,6 +137,7 @@ $(SALVAGER): $(SALVAGER_EXEOBJS) $(EXEC_LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ @@ -153,6 +154,7 @@ $(FSSYNC_DEBUG): $(FSSYNC_DEBUG_EXEOBJS) $(EXEC_LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # build volinfo @@ -163,6 +165,7 @@ $(VOLINFO): $(OUT)\vol-info.obj $(OUT)\physio.obj $(OUT)\volinfo.res $(EXEC_LIBS $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # build volinfo @@ -173,6 +176,7 @@ $(VOLBLESS): $(OUT)\vol-bless.obj $(OUT)\physio.obj $(OUT)\vol-bless.res $(EXEC_ $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # generate versioninfo resources diff --git a/src/vol/test/NTMakefile b/src/vol/test/NTMakefile index 8f1b31e0f..165b6908a 100644 --- a/src/vol/test/NTMakefile +++ b/src/vol/test/NTMakefile @@ -30,6 +30,7 @@ $(ILIST): $(OUT)\ilist_nt.obj $(EXEC_LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ @@ -40,6 +41,7 @@ $(LTLIST): $(OUT)\ltlist.obj $(EXEC_LIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) mkdir: diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile index 5ca1d246c..2cc6ca70d 100644 --- a/src/volser/NTMakefile +++ b/src/volser/NTMakefile @@ -102,6 +102,7 @@ $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXEC_LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) ############################################################################ # Build vos @@ -129,6 +130,7 @@ $(RS_VOS_EXEFILE): $(VOS_EXEOBJS) $(VOS_EXELIBS) $(EXEC_LIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) $(CL_VOS_EXEFILE): $(RS_VOS_EXEFILE) $(COPY) $** $@ diff --git a/src/xstat/NTMakefile b/src/xstat/NTMakefile index cdbb9d640..f35183758 100644 --- a/src/xstat/NTMakefile +++ b/src/xstat/NTMakefile @@ -54,6 +54,7 @@ $(BINDIR)\xstat_fs_test.exe: $(OUT)\xstat_fs_test.obj $(OUT)\xstat_fs_test.res $ $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # # Cache Manager data collection @@ -70,6 +71,7 @@ $(BINDIR)\xstat_cm_test.exe: $(OUT)\xstat_cm_test.obj $(OUT)\xstat_cm_test.res $ $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) # # Misc targets