bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4150 to 4151)

[Dyre Tjeldvoll]

 4151 Dyre Tjeldvoll	2013-01-10
      Only bundle a custom Python when building msi so that zips have the full Python needed for running unit tests

    modified:
      storage/ndb/mcc/CMakeLists.txt
 4150 Dyre Tjeldvoll	2013-01-10
      Better handling of 404 and 500 errors

    modified:
      storage/ndb/mcc/request_handler.py
=== modified file 'storage/ndb/mcc/CMakeLists.txt'
--- a/storage/ndb/mcc/CMakeLists.txt	2013-01-04 12:57:09 +0000
+++ b/storage/ndb/mcc/CMakeLists.txt	2013-01-10 12:47:36 +0000
@@ -110,7 +110,17 @@ if(WIN32 AND MCC_PYTHON_TO_BUNDLE)
   endif(BUNDLEPY_EXE)
   # Install the python dir regardless of tests so that win packages can
   # be built on other platforms
-  INCLUDE(python.cmake)
+  if($ENV{WIXSOURCE})
+    message("Bundling custom Python for Wix")
+    # Add a custom python when building msi to avoid path problems
+    INCLUDE(python.cmake)
+  else()
+    # Include the whole Python installation when building the zip as 
+    # it is used to run the unit tests.
+    message("Bundling full Python")
+    install(DIRECTORY "${MCC_PYTHON_TO_BUNDLE}"
+      DESTINATION "${MCC_INSTALL_SUBDIR}/Python")
+  endif()
   
   FILE(TO_NATIVE_PATH "${MCC_INSTALL_SUBDIR}/Python" MCC_PY_INSTALL_DIR)
   # Create setup.bat and setup-debug.bat with suitable content

No bundle (reason: useless for push emails).