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>

diff --git a/src/WINNT/afsrdr/NTMakefile b/src/WINNT/afsrdr/NTMakefile
index b23762c59050fd3af87c8ad3b5ab51ae2025b083..e5f50941a52628a16c48b40e7e049985bec0743c 100644 (file)
--- 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 c045e8e0b83e48da8cab3cc82d7cd647aa407776..02c0f352cdbf6ee22c1012329984f70e02bcf30e 100644 (file)
--- 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 0a18f935942b4f31ef76691d2413a09ad1aeb016..9d0a97d2629338ed12152ba7c7c0ba69242c417c 100644 (file)
--- 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 37e4e4b7be5a48d140174491da7bd497f349ba79..fbfe0f42f3fabf1abb582b3ec93629b18ece453c 100644 (file)
--- 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 93e56c71cb8603097b284542d6138ec49b21bd6f..824762b386014ae9ab5e989f92a4cbe7e7f15f38 100644 (file)
--- 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 13d5be3244c2945bea60c7007ca2cf180dfab977..a9eb83ae4c80d0ce436d8c06d7f19e64317fc4ae 100644 (file)
--- 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)