diff options
author | unknown <guilhem@mysql.com> | 2005-04-27 22:46:20 +0200 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2005-04-27 22:46:20 +0200 |
commit | 613ad2f6a7670a6d6d5e316d1fc9837429e18d8b (patch) | |
tree | e49715372a12c862bb99b53c2518c0889de855a9 | |
parent | ca7501e893406fb67787c98551773af1503cb292 (diff) | |
download | mariadb-git-613ad2f6a7670a6d6d5e316d1fc9837429e18d8b.tar.gz |
update of BUILD/* scripts to storage/ directory structure (they didn't work anymore)
BUILD/FINISH.sh:
update to storage/ directory structure
BUILD/compile-alpha-cxx:
update to storage/ directory structure
BUILD/compile-alpha-debug:
update to storage/ directory structure
BUILD/compile-dist:
update to storage/ directory structure
BUILD/compile-hpux11-parisc2-aCC:
update to storage/ directory structure
BUILD/compile-ia64-debug-max:
update to storage/ directory structure
BUILD/compile-irix-mips64-mipspro:
update to storage/ directory structure
BUILD/compile-pentium-pgcc:
update to storage/ directory structure
BUILD/compile-solaris-sparc-debug:
update to storage/ directory structure
BUILD/compile-solaris-sparc-forte:
update to storage/ directory structure
BUILD/compile-solaris-sparc:
update to storage/ directory structure
BUILD/compile-solaris-sparc-purify:
update to storage/ directory structure
-rw-r--r-- | BUILD/FINISH.sh | 6 | ||||
-rwxr-xr-x | BUILD/compile-alpha-cxx | 2 | ||||
-rwxr-xr-x | BUILD/compile-alpha-debug | 2 | ||||
-rwxr-xr-x | BUILD/compile-dist | 4 | ||||
-rwxr-xr-x | BUILD/compile-hpux11-parisc2-aCC | 4 | ||||
-rwxr-xr-x | BUILD/compile-ia64-debug-max | 6 | ||||
-rwxr-xr-x | BUILD/compile-irix-mips64-mipspro | 4 | ||||
-rwxr-xr-x | BUILD/compile-pentium-pgcc | 4 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc | 4 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-debug | 4 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-forte | 4 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-purify | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 81defaa7f52..ae0518c150d 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -11,15 +11,15 @@ done 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; +/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache storage/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) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx index a342d927868..c6344b1bbe4 100755 --- a/BUILD/compile-alpha-cxx +++ b/BUILD/compile-alpha-cxx @@ -1,7 +1,7 @@ /bin/rm -f */.deps/*.P */*.o 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 +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz aclocal; autoheader; aclocal; automake; autoconf 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..03497f423dd 100755 --- a/BUILD/compile-alpha-debug +++ b/BUILD/compile-alpha-debug @@ -1,7 +1,7 @@ /bin/rm -f */.deps/*.P */*.o 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 +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz aclocal; autoheader; aclocal; automake; autoconf 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 diff --git a/BUILD/compile-dist b/BUILD/compile-dist index 7c177f54258..248f4bb04ce 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -12,8 +12,8 @@ autoheader libtoolize --automake --force --copy automake --force --add-missing --copy autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) # Default to gcc for CC and CXX if test -z "$CXX" ; then diff --git a/BUILD/compile-hpux11-parisc2-aCC b/BUILD/compile-hpux11-parisc2-aCC index 2fc7a6d2b6e..b309efb21b6 100755 --- a/BUILD/compile-hpux11-parisc2-aCC +++ b/BUILD/compile-hpux11-parisc2-aCC @@ -68,8 +68,8 @@ libtoolize --automake --force automake --force --add-missing autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) 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..9e1628a3641 100755 --- a/BUILD/compile-ia64-debug-max +++ b/BUILD/compile-ia64-debug-max @@ -1,9 +1,9 @@ gmake -k clean || true -/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-irix-mips64-mipspro b/BUILD/compile-irix-mips64-mipspro index 1987fa13b1f..3b5f5519442 100755 --- a/BUILD/compile-irix-mips64-mipspro +++ b/BUILD/compile-irix-mips64-mipspro @@ -40,8 +40,8 @@ libtoolize --automake --force automake --force --add-missing autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) # C options: # -apo - auto-parallize for multiprocessors (implies -mp) diff --git a/BUILD/compile-pentium-pgcc b/BUILD/compile-pentium-pgcc index 2d806009b21..1ba0d9562ba 100755 --- a/BUILD/compile-pentium-pgcc +++ b/BUILD/compile-pentium-pgcc @@ -3,8 +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) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc index 143a4b7867d..43c7e673f5d 100755 --- a/BUILD/compile-solaris-sparc +++ b/BUILD/compile-solaris-sparc @@ -4,8 +4,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) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc-debug b/BUILD/compile-solaris-sparc-debug index 527f135ac62..d0a431d22d6 100755 --- a/BUILD/compile-solaris-sparc-debug +++ b/BUILD/compile-solaris-sparc-debug @@ -4,8 +4,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) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte index afd106afc67..185b14a9e24 100755 --- a/BUILD/compile-solaris-sparc-forte +++ b/BUILD/compile-solaris-sparc-forte @@ -4,8 +4,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) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify index 41ecd4ed530..c2703117770 100755 --- a/BUILD/compile-solaris-sparc-purify +++ b/BUILD/compile-solaris-sparc-purify @@ -34,8 +34,8 @@ 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) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) 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 |