bk commit into 5.0 tree (iggy:1.2505) BUG#24732

[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-01 16:48:23-04:00, iggy@amd64.(none) +2 -0
  Bug #24732 Executables do not include Vista manifests
  - Cleanup typo.
  - Make sure to only embedded four part numberic version.

  CMakeLists.txt@stripped, 2007-06-01 16:48:22-04:00, iggy@amd64.(none) +1 -1
    Bug #24732 Executables do not include Vista manifests
    - Correct typo in manifest detection logic.

  win/create_manifest.js@stripped, 2007-06-01 16:48:22-04:00, iggy@amd64.(none) +5 -1
    Bug #24732 Executables do not include Vista manifests
    - Remove -* from the end of version string before embedding
    into manifest.

# 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.13/CMakeLists.txt	2007-05-04 03:37:49 -04:00
+++ 1.14/CMakeLists.txt	2007-06-01 16:48:22 -04:00
@@ -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") 

--- 1.2/win/create_manifest.js	2007-05-15 10:30:09 -04:00
+++ 1.3/win/create_manifest.js	2007-06-01 16:48:22 -04:00
@@ -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":