summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorunknown <iggy@amd64.(none)>2007-07-25 13:23:27 -0400
committerunknown <iggy@amd64.(none)>2007-07-25 13:23:27 -0400
commit5401e2136900ed2ac8623b0ac82a3ff5a04553ab (patch)
tree6385e999e135e1cc005b8d87409d477865808122 /win
parent9e5390c20a8d05275364f7eba867be8073e20504 (diff)
parenta34879ebd2c6c02f77a2df080c4696f0039ebffa (diff)
downloadmariadb-git-5401e2136900ed2ac8623b0ac82a3ff5a04553ab.tar.gz
Merge amd64.(none):/src/bug24732/my50-bug24732
into amd64.(none):/src/bug24732/my51-bug24732 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-README~1: Auto merged
Diffstat (limited to 'win')
-rwxr-xr-xwin/create_manifest.js2
-rwxr-xr-xwin/mysql_manifest.cmake7
2 files changed, 5 insertions, 4 deletions
diff --git a/win/create_manifest.js b/win/create_manifest.js
index 8569bd508ff..dec8f6e62e2 100755
--- a/win/create_manifest.js
+++ b/win/create_manifest.js
@@ -56,7 +56,7 @@ try
manifest_xml+= "\t<assemblyIdentity name=\'" + app_name + "\'";
manifest_xml+= " version=\'" + app_version + "\'";
manifest_xml+= " processorArchitecture=\'" + app_arch + "\'";
- // TOADD - Add publicKeyToken attribute once we have Authenticode key.
+ manifest_xml+= " publicKeyToken=\'02ad33b422233ae3\'";
manifest_xml+= " type=\'win32\' />\r\n";
// Identify the application security requirements.
manifest_xml+= "\t<trustInfo xmlns=\'urn:schemas-microsoft-com:asm.v2\'>\r\n";
diff --git a/win/mysql_manifest.cmake b/win/mysql_manifest.cmake
index 4c88be1d800..0d429e438d6 100755
--- a/win/mysql_manifest.cmake
+++ b/win/mysql_manifest.cmake
@@ -14,7 +14,8 @@ MACRO(MYSQL_EMBED_MANIFEST _target_name _required_privs)
ADD_CUSTOM_COMMAND(
TARGET ${_target_name}
POST_BUILD
- COMMAND mt.exe
- ARGS -nologo -manifest $(IntDir)\\$(TargetFileName).intermediate.manifest -outputresource:$(TargetPath)
- COMMENT "Embeds the manifest contents.")
+ COMMAND mt.exe ARGS -nologo -hashupdate -makecdfs -manifest $(IntDir)\\$(TargetFileName).intermediate.manifest -outputresource:$(TargetPath)
+ COMMAND makecat.exe ARGS $(IntDir)\\$(TargetFileName).intermediate.manifest.cdf
+ COMMAND signtool.exe ARGS sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll $(TargetPath)
+ COMMENT "Embeds the manifest contents, creates a cryptographic catalog, signs the target with Authenticode certificate.")
ENDMACRO(MYSQL_EMBED_MANIFEST)