From 69ce80baa1293be4d2969862478f585b0b951619 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Tue, 29 May 2007 18:30:57 +0000
Subject: [PATCH] Update Build Environment

signcode.exe was apparently deprecated years ago, signtool.exe replaced it. Signtool.exe requires the certificate password to be passed in via the command line. So remove the references to signcode.exe and handle code signing via an external batch file.

svn path=/trunk/boinc/; revision=12768
---
 win_build/boinc_cli_curl.vcproj |  8 ++++----
 win_build/boinc_dll.vcproj      | 12 ++++--------
 win_build/boinc_ss.vcproj       |  8 ++++----
 win_build/boinccmd.vcproj       |  8 ++++----
 win_build/boincmgr_curl.vcproj  | 16 ++++++++--------
 win_build/sim.vcproj            |  8 ++++----
 win_build/updater.vcproj        |  8 ++++----
 7 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/win_build/boinc_cli_curl.vcproj b/win_build/boinc_cli_curl.vcproj
index 8a5fe7a28b..d184c71304 100644
--- a/win_build/boinc_cli_curl.vcproj
+++ b/win_build/boinc_cli_curl.vcproj
@@ -567,8 +567,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing &amp; Checking Dependencies"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;&#x0D;&#x0A;boinc_post_bld_rules.cmd &quot;$(SolutionDir)&quot; &quot;$(OutDir)&quot; &quot;$(PlatformName)&quot;&#x0D;&#x0A;"
+				Description="Checking Dependencies"
+				CommandLine="boinc_post_bld_rules.cmd &quot;$(SolutionDir)&quot; &quot;$(OutDir)&quot; &quot;$(PlatformName)&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -678,8 +678,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing &amp; Checking Dependencies"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;&#x0D;&#x0A;boinc_post_bld_rules.cmd &quot;$(SolutionDir)&quot; &quot;$(OutDir)&quot; &quot;$(PlatformName)&quot;&#x0D;&#x0A;"
+				Description="Checking Dependencies"
+				CommandLine="boinc_post_bld_rules.cmd &quot;$(SolutionDir)&quot; &quot;$(OutDir)&quot; &quot;$(PlatformName)&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win_build/boinc_dll.vcproj b/win_build/boinc_dll.vcproj
index fc7cc4dec6..6d0949c280 100644
--- a/win_build/boinc_dll.vcproj
+++ b/win_build/boinc_dll.vcproj
@@ -117,7 +117,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 		</Configuration>
@@ -220,7 +219,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 		</Configuration>
@@ -323,7 +321,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 		</Configuration>
@@ -426,7 +423,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 		</Configuration>
@@ -529,8 +525,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -632,8 +628,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win_build/boinc_ss.vcproj b/win_build/boinc_ss.vcproj
index fd6e99ee77..7d55a35cec 100644
--- a/win_build/boinc_ss.vcproj
+++ b/win_build/boinc_ss.vcproj
@@ -558,8 +558,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -668,8 +668,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win_build/boinccmd.vcproj b/win_build/boinccmd.vcproj
index 875e64268c..9055ef82a5 100644
--- a/win_build/boinccmd.vcproj
+++ b/win_build/boinccmd.vcproj
@@ -563,8 +563,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -675,8 +675,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win_build/boincmgr_curl.vcproj b/win_build/boincmgr_curl.vcproj
index f3fafe278a..7ad2fe7d65 100644
--- a/win_build/boincmgr_curl.vcproj
+++ b/win_build/boincmgr_curl.vcproj
@@ -433,7 +433,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..;&quot;$(WXWIN)\include&quot;;&quot;$(WXWIN)\contrib\include&quot;;&quot;$(WXWIN)\lib\vc_lib\msw&quot;;..\lib;..\api;..\clientgui;..\client\win"
+				AdditionalIncludeDirectories="..;&quot;$(WXWINPROD)\include&quot;;&quot;$(WXWINPROD)\contrib\include&quot;;&quot;$(WXWINPROD)\lib\vc_lib\msw&quot;;..\lib;..\api;..\clientgui;..\client\win"
 				PreprocessorDefinitions="WIN32;_WIN32;_NDEBUG;_WINDOWS;_MT;_DLL;__WXNDEBUG__;WXNDEBUG;wxUSE_GUI=1"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -464,7 +464,7 @@
 				AdditionalDependencies="MSVCRT.LIB MSVCPRT.LIB kernel32.lib user32.lib gdi32.lib ole32.lib oleacc.lib shell32.lib comdlg32.lib advapi32.lib oldnames.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib wininet.lib wxbase26.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_adv.lib wxmsw26_core.lib wxmsw26_html.lib wxregex.lib wxexpat.lib wxpng.lib wxzlib.lib boinc_dll.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(WXWIN)\lib\vc_lib&quot;;&quot;$(WXWIN)\contrib\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(WXWINPROD)\lib\vc_lib&quot;;&quot;$(WXWINPROD)\contrib\lib&quot;"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).pdb"
@@ -499,8 +499,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -531,7 +531,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..;&quot;$(WXWINX64)\contrib\include&quot;;&quot;$(WXWINX64)\include&quot;;&quot;$(WXWINX64)\lib\vc_lib\mswd&quot;;..\lib;..\api;..\clientgui;..\client\win"
+				AdditionalIncludeDirectories="..;&quot;$(WXWINPRODX64)\contrib\include&quot;;&quot;$(WXWINPRODX64)\include&quot;;&quot;$(WXWINPRODX64)\lib\vc_lib\mswd&quot;;..\lib;..\api;..\clientgui;..\client\win"
 				PreprocessorDefinitions="WIN32;_WIN32;_NDEBUG;_WINDOWS;_MT;_DLL;__WXNDEBUG__;WXNDEBUG;wxUSE_GUI=1"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -562,7 +562,7 @@
 				AdditionalDependencies="MSVCRT.LIB MSVCPRT.LIB kernel32.lib user32.lib gdi32.lib ole32.lib oleacc.lib shell32.lib comdlg32.lib advapi32.lib oldnames.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib wininet.lib wxbase26.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_adv.lib wxmsw26_core.lib wxmsw26_html.lib wxregex.lib wxexpat.lib wxpng.lib wxzlib.lib boinc_dll.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(WXWINX64)\lib\vc_lib&quot;;&quot;$(WXWINX64)\contrib\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(WXWINPRODX64)\lib\vc_lib&quot;;&quot;$(WXWINPRODX64)\contrib\lib&quot;"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).pdb"
@@ -597,8 +597,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win_build/sim.vcproj b/win_build/sim.vcproj
index 9aed65379a..ed1542fa86 100644
--- a/win_build/sim.vcproj
+++ b/win_build/sim.vcproj
@@ -563,8 +563,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -675,8 +675,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win_build/updater.vcproj b/win_build/updater.vcproj
index c6422d1e8c..1f2daf974a 100644
--- a/win_build/updater.vcproj
+++ b/win_build/updater.vcproj
@@ -563,8 +563,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -675,8 +675,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Code Signing"
-				CommandLine="signcode -v &quot;$(InputDir)\boinc.pvk&quot; -spc &quot;$(InputDir)\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
+				Description=""
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>