maria-developers team mailing list archive

[Bo Thorsen <bo@xxxxxxxxxxxx>]

Hi all,

The attached patch adds a -64 keyword to the script 
make_mariadb_win_dist. With this patch, the script produces both 32 bit 
zip files (without any arguments) and 64 bit zip files (with -64). I 
also expanded it so it's possible to run it with "-nobuild -64" and a 
help text.

Kristian, when this patch is pushed, you can add a new buildbot slave 
based on the one that builds the 32 bit zip file and installer. Adding 
the -64 argument on the call to this script is the only thing necessary 
for buildbot to produce 64 bit binaries. The result files are named 
-win64 instead of -win32.

Ok to push this to 5.1?

Bo Thorsen.
Monty Program AB.

--

MariaDB: MySQL replacement
Community developed. Feature enhanced. Backward compatible.

=== modified file 'win/make_mariadb_win_dist'
--- win/make_mariadb_win_dist	2010-05-26 08:40:01 +0000
+++ win/make_mariadb_win_dist	2010-07-02 11:49:18 +0000
@@ -7,6 +7,12 @@
 
 set -e
 
+if [ "x_$1" == "-h" -o "x_$1" == "-help" -o "x_$1" == "--help" ]; then
+  echo "Usage: $0 [-64] [-nobuild]"
+  echo "-64: Build and pack 64 bit versions"
+  echo "-nobuild: Only package the zip file, don't build"
+fi
+
 if [ ! -d win/data ] ; then
   echo This doesnt seem to be source tarball. 
   echo This script should be run from the top directory of the source tarball 
@@ -16,10 +22,18 @@
 
 set -x
 
-if [ "x_$1" != "x_-nobuild" ]; then
+if [ "x_$1" == "x_-64" -o "x_$2" == "x_-64" ]; then
+  CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
+  ARCH="win64"
+else
+  CMAKE_GENERATOR="Visual Studio 9 2008"
+  ARCH="win32"
+fi
+
+if [ "x_$1" != "x_-nobuild" -a "x_$2" != "x_-nobuild" ]; then
   sh win/configure-mariadb.sh
 
-  cmake -G "Visual Studio 9 2008"
+  cmake -G "$CMAKE_GENERATOR"
 
   devenv.com MySQL.sln /build RelWithDebInfo
   devenv.com MySQL.sln /build Debug
@@ -35,12 +49,12 @@
 
 # We want the final zip to be named like this:
 #  mariadb-noinstall-5.1.38-win32.zip
-ZIPNAME=mariadb-noinstall-$VER_NO_MARIA-win32
+ZIPNAME=mariadb-noinstall-$VER_NO_MARIA-$ARCH
 ZIPFILE=$ZIPNAME.zip
 
 # The top directory inside the zip should be called like this:
-#  mariadb-5.1-38-win32
-ZIPCONTENT=mariadb-$VER_NO_MARIA-win32
+#  mariadb-5.1-38-$ARCH
+ZIPCONTENT=mariadb-$VER_NO_MARIA-$ARCH
 
 # This will make $ZIPCONTENT.zip
 sh -x scripts/make_win_bin_dist $ZIPCONTENT