database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#24732 Executables do not include Vista manifests

Browse Source 
- Corrected manifest attributes.


CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Use correct value for 64 built binaries.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Remove type attribute as the only valid value is win32.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Remove type attribute.
This commit is contained in:
unknown
2007-06-26 11:26:01 -04:00
parent 37344c68f5
commit f39d636a92
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -161,7 +161,7 @@ IF(EMBED_MANIFESTS)
ENDIF(NOT tmp_manifest) ENDIF(NOT tmp_manifest)
# Set the processor architecture. # Set the processor architecture.
IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
SET(PROCESSOR_ARCH "X64") SET(PROCESSOR_ARCH "amd64")
ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
SET(PROCESSOR_ARCH "X86") SET(PROCESSOR_ARCH "X86")
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

10
win/create_manifest.js
View File

@ -1,11 +1,10 @@
/* /*
manifest.js - Writes a custom XML manifest for each executable/library 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 name - Name of the executable/library into which the mainfest will be
embedded. embedded.
version - Version of the executable version - Version of the executable
arch - Architecture intended. arch - Architecture intended.
type - Application type.
exe_level - Application execution level. exe_level - Application execution level.
[asInvoker|highestAvailable|requireAdministrator] [asInvoker|highestAvailable|requireAdministrator]
outfile - Final destination where mainfest will be written. outfile - Final destination where mainfest will be written.
@ -37,9 +36,6 @@ try
case "arch": case "arch":
var app_arch= parts[1]; var app_arch= parts[1];
break; break;
case "type":
var app_type= parts[1];
break;
case "exe_level": case "exe_level":
var app_exe_level= parts[1]; var app_exe_level= parts[1];
break; break;
@ -50,7 +46,7 @@ try
WScript.echo("Invalid argument supplied."); WScript.echo("Invalid argument supplied.");
} }
} }
if (i != 6) if (i != 5)
throw new Error(1, "Incorrect number of arguments."); throw new Error(1, "Incorrect number of arguments.");
var manifest_xml= "<?xml version=\'1.0\' encoding=\'UTF-8\' standalone=\'yes\'?>\r\n"; 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+= " version=\'" + app_version + "\'";
manifest_xml+= " processorArchitecture=\'" + app_arch + "\'"; manifest_xml+= " processorArchitecture=\'" + app_arch + "\'";
// TOADD - Add publicKeyToken attribute once we have Authenticode key. // TOADD - Add publicKeyToken attribute once we have Authenticode key.
manifest_xml+= " type=\'" + app_type + "\' />\r\n"; manifest_xml+= " type=\'win32\' />\r\n";
// Identify the application security requirements. // Identify the application security requirements.
manifest_xml+= "\t<trustInfo xmlns=\'urn:schemas-microsoft-com:asm.v2\'>\r\n"; 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"; manifest_xml+= "\t\t<security>\r\n\t\t\t<requestedPrivileges>\r\n\t\t\t\t";

2
win/mysql_manifest.cmake
View File

@ -9,7 +9,7 @@ MACRO(MYSQL_EMBED_MANIFEST _target_name _required_privs)
TARGET ${_target_name} TARGET ${_target_name}
PRE_LINK PRE_LINK
COMMAND cscript.exe 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.") COMMENT "Generates the contents of the manifest contents.")
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET ${_target_name} TARGET ${_target_name}