From fb5eccb2fe30b04497e3e12efab6080ef03d896d Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 12 Nov 2012 18:54:54 -0500
Subject: [PATCH] Windows: SYMSTORE the entire WINNT/afsrdr tree

The tools directories need to be imported into the symstore
one directory at a time.

The "build.exe" output files afsredir.sys, afsredirlib.sys and
afsrdfsprovider.dll must be imported from within the kernel
build environment script.

Change-Id: Ida7d84deecfb1ec4f508c5c40fc5576e2cb7b3e4
Reviewed-on: http://gerrit.openafs.org/8445
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
---
 src/WINNT/afsrdr/NTMakefile                 | 12 ++++++++++--
 src/WINNT/afsrdr/tools/authgroup/NTMakefile |  1 +
 src/WINNT/afsrdr/tools/crash/NTMakefile     |  1 +
 src/WINNT/afsrdr/tools/gettrace/NTMakefile  |  1 +
 src/WINNT/afsrdr/tools/objstatus/NTMakefile |  1 +
 src/WINNT/afsrdr/tools/settrace/NTMakefile  |  1 +
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/WINNT/afsrdr/NTMakefile b/src/WINNT/afsrdr/NTMakefile
index b23762c59..e5f50941a 100644
--- a/src/WINNT/afsrdr/NTMakefile
+++ b/src/WINNT/afsrdr/NTMakefile
@@ -79,9 +79,17 @@ $(OUT)\ddkbuild.cmd: NTMakefile
 !IFDEF CODESIGN_KERNEL
         echo $(CODESIGN_KERNEL) AFSRedir.sys >> $@
         echo $(CODESIGN_KERNEL) AFSRedirLib.sys >> $@
-        echo $(CODESIGN_KERNEL) AFSRDFSProvider.dll >> $@
 !ENDIF
-        $(SYMSTORE_IMPORT)
+!IFDEF CODESIGN_USERLAND
+        echo $(CODESIGN_USERLAND) AFSRDFSProvider.dll >> $@
+!ENDIF
+!IFDEF SYMSTORE_EXE
+!IFDEF SYMSTORE_ROOT
+        echo $(SYMSTORE_EXE) add /s $(SYMSTORE_ROOT) /t "OpenAFS for Windows" /v "$(AFSBLD_TYPE)-$(CPU)-$(AFSPRODUCT_VERSION)" /c "AFSRedir.sys$(SYMSTORE_COMMENT)" /f AFSRedir.* >> $@
+        echo $(SYMSTORE_EXE) add /s $(SYMSTORE_ROOT) /t "OpenAFS for Windows" /v "$(AFSBLD_TYPE)-$(CPU)-$(AFSPRODUCT_VERSION)" /c "AFSRedirLib.sys$(SYMSTORE_COMMENT)" /f AFSRedirLib.* >> $@
+        echo $(SYMSTORE_EXE) add /s $(SYMSTORE_ROOT) /t "OpenAFS for Windows" /v "$(AFSBLD_TYPE)-$(CPU)-$(AFSPRODUCT_VERSION)" /c "AFSRDFSProvider.dll$(SYMSTORE_COMMENT)" /f AFSRDRFSProvider.* >> $@
+!ENDIF
+!ENDIF
         echo exit 0 >> $@
 
 $(OUT)\ddkclean.cmd: NTMakefile
diff --git a/src/WINNT/afsrdr/tools/authgroup/NTMakefile b/src/WINNT/afsrdr/tools/authgroup/NTMakefile
index c045e8e0b..02c0f352c 100644
--- a/src/WINNT/afsrdr/tools/authgroup/NTMakefile
+++ b/src/WINNT/afsrdr/tools/authgroup/NTMakefile
@@ -54,6 +54,7 @@ $(AUTHGROUP) : $(AUTHGROUPOBJS) $(OUT)\authgroup.res
         $(_VC_MANIFEST_EMBED_EXE)
 	$(EXEPREP)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 install : $(AUTHGROUP)
 
diff --git a/src/WINNT/afsrdr/tools/crash/NTMakefile b/src/WINNT/afsrdr/tools/crash/NTMakefile
index 0a18f9359..9d0a97d26 100644
--- a/src/WINNT/afsrdr/tools/crash/NTMakefile
+++ b/src/WINNT/afsrdr/tools/crash/NTMakefile
@@ -30,6 +30,7 @@ $(CRASH) : $(CRASHOBJS) $(OUT)\crash.res
         $(_VC_MANIFEST_EMBED_EXE)
 	$(EXEPREP)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 install : $(CRASH)
 
diff --git a/src/WINNT/afsrdr/tools/gettrace/NTMakefile b/src/WINNT/afsrdr/tools/gettrace/NTMakefile
index 37e4e4b7b..fbfe0f42f 100644
--- a/src/WINNT/afsrdr/tools/gettrace/NTMakefile
+++ b/src/WINNT/afsrdr/tools/gettrace/NTMakefile
@@ -30,6 +30,7 @@ $(GETTRACE) : $(GETTRACEOBJS) $(OUT)\gettrace.res
         $(_VC_MANIFEST_EMBED_EXE)
 	$(EXEPREP)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 install : $(GETTRACE)
 
diff --git a/src/WINNT/afsrdr/tools/objstatus/NTMakefile b/src/WINNT/afsrdr/tools/objstatus/NTMakefile
index 93e56c71c..824762b38 100644
--- a/src/WINNT/afsrdr/tools/objstatus/NTMakefile
+++ b/src/WINNT/afsrdr/tools/objstatus/NTMakefile
@@ -54,6 +54,7 @@ $(OBJSTATUS) : $(OBJSTATUSOBJS) $(OUT)\objstatus.res
         $(_VC_MANIFEST_EMBED_EXE)
 	$(EXEPREP)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 install : $(OBJSTATUS)
 
diff --git a/src/WINNT/afsrdr/tools/settrace/NTMakefile b/src/WINNT/afsrdr/tools/settrace/NTMakefile
index 13d5be324..a9eb83ae4 100644
--- a/src/WINNT/afsrdr/tools/settrace/NTMakefile
+++ b/src/WINNT/afsrdr/tools/settrace/NTMakefile
@@ -30,6 +30,7 @@ $(SETTRACE) : $(SETTRACEOBJS) $(OUT)\settrace.res
         $(_VC_MANIFEST_EMBED_EXE)
 	$(EXEPREP)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 install : $(SETTRACE)
 
-- 
2.39.5