[Commits] Rev 3212: MDEV-33 : removed unused files in win/ in file:///H:/bzr/5.5/

Vladislav Vaintroub wlad at montyprogram.com
Tue Jan 10 02:12:08 EET 2012


At file:///H:/bzr/5.5/

------------------------------------------------------------
revno: 3212
revision-id: wlad at montyprogram.com-20120110001136-j4to4qn5jyd2i8p4
parent: wlad at montyprogram.com-20120109201534-pwebre388ju5yf3h
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.5
timestamp: Tue 2012-01-10 01:11:36 +0100
message:
  MDEV-33 : removed unused files in win/
-------------- next part --------------
=== removed file 'win/build-vs10.bat'
--- a/win/build-vs10.bat	2011-05-03 16:10:10 +0000
+++ b/win/build-vs10.bat	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
- at 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"
-

=== removed file 'win/build-vs10_x64.bat'
--- a/win/build-vs10_x64.bat	2011-05-03 16:10:10 +0000
+++ b/win/build-vs10_x64.bat	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
- at 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"
-

=== removed file 'win/build_maria_release.bat'
--- a/win/build_maria_release.bat	2011-01-29 17:51:12 +0000
+++ b/win/build_maria_release.bat	1970-01-01 00:00:00 +0000
@@ -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

=== removed file 'win/configure-mariadb.bat'
--- a/win/configure-mariadb.bat	2011-10-11 10:55:42 +0000
+++ b/win/configure-mariadb.bat	1970-01-01 00:00:00 +0000
@@ -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

=== removed file 'win/configure-mariadb.sh'
--- a/win/configure-mariadb.sh	2011-10-06 22:18:30 +0000
+++ b/win/configure-mariadb.sh	1970-01-01 00:00:00 +0000
@@ -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

=== removed file 'win/make_mariadb_win_dist'
--- a/win/make_mariadb_win_dist	2011-01-29 17:51:12 +0000
+++ b/win/make_mariadb_win_dist	1970-01-01 00:00:00 +0000
@@ -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



More information about the commits mailing list