diff options
| author | unknown <iggy@amd64.(none)> | 2007-06-01 16:48:23 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2007-06-01 16:48:23 -0400 |
| commit | 97061f1b9788c5e9130bd68e46b0ab4d021a2bd3 (patch) | |
| tree | 1ba19fcaca29cd12950988feeb7916a9567bc802 | |
| parent | 07c7cf12881759665baf90ba4f3f6c499b9fc780 (diff) | |
| download | mariadb-git-97061f1b9788c5e9130bd68e46b0ab4d021a2bd3.tar.gz | |
Bug #24732 Executables do not include Vista manifests
- 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.
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | win/create_manifest.js | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 890ee2676e8..54df0befad9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ IF(EMBED_MANIFESTS) STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS}) IF(NOT tmp_manifest) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") - ENDIF(tmp_manifest) + ENDIF(NOT tmp_manifest) # Set the processor architecture. IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") SET(PROCESSOR_ARCH "X64") diff --git a/win/create_manifest.js b/win/create_manifest.js index ac62cb2a8c2..520ecec21b8 100755 --- a/win/create_manifest.js +++ b/win/create_manifest.js @@ -27,7 +27,11 @@ try var app_name= parts[1]; break; 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"; break; case "arch": |