diff options
author | unknown <konstantin@mysql.com> | 2005-05-18 15:23:29 +0400 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2005-05-18 15:23:29 +0400 |
commit | 9b2e0ed5d2ed5bcdd9f19ad9f81f8da27316adba (patch) | |
tree | 52f9eb17f30c9c21cde3075655335f314ba7ad91 /BUILD | |
parent | afaa3c8923288aaaa41f8f519bbc96f3b72b1d50 (diff) | |
download | mariadb-git-9b2e0ed5d2ed5bcdd9f19ad9f81f8da27316adba.tar.gz |
Remove automatically generated autotools files from revision control.
Fix build scripts to create them.
BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
Delete: config.guess
BitKeeper/deleted/.del-config.sub~d18f703b655db258:
Delete: config.sub
BitKeeper/deleted/.del-depcomp~d5c35239e36674f1:
Delete: depcomp
BitKeeper/deleted/.del-install-sh~ddc86c88a9bebd00:
Delete: install-sh
BitKeeper/deleted/.del-ltconfig~6d12dc759ce40830:
Delete: ltconfig
BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
Delete: ltmain.sh
BitKeeper/deleted/.del-missing~3fe9ea908d3a7caa:
Delete: missing
BitKeeper/deleted/.del-mkinstalldirs~fa914ace602e1447:
Delete: mkinstalldirs
BUILD/FINISH.sh:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-ccc:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-cxx:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-debug:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-hpux11-parisc2-aCC:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-ia64-debug-max:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-irix-mips64-mipspro:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-pentium-pgcc:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-debug:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-forte:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-purify:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BitKeeper/etc/ignore:
Added config.guess config.sub install-sh ltmain.sh missing to the ignore list
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD/FINISH.sh | 14 | ||||
-rwxr-xr-x | BUILD/autorun.sh | 15 | ||||
-rwxr-xr-x | BUILD/compile-alpha-ccc | 4 | ||||
-rwxr-xr-x | BUILD/compile-alpha-cxx | 4 | ||||
-rwxr-xr-x | BUILD/compile-alpha-debug | 4 | ||||
-rwxr-xr-x | BUILD/compile-hpux11-parisc2-aCC | 9 | ||||
-rwxr-xr-x | BUILD/compile-ia64-debug-max | 9 | ||||
-rwxr-xr-x | BUILD/compile-irix-mips64-mipspro | 9 | ||||
-rwxr-xr-x | BUILD/compile-pentium-pgcc | 10 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc | 11 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-debug | 9 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-forte | 9 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-purify | 6 |
13 files changed, 46 insertions, 67 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 01e58b0ee1c..8cd78bf4165 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -7,17 +7,9 @@ commands="\ $make -k distclean || true /bin/rm -rf */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache; -aclocal || (echo \"Can't execute aclocal\" && exit 1) -autoheader || (echo \"Can't execute autoheader\" && exit 1) -aclocal || (echo \"Can't execute aclocal\" && exit 1) -automake || (echo \"Can't execute automake\" && exit 1) -autoconf || (echo \"Can't execute autoconf\" && exit 1) -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -if [ -d gemini ] -then - (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) -fi" + +path=`dirname $0` +. \"$path/autorun.sh\"" if [ -z "$just_clean" ] then diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh new file mode 100755 index 00000000000..7daed25e56c --- /dev/null +++ b/BUILD/autorun.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# Create MySQL autotools infrastructure + +aclocal || (echo "Can't execute aclocal" && exit 1) +autoheader || (echo "Can't execute autoheader" && exit 1) +# --force means overwrite ltmain.sh script if it already exists +libtoolize --automake --force \ + || (echo "Can't execute libtoolize" && exit 1) +# --add-missing instructs automake to install missing auxiliary files +# and --force to overwrite them if they already exist +automake --add-missing --force \ + || (echo "Can't execute automake" && exit 1) +autoconf || (echo "Can't execute autoconf" && exit 1) +(cd bdb/dist && sh s_all) +(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-alpha-ccc b/BUILD/compile-alpha-ccc index 48cc0857cbf..889592295b5 100755 --- a/BUILD/compile-alpha-ccc +++ b/BUILD/compile-alpha-ccc @@ -2,7 +2,9 @@ make -k clean /bin/rm -f */.deps/*.P */*.o /bin/rm -f config.cache mysql-*.tar.gz -aclocal; autoheader; aclocal; automake; autoconf + +path=`dirname $0` +. "$path/autorun.sh" CC=ccc CFLAGS="-fast -O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mcpu=ev6 -Wa,-mev6" CXXLDFLAGS='/usr/lib/compaq/libots-2.2.7/libots.so /usr/lib/compaq/cpml-5.0.0/libcpml_ev6.a' ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client make diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx index a342d927868..c49846fd964 100755 --- a/BUILD/compile-alpha-cxx +++ b/BUILD/compile-alpha-cxx @@ -2,7 +2,9 @@ make -k clean /bin/rm -f */.deps/*.P */*.o /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz -aclocal; autoheader; aclocal; automake; autoconf + +path=`dirname $0` +. "$path/autorun.sh" CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug index 60d1b9af659..113c2151461 100755 --- a/BUILD/compile-alpha-debug +++ b/BUILD/compile-alpha-debug @@ -2,7 +2,9 @@ make -k clean /bin/rm -f */.deps/*.P */*.o /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz -aclocal; autoheader; aclocal; automake; autoconf + +path=`dirname $0` +. "$path/autorun.sh" CFLAGS=-O1 CC=gcc CXX=gcc CXXFLAGS="-O1 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug --with-extra-charsets=complex --without-extra-tools make diff --git a/BUILD/compile-hpux11-parisc2-aCC b/BUILD/compile-hpux11-parisc2-aCC index 2fc7a6d2b6e..c286488bb26 100755 --- a/BUILD/compile-hpux11-parisc2-aCC +++ b/BUILD/compile-hpux11-parisc2-aCC @@ -62,14 +62,9 @@ done set -x make distclean -aclocal -autoheader -libtoolize --automake --force -automake --force --add-missing -autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +path=`dirname $0` +. "$path/autorun.sh" CC=cc CXX=aCC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \ ./configure --prefix=/usr/local/mysql --disable-shared \ diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max index 56c36059ea9..5082844f088 100755 --- a/BUILD/compile-ia64-debug-max +++ b/BUILD/compile-ia64-debug-max @@ -1,13 +1,8 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache -aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -if [ -d gemini ] -then - (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) -fi +path=`dirname $0` +. "$path/autorun.sh" CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine gmake diff --git a/BUILD/compile-irix-mips64-mipspro b/BUILD/compile-irix-mips64-mipspro index 1987fa13b1f..0cebb4b9f5b 100755 --- a/BUILD/compile-irix-mips64-mipspro +++ b/BUILD/compile-irix-mips64-mipspro @@ -34,14 +34,9 @@ fi set -x make distclean -aclocal -autoheader -libtoolize --automake --force -automake --force --add-missing -autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +path=`dirname $0` +. "$path/autorun.sh" # C options: # -apo - auto-parallize for multiprocessors (implies -mp) diff --git a/BUILD/compile-pentium-pgcc b/BUILD/compile-pentium-pgcc index 2d806009b21..639f108bb2b 100755 --- a/BUILD/compile-pentium-pgcc +++ b/BUILD/compile-pentium-pgcc @@ -2,13 +2,9 @@ AM_MAKEFLAGS="-j 2" gmake -k clean || true /bin/rm -f */.deps/*.P config.cache -aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -if [ -d gemini ] -then - (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) -fi + +path=`dirname $0` +. "$path/autorun.sh" export PATH=/usr/local/pgcc/bin:$PATH CFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O6 -mpentiumpro -fomit-frame-pointer -mstack-align-double" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O6 -fomit-frame-pointer -mpentiumpro -mstack-align-double" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc index 143a4b7867d..0c05bf8a101 100755 --- a/BUILD/compile-solaris-sparc +++ b/BUILD/compile-solaris-sparc @@ -3,14 +3,9 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache -aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -if [ -d gemini ] -then - (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) -fi - +path=`dirname $0` +. "$path/autorun.sh" + CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client gmake -j 4 diff --git a/BUILD/compile-solaris-sparc-debug b/BUILD/compile-solaris-sparc-debug index 527f135ac62..3384b623ccb 100755 --- a/BUILD/compile-solaris-sparc-debug +++ b/BUILD/compile-solaris-sparc-debug @@ -3,13 +3,8 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache -aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -if [ -d gemini ] -then - (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) -fi +path=`dirname $0` +. "$path/autorun.sh" CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte index afd106afc67..7cdbff6ae4a 100755 --- a/BUILD/compile-solaris-sparc-forte +++ b/BUILD/compile-solaris-sparc-forte @@ -3,13 +3,8 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache -aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -if [ -d gemini ] -then - (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) -fi +path=`dirname $0` +. "$path/autorun.sh" # Assume Forte is installed in /opt/SUNWSpro diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify index 41ecd4ed530..29cf5671432 100755 --- a/BUILD/compile-solaris-sparc-purify +++ b/BUILD/compile-solaris-sparc-purify @@ -33,9 +33,9 @@ done gmake -k clean || true /bin/rm -f */.deps/*.P config.cache -aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) + +path=`dirname $0` +. "$path/autorun.sh" CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS |