Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (58b2851abffeebe2520c0fc2c7c17875ad6c9cfb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (58b2851abffeebe2520c0fc2c7c17875ad6c9cfb)
  • Date: Thu, 12 Oct 2006 13:44:21 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

database/mysql/BUILD | 29 ++++++++++++++++++++++++++++-
database/mysql/CONFIGURE | 20 +++++++++++++++++---
database/mysql/DEPENDS | 5 +++--
database/mysql/HISTORY | 6 ++++++
4 files changed, 54 insertions(+), 6 deletions(-)

New commits:
commit f9ce41423ecba26b55a9c16ef13c9f535532f376
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

database/mysql:

CONFIGURE: added engines selection
DEPENDS: changed db optional depends to depends only if BerkeleyDB
engine was selected
BUILD: added checks for selected engines to pass options to $OPTS

diff --git a/database/mysql/BUILD b/database/mysql/BUILD
index bd214de..c86789c 100755
--- a/database/mysql/BUILD
+++ b/database/mysql/BUILD
@@ -1,4 +1,31 @@
-OPTS="$MSQL_SERVER $MSQL_INNODB $MSQL_EMBED $OPTS" &&
+if list_find "$MSQL_ENGINES" "ARCHIVE" ; then
+ OPTS="--with-archive-storage-engine $OPTS"
+fi &&
+if ! list_find "$MSQL_ENGINES" "BerkeleyDB" ; then
+ OPTS="--without-berkeley-db $OPTS"
+fi &&
+if list_find "$MSQL_ENGINES" "BLACKHOLE" ; then
+ OPTS="--with-blackhole-storage-engine $OPTS"
+fi &&
+if list_find "$MSQL_ENGINES" "CSV" ; then
+ OPTS="--with-csv-storage-engine $OPTS"
+fi &&
+if list_find "$MSQL_ENGINES" "EXAMPLE" ; then
+ OPTS="--with-example-storage-engine $OPTS"
+fi &&
+if list_find "$MSQL_ENGINES" "FEDERATED" ; then
+ OPTS="--with-federated-storage-engine $OPTS"
+fi &&
+if list_find "$MSQL_ENGINES" "InnoDB" ; then
+ OPTS="--with-innodb $OPTS"
+else
+ OPTS="--without-innodb $OPTS"
+fi &&
+if list_find "$MSQL_ENGINES" "ndbcluster" ; then
+ OPTS="--with-ndbcluster $OPTS"
+fi &&
+
+OPTS="$MSQL_SERVER $MSQL_EMBED $OPTS" &&

create_account mysql &&

diff --git a/database/mysql/CONFIGURE b/database/mysql/CONFIGURE
index 08b89b7..a1fcd24 100755
--- a/database/mysql/CONFIGURE
+++ b/database/mysql/CONFIGURE
@@ -1,5 +1,19 @@
-config_query_option MSQL_SERVER "Install client only?" n
"--without-server" ""
-config_query_option MSQL_INNODB "Install Innodb Support?" y
"--with-innodb" ""
+source $GRIMOIRE/config_query_multi.function
&&
+
+config_query_option MSQL_SERVER "Install client only?" n
"--without-server" "" &&
+config_query_multi MSQL_ENGINES \
+ "What additional storage engines to build?" \
+ all \
+ ARCHIVE \
+ BerkeleyDB \
+ BLACKHOLE \
+ CSV \
+ EXAMPLE \
+ FEDERATED \
+ InnoDB \
+ ndbcluster &&
+if [[ "$MSQL_ENGINES"=="all" ]] ; then
+ MSQL_ENGINES="ARCHIVE BerkeleyDB BLACKHOLE CSV EXAMPLE FEDERATED InnoDB
ndbcluster"
+fi &&
config_query_option MSQL_EMBED "Build the embedded server (libmysqld)?" n
\
"--with-embedded-server" ""
-
diff --git a/database/mysql/DEPENDS b/database/mysql/DEPENDS
index 7d031cd..80659dc 100755
--- a/database/mysql/DEPENDS
+++ b/database/mysql/DEPENDS
@@ -3,5 +3,6 @@ depends perl &&
depends procps &&
depends g++ &&

-optional_depends db "--with-berkeley-db" "--without-berkeley-db" \
- "for Berkeley DB tables type support"
+if list_find "$MSQL_ENGINES" "BerkeleyDB" ; then
+ depends db "--with-berkeley-db"
+fi
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 75a4fc3..adeb716 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,9 @@
+2006-10-12 Pol Vinogradov <vin.public AT gmail.com>
+ * CONFIGURE: added engines selection
+ * DEPENDS: changed db optional depends to depends only if BerkeleyDB
+ engine was selected
+ * BUILD: added checks for selected engines to pass options to $OPTS
+
2006-10-09 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 5.0.26.




  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (58b2851abffeebe2520c0fc2c7c17875ad6c9cfb), Pol Vinogradov, 10/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page