diff options
author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-10 01:11:36 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-10 01:11:36 +0100 |
commit | e022fd8bf8d26238baf44ef703630e85a5b4c0a2 (patch) | |
tree | 1ca663b219ed7346ab8cc9e9fc9d61f1b0672f1b /win | |
parent | efebb398660194a0a2cf037e001756b91d7fc916 (diff) | |
download | mariadb-git-e022fd8bf8d26238baf44ef703630e85a5b4c0a2.tar.gz |
MDEV-33 : removed unused files in win/
Diffstat (limited to 'win')
-rw-r--r-- | win/build-vs10.bat | 18 | ||||
-rw-r--r-- | win/build-vs10_x64.bat | 18 | ||||
-rw-r--r-- | win/build_maria_release.bat | 47 | ||||
-rw-r--r-- | win/configure-mariadb.bat | 9 | ||||
-rw-r--r-- | win/configure-mariadb.sh | 22 | ||||
-rw-r--r-- | win/make_mariadb_win_dist | 132 |
6 files changed, 0 insertions, 246 deletions
diff --git a/win/build-vs10.bat b/win/build-vs10.bat deleted file mode 100644 index b67ac7e9753..00000000000 --- a/win/build-vs10.bat +++ /dev/null @@ -1,18 +0,0 @@ -@echo off - -REM Copyright (C) 2010 Monty Program AB -REM -REM This program is free software; you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation; version 2 of the License. -REM -REM This program is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -cmake -G "Visual Studio 10" - diff --git a/win/build-vs10_x64.bat b/win/build-vs10_x64.bat deleted file mode 100644 index f84e826ac65..00000000000 --- a/win/build-vs10_x64.bat +++ /dev/null @@ -1,18 +0,0 @@ -@echo off - -REM Copyright (C) 2010 Monty Program AB -REM -REM This program is free software; you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation; version 2 of the License. -REM -REM This program is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -cmake -G "Visual Studio 10 Win64" - diff --git a/win/build_maria_release.bat b/win/build_maria_release.bat deleted file mode 100644 index c5b1bb915c2..00000000000 --- a/win/build_maria_release.bat +++ /dev/null @@ -1,47 +0,0 @@ -set build_64_bit=
-set build_msi=
-set generator=
-set scriptdir=%~dp0
-
-:: Process all the arguments from the command line
-::
-:process_arguments
- if "%~1"=="" goto :do_work
- if "%~1"=="-h" goto :help
- if "%~1"=="-msi" set build_msi=1
- if "%~1"=="-G" set generator=-G "%~2"
- shift
- goto :process_arguments
-
-:help
- echo "build_maria_release [-h] [-msi] [-G <Generator>]"
-
-:die
- echo error occured.
- popd
- exit /b 1
-
-:do_work
-:: We're doing out-of-source build to ensure nobody has broken it:)
-
- pushd %scriptdir%
- cd ..
- rd /s /q xxx
- mkdir xxx
- cd xxx
-
- cmake .. -DWITH_EMBEDDED_SERVER=1 %generator%
- if %ERRORLEVEL% NEQ 0 goto :die
- cmake --build . --config Debug
- if %ERRORLEVEL% NEQ 0 goto :die
- cmake --build . --config RelWithDebInfo --target package
- if %ERRORLEVEL% NEQ 0 goto :die
-
-
- if "%build_msi%"=="1" (
- cmake --build . --config RelWithDebInfo --target win\packaging\msi
- if %ERRORLEVEL% NEQ 0 goto :die
- )
- xcopy /y *.zip ..
- xcopy /y *.msi ..
- popd
\ No newline at end of file diff --git a/win/configure-mariadb.bat b/win/configure-mariadb.bat deleted file mode 100644 index dc5b59819a3..00000000000 --- a/win/configure-mariadb.bat +++ /dev/null @@ -1,9 +0,0 @@ -cscript win\configure.js ^ - WITH_EXAMPLE_STORAGE_ENGINE ^ - WITH_FEDERATEDX_STORAGE_ENGINE ^ - WITH_MERGE_STORAGE_ENGINE ^ - WITH_PARTITION_STORAGE_ENGINE ^ - WITH_ARIA_STORAGE_ENGINE ^ - WITH_PBXT_STORAGE_ENGINE ^ - WITH_XTRADB_STORAGE_ENGINE ^ - WITH_FEEDBACK_STORAGE_ENGINE diff --git a/win/configure-mariadb.sh b/win/configure-mariadb.sh deleted file mode 100644 index 67bfe293639..00000000000 --- a/win/configure-mariadb.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# -# This script is the "standard" way to configure MariaDB on Windows. To be -# used by buildbot slaves and release build script. -# - -set -e - -cscript win/configure.js \ - WITH_ARCHIVE_STORAGE_ENGINE \ - WITH_BLACKHOLE_STORAGE_ENGINE \ - WITH_CSV_STORAGE_ENGINE \ - WITH_EXAMPLE_STORAGE_ENGINE \ - WITH_FEDERATEDX_STORAGE_ENGINE \ - WITH_MERGE_STORAGE_ENGINE \ - WITH_PARTITION_STORAGE_ENGINE \ - WITH_ARIA_STORAGE_ENGINE \ - WITH_PBXT_STORAGE_ENGINE \ - WITH_XTRADB_STORAGE_ENGINE \ - WITH_FEEDBACK_STORAGE_ENGINE \ - WITH_EMBEDDED_SERVER diff --git a/win/make_mariadb_win_dist b/win/make_mariadb_win_dist deleted file mode 100644 index f6d961ea866..00000000000 --- a/win/make_mariadb_win_dist +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh - -# -# This is a script that one needs to run in the source tarball to build -# a MariaDB release for Windows -# - -set -e - -usage() -{ -cat <<EOF -Usage: $0 [-h] [-64] [-nobuild] - -h, --help Show this help message. - -64 Build a 64 bit distribution. - -nobuild Don't run cmake and devenv, only do the packaging. - -The default is to the builds and create 32 bit packages. -EOF -} - - -if test -f win/build_maria_release.bat -then - cmd /c win\\build_maria_release.bat "$@" - exit $? -fi - -# The default settings -CMAKE_GENERATOR="Visual Studio 9 2008" -ARCH="win32" -RUNBUILD="yes" - -parse_options() -{ - while test $# -gt 0 - do - case "$1" in - -64) - CMAKE_GENERATOR="Visual Studio 9 2008 Win64" - ARCH="win64" - ;; - -nobuild) - RUNBUILD="no" - ;; - -h | --help) - usage - exit 0;; - *) - echo "Unknown option '$1'" - usage - exit 1;; - esac - shift - done -} - -######################################################################## - -if test ! -f sql/mysqld.cc -then - echo "You must run this script from the MySQL top-level directory" - exit 1 -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 - echo that was produced by 'make dist' - exit 1; -fi - -parse_options "$@" - -set -x - -if [ "$RUNBUILD" == "yes" ]; then - sh win/configure-mariadb.sh - - cmake -G "$CMAKE_GENERATOR" - - devenv.com MySQL.sln /build RelWithDebInfo - devenv.com MySQL.sln /build Debug -fi - -VER=`cat configure.in | - perl -e 'while (<>) { if (/^AC_INIT\(\[[a-zA-Z ]*\], *\[([0-9a-zA-Z\.-]+)\]/) { print "$1\n"; exit(0)} } ; exit 1'` - -echo Version string: $VER. - -# Remove '-mariaDB' from version number -VER_NO_MARIA=${VER/-MariaDB/} - -# We want the final zip to be named like this: -# mariadb-noinstall-5.1.38-win32.zip -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-$ARCH -ZIPCONTENT=mariadb-$VER_NO_MARIA-$ARCH - -# This will make $ZIPCONTENT.zip -sh -x scripts/make_win_bin_dist $ZIPCONTENT - -mv $ZIPCONTENT.zip $ZIPFILE - -#rm -rf unpack -#mkdir unpack - -#cd unpack -#wget -O base.list.gz \ -#http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz -#gunzip base.list.gz -#unzip ../$ZIPFILE -#(cd $ZIPCONTENT; /bin/find . | sort ) > new.list - -#diff -u base.list new.list || true -#RES=$? - -#cd .. - -#rm -rf unpack - -ls -lah $ZIPFILE -echo "$ZIPFILE is the Windows noinstall binary zip" - -#if [ $RES ] ; then -# echo "Archive contents differ from the standard file list, check the diff output above" -#else -# echo "Archive contents match the standard list, OK" -#fi |