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 
- Cleanup typo.
- Make sure to only embedded four part numberic version.


CMakeLists.txt:
  Bug #24732 Executables do not include Vista manifests
  - Correct typo in manifest detection logic.
win/create_manifest.js:
  Bug #24732 Executables do not include Vista manifests
  - Remove -* from the end of version string before embedding
  into manifest.
This commit is contained in:
unknown
2007-06-01 16:48:23 -04:00
parent 07c7cf1288
commit 97061f1b97
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -158,7 +158,7 @@ IF(EMBED_MANIFESTS)
STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS}) STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
IF(NOT tmp_manifest) IF(NOT tmp_manifest)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
ENDIF(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 "X64")

6
win/create_manifest.js
View File

@ -27,7 +27,11 @@ try
var app_name= parts[1]; var app_name= parts[1];
break; break;
case "version": case "version":
var app_version= parts[1]; var supp_version= parts[1];
// Clean up the supplied version string.
var end= supp_version.indexOf("-");
if (end == -1) end= supp_version.length;
var app_version= supp_version.substring(0, end);
app_version+= ".0"; app_version+= ".0";
break; break;
case "arch": case "arch":