tis 2007-06-26 klockan 11:26 -0400 skrev Ignacio Galarza:
> Below is the list of changes that have just been committed into a local
> 5.0 repository of iggy. When iggy does a push these changes will
> be propagated to the main repository and, within 24 hours after the
> push, to the public repository.
> For information on how to access the public repository
> see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
>
> ChangeSet@stripped, 2007-06-26 11:26:01-04:00, iggy@amd64.(none) +3 -0
> Bug#24732 Executables do not include Vista manifests
> - Corrected manifest attributes.
>
> CMakeLists.txt@stripped, 2007-06-26 11:25:59-04:00, iggy@amd64.(none) +1 -1
> Bug#24732 Executables do not include Vista manifests
> - Use correct value for 64 built binaries.
>
> win/create_manifest.js@stripped, 2007-06-26 11:25:59-04:00, iggy@amd64.(none) +3 -7
> Bug#24732 Executables do not include Vista manifests
> - Remove type attribute as the only valid value is win32.
>
> win/mysql_manifest.cmake@stripped, 2007-06-26 11:25:59-04:00, iggy@amd64.(none) +1 -1
> Bug#24732 Executables do not include Vista manifests
> - Remove type attribute.
>
> # This is a BitKeeper patch. What follows are the unified diffs for the
> # set of deltas contained in the patch. The rest of the patch, the part
> # that BitKeeper cares about, is below these diffs.
> # User: iggy
> # Host: amd64.(none)
> # Root: /src/bug24732/my50-bug24732
>
> --- 1.15/CMakeLists.txt 2007-06-06 14:06:53 -04:00
> +++ 1.16/CMakeLists.txt 2007-06-26 11:25:59 -04:00
> @@ -161,7 +161,7 @@ IF(EMBED_MANIFESTS)
> ENDIF(NOT tmp_manifest)
> # Set the processor architecture.
> IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
> - SET(PROCESSOR_ARCH "X64")
> + SET(PROCESSOR_ARCH "amd64")
magnus: Interesting. ;)
> ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
> SET(PROCESSOR_ARCH "X86")
> ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
>
> --- 1.3/win/create_manifest.js 2007-06-01 16:48:22 -04:00
> +++ 1.4/win/create_manifest.js 2007-06-26 11:25:59 -04:00
> @@ -1,11 +1,10 @@
> /*
> manifest.js - Writes a custom XML manifest for each executable/library
> - 6 command line options must be supplied:
> + 5 command line options must be supplied:
> name - Name of the executable/library into which the mainfest will be
> embedded.
> version - Version of the executable
> arch - Architecture intended.
> - type - Application type.
> exe_level - Application execution level.
> [asInvoker|highestAvailable|requireAdministrator]
> outfile - Final destination where mainfest will be written.
> @@ -37,9 +36,6 @@ try
> case "arch":
> var app_arch= parts[1];
> break;
> - case "type":
> - var app_type= parts[1];
> - break;
> case "exe_level":
> var app_exe_level= parts[1];
> break;
> @@ -50,7 +46,7 @@ try
> WScript.echo("Invalid argument supplied.");
> }
> }
> - if (i != 6)
> + if (i != 5)
> throw new Error(1, "Incorrect number of arguments.");
>
> var manifest_xml= "<?xml version=\'1.0\' encoding=\'UTF-8\'
> standalone=\'yes\'?>\r\n";
> @@ -61,7 +57,7 @@ try
> manifest_xml+= " version=\'" + app_version + "\'";
> manifest_xml+= " processorArchitecture=\'" + app_arch + "\'";
> // TOADD - Add publicKeyToken attribute once we have Authenticode key.
> - manifest_xml+= " type=\'" + app_type + "\' />\r\n";
> + manifest_xml+= " type=\'win32\' />\r\n";
magnus: Always win32.
> // Identify the application security requirements.
> manifest_xml+= "\t<trustInfo
> xmlns=\'urn:schemas-microsoft-com:asm.v2\'>\r\n";
> manifest_xml+=
> "\t\t<security>\r\n\t\t\t<requestedPrivileges>\r\n\t\t\t\t";
>
> --- 1.1/win/mysql_manifest.cmake 2007-04-23 15:41:22 -04:00
> +++ 1.2/win/mysql_manifest.cmake 2007-06-26 11:25:59 -04:00
> @@ -9,7 +9,7 @@ MACRO(MYSQL_EMBED_MANIFEST _target_name
> TARGET ${_target_name}
> PRE_LINK
> COMMAND cscript.exe
> - ARGS "${PROJECT_SOURCE_DIR}/win/create_manifest.js" name=$(ProjectName)
> version=${VERSION} arch=${PROCESSOR_ARCH} type=$(PlatformName)
> exe_level=${_required_privs} outfile=$(IntDir)\\$(TargetFileName).intermediate.manifest
> + ARGS "${PROJECT_SOURCE_DIR}/win/create_manifest.js" name=$(ProjectName)
> version=${VERSION} arch=${PROCESSOR_ARCH} exe_level=${_required_privs}
> outfile=$(IntDir)\\$(TargetFileName).intermediate.manifest
> COMMENT "Generates the contents of the manifest contents.")
magnus: type=x removed
> ADD_CUSTOM_COMMAND(
> TARGET ${_target_name}
>
Patch approved.
