Merge recycle.(none):/src/bug24732/my50-bug24732

into  recycle.(none):/src/bug24732/my51-bug24732


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~13:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged

.bzrignore

@@ -5,7 +5,6 @@
 *.bb
 *.bbg
 *.bin
-*.cmake
 *.core
 *.d
 *.da
@@ -32,6 +31,7 @@
 *.spec
 *.user
 *.vcproj
+*.vcproj.cmake
 */*.dir/*
 */*_pure_*warnings
 */.deps
@@ -394,6 +394,7 @@ client/tmp.diff
 client_debug/*
 client_release/*
 client_test
+cmake_install.cmake
 cmd-line-utils/libedit/.deps/chared.Po
 cmd-line-utils/libedit/.deps/common.Po
 cmd-line-utils/libedit/.deps/el.Po

win/create_manifest.js

+/* 
+  manifest.js - Writes a custom XML manifest for each executable/library
+  6 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.
+
+  Example:  
+  cscript manifest.js name=mysql version=5.0.32 arch=X86 type=win32 
+                      exe_level=asInvoker outfile=out.xml
+*/
+
+try 
+{
+  var args = WScript.Arguments
+  for (i=0; i < args.Count(); i++)
+  {
+    var parts = args.Item(i).split('=');
+    switch (parts[0])
+    {
+      case "name":
+           var app_name= parts[1];
+           break;
+      case "version":
+           var app_version= parts[1];
+           break;
+      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;
+      case "outfile":
+		   var manifest_file= parts[1];
+           break;
+	  default:
+	       WScript.echo("Invalid argument supplied.");
+    }
+  }
+  if (i != 6)
+    throw new Error(1, "Incorrect number of arguments.");
+
+  var manifest_xml= "<?xml version=\'1.0\' encoding=\'UTF-8\' standalone=\'yes\'?>\r\n";
+  manifest_xml+= "<assembly xmlns=\'urn:schemas-microsoft-com:asm.v1\'";
+  manifest_xml+= " manifestVersion=\'1.0\'>\r\n";
+  // Application Information 
+  manifest_xml+= "\t<assemblyIdentity name=\'" + app_name + "\'";
+  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";
+  // 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";
+  manifest_xml+= "<requestedExecutionLevel level=\'" + app_exe_level + "\'";
+  manifest_xml+= " uiAccess=\'false\'/>\r\n";
+  manifest_xml+= "\t\t\t</requestedPrivileges>\r\n\t\t</security>\r\n";
+  manifest_xml+= "\t</trustInfo>\r\n</assembly>\r\n";
+
+  // Write the valid XML to it's final destination.
+  var outfileXML = WScript.CreateObject("Msxml2.DOMDocument.3.0");
+  outfileXML.async = false;
+  if (!outfileXML.loadXML(manifest_xml))
+  {
+     WScript.Echo(manifest_xml);
+     throw new Error(2, "Invalid XML");
+  }
+  outfileXML.save(manifest_file);
+  
+  WScript.Echo("Success, created custom manifest!");
+  WScript.Quit(0);
+}
+catch (e)
+{
+    WScript.Echo("Error: " + e.description);
+	WScript.Quit(1);
+}

win/mysql_manifest.cmake

+
+# - MYSQL_EMBED_MANIFEST(target_name required_privs)
+# Create a manifest for target_name.  Set the execution level to require_privs
+#
+# NOTE. PROCESSOR_ARCH must be defined before this MACRO is called.
+
+MACRO(MYSQL_EMBED_MANIFEST _target_name _required_privs)
+  ADD_CUSTOM_COMMAND(
+    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
+    COMMENT "Generates the contents of the manifest contents.")
+  ADD_CUSTOM_COMMAND(
+    TARGET ${_target_name}
+    POST_BUILD
+    COMMAND mt.exe 
+    ARGS -nologo -manifest $(IntDir)\\$(TargetFileName).intermediate.manifest -outputresource:$(TargetPath) 
+    COMMENT "Embeds the manifest contents.")
+ENDMACRO(MYSQL_EMBED_MANIFEST)