From: Dyre Tjeldvoll Date: January 11 2013 9:07am Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4151 to 4152) List-Archive: http://lists.mysql.com/commits/145596 Message-Id: <20130111090703.9720.39405.4152@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4152 Dyre Tjeldvoll 2013-01-11 Add trailing slash to Python path so that last pythonXY component is stripped off modified: storage/ndb/mcc/CMakeLists.txt 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 === modified file 'storage/ndb/mcc/CMakeLists.txt' --- a/storage/ndb/mcc/CMakeLists.txt 2013-01-10 12:47:36 +0000 +++ b/storage/ndb/mcc/CMakeLists.txt 2013-01-11 09:06:36 +0000 @@ -118,7 +118,7 @@ if(WIN32 AND MCC_PYTHON_TO_BUNDLE) # 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}" + install(DIRECTORY "${MCC_PYTHON_TO_BUNDLE}/" DESTINATION "${MCC_INSTALL_SUBDIR}/Python") endif() No bundle (reason: useless for push emails).