summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorBo Thorsen <bo@askmonty.org>2010-05-14 14:12:23 +0200
committerBo Thorsen <bo@askmonty.org>2010-05-14 14:12:23 +0200
commitfebb68f5ae6357995879d34af300ba7b641fdf33 (patch)
tree04cc53add325609ab7ceb34546bef2bddd869842 /win
parentfa18c9a80d9906ac307773679128a9413ff93eb3 (diff)
downloadmariadb-git-febb68f5ae6357995879d34af300ba7b641fdf33.tar.gz
Add a -nobuild argument to the script. Useful for building the zip file release with Express Edition which doesn't have the devenv command
Diffstat (limited to 'win')
-rw-r--r--win/make_mariadb_win_dist10
1 files changed, 6 insertions, 4 deletions
diff --git a/win/make_mariadb_win_dist b/win/make_mariadb_win_dist
index 9d0b3b26af3..67d23e55b8e 100644
--- a/win/make_mariadb_win_dist
+++ b/win/make_mariadb_win_dist
@@ -16,12 +16,14 @@ fi
set -x
-win/configure-mariadb.sh
+if [ "x_$1" != "x_-nobuild" ]; then
+ win/configure-mariadb.sh
-cmake -G "Visual Studio 9 2008"
+ cmake -G "Visual Studio 9 2008"
-devenv.com MySQL.sln /build RelWithDebInfo
-devenv.com MySQL.sln /build Debug
+ devenv.com MySQL.sln /build RelWithDebInfo
+ devenv.com MySQL.sln /build Debug
+fi
# TODO extract version number
VER=`cat configure.in |