Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (280e200e3cb49625363709b43d67972a5d6b4c3b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (280e200e3cb49625363709b43d67972a5d6b4c3b)
  • Date: Mon, 6 Nov 2006 15:08:13 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

database/firebird/BUILD | 15 ++++++++++++++-
database/firebird/CONFIGURE | 4 +---
database/firebird/DEPENDS | 3 ++-
database/firebird/DETAILS | 18 +++++++++---------
database/firebird/FINAL | 15 +++++++++------
database/firebird/HISTORY | 9 +++++++++
database/firebird/INSTALL | 8 ++++----
database/firebird/PREPARE | 5 +++--
database/firebird/PRE_BUILD | 8 ++++----
database/firebird/PRE_INSTALL | 3 +++
database/firebird/volatiles | 7 ++++---
11 files changed, 62 insertions(+), 33 deletions(-)

New commits:
commit 280e200e3cb49625363709b43d67972a5d6b4c3b
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

firebird - allow client only install

diff --git a/database/firebird/BUILD b/database/firebird/BUILD
index f9e391f..0eacac3 100755
--- a/database/firebird/BUILD
+++ b/database/firebird/BUILD
@@ -21,5 +21,18 @@ # prepare an install image
./install/makeInstallImage.sh
else
cd gen &&
- make -f Makefile.libfbclient
+ make includes &&
+ make -f Makefile.boot.gpre &&
+ make -f Makefile.libfbclient &&
+ make -f Makefile.client.isql &&
+ cd firebird &&
+ FBDEST=../buildroot${FB_PREFIX}/bin &&
+ mkdir -p $FBDEST &&
+ cp -a bin/isql $FBDEST &&
+ FBDEST=../buildroot${INSTALL_ROOT}/usr/lib &&
+ mkdir -p $FBDEST &&
+ cp -a lib/* $FBDEST &&
+ FBDEST=../buildroot${INSTALL_ROOT}/usr/include &&
+ mkdir -p $FBDEST &&
+ cp -a include/* $FBDEST
fi
diff --git a/database/firebird/CONFIGURE b/database/firebird/CONFIGURE
index 116a1a4..ce34f28 100755
--- a/database/firebird/CONFIGURE
+++ b/database/firebird/CONFIGURE
@@ -1,6 +1,4 @@
-persistent_add FB_CLIENT
-FB_CLIENT=n
-#config_query FB_CLIENT "Build only client library?" n
+config_query FB_CLIENT "Build only client library?" n
if [ $FB_CLIENT == n ]; then
config_query_option FB_SS "Build Superserver?" y "--enable-superserver" ""
fi
diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index 7f29a19..761b111 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -3,7 +3,8 @@ depends libtool &&
depends openssl &&
depends libmcrypt &&
depends ncurses &&
-if [ $FB_VER != stable ]; then
+if [ $FB_VERX != old ]; then
+#else
depends icu
fi &&
optional_depends libedit "--with-editline" "--without-editline" "for fancy
line editing"
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 67212b6..074f582 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,5 +1,5 @@
SPELL=firebird
-case $FB_VER in
+case $FB_VERX in
# cvs)
# VERSION=snapshot
# SOURCE=${SPELL}-$VERSION.tar.bz2
@@ -8,24 +8,24 @@ # SOURCE_URL[0]=$SFCVS/firebird:firebi
# SOURCE_IGNORE=volatile
# FORCE_DOWNLOAD=on
#;;
- devel)
- VERSION=2.0.0.12745-ReleaseCandidate5
- SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:cc91f5fe6dae8e18c2543c2a744b076234138a70eeb431c34462a2ae64dd25ffb75acfd485558664c8aeae7622b7279009e7f65f74309f047326f7b889b1f079
- SOURCE_URL[0]=http://www.firebirdsql.org/download/prerelease/$SOURCE
-;;
- *) #stable
+ old)
VERSION=1.5.3.4870

SOURCE_HASH=sha512:368380d720f381247a706ec93b41e81b9dde71f22280c52059dcf286554c3bf587214fae9c9b40266770147217a76c816cec1da43fe6ed92332474a41448a2c9
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
;;
+ *)
+ VERSION=2.0.0.12745-ReleaseCandidate5
+ SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:cc91f5fe6dae8e18c2543c2a744b076234138a70eeb431c34462a2ae64dd25ffb75acfd485558664c8aeae7622b7279009e7f65f74309f047326f7b889b1f079
+ SOURCE_URL[0]=http://www.firebirdsql.org/download/prerelease/$SOURCE
+;;
esac
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
WEB_SITE=http://www.firebirdsql.org
LICENSE=IDPL
ENTERED=20031111
- DOCS="doc/*"
+# DOCS="doc/*"
KEYWORDS="database engine"
SHORT="a very powerful relational dbms"
cat << EOF
diff --git a/database/firebird/FINAL b/database/firebird/FINAL
index 3f33b13..b22c218 100755
--- a/database/firebird/FINAL
+++ b/database/firebird/FINAL
@@ -2,7 +2,7 @@ if [ $FB_CLIENT == n ]; then

# we do this here, so that things are not tracked, as these files are
# constantly modified in normal use
-local FF FileName DB &&
+local FF FileName DB LCK &&

cd $FB_PREFIX &&
chown -R root:root $FB_PREFIX &&
@@ -29,13 +29,16 @@ # chown firebird:firebird $DB
# done &&

# create lock files
+ LCK=$INSTALL_ROOT/var/lock/firebird &&
+ mkdir -p $LCK &&
for FF in isc_init1 isc_lock1 isc_event1 isc_guard1
do
- FileName=$FF.`hostname`
- touch $FileName
- chown firebird:firebird $FileName
- chmod u+w $FileName
- done &&
+ FileName=$FF.`hostname` &&
+ touch $LCK/$FileName &&
+ chown firebird:firebird $LCK/$FileName &&
+ chmod u+w $LCK/$FileName &&
+ ln -sf $TRACK_ROOT/var/lock/firebird/$FileName ./
+ done &&

# log file
mkdir -p $INSTALL_ROOT/var/log/ &&
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index b361d74..6cd81ab 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,12 @@
+2006-10-29 Treeve Jelbert <treeve AT pi.be>
+ * PRE_BUILD, PREPARE, DEPENDS, DETAILS:
+ make version 2.0 the default, adjust all relevant tests
+ * volatiles; add firebird.conf
+ add ${INSTALL_ROOT} to all entries
+ * FINAL: create lock files in /var/lock/firebird and use symlinks
+ * BUILD, PRE_INSTALL: more work for library only build
+ * CONFIGURE: activate client only install
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT not INSTALL_ROOT when linking #9163

diff --git a/database/firebird/INSTALL b/database/firebird/INSTALL
index 9df3de6..e7d5bcd 100755
--- a/database/firebird/INSTALL
+++ b/database/firebird/INSTALL
@@ -1,7 +1,7 @@
-if [ $FB_CLIENT == n ]; then
+#if [ $FB_CLIENT == n ]; then
# install prebuilt tree
cp -ra $SOURCE_DIRECTORY/gen/buildroot/* /
-else
- message only install client library
+#else
+# message only install client library, header files and message database

-fi
+#fi
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index 318c183..633a749 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -7,12 +7,13 @@ cat <<EOF
After installing firebird, you should change the default password for the
SYSDBA user
by means of the script /usr/firebird/bin/changeDBAPassword.sh
EOF
-config_query_list FB_VER "which version to build?" stable devel
+config_query_list FB_VERX "which version to build?" new old

# warn of major changes
if spell_ok firebird;then
+ local FB_PREV
FB_PREV=`installed_version firebird | cut -d. -f-2`
- if [ $FB_PREV = 1.5 ] && [ $FB_VER != stable ];then
+ if [ $FB_PREV = 1.5 ] && [ $FB_VERX != old ];then
cat <<EOF
Firebird 2 includes ODS changes. So, backup anything you want to
keep, using gbak,
before uninstalling a previous Firebird version
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index ca88d64..61137ff 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -9,12 +9,12 @@ # remove supplied ICU & editline package
rm -rf extern &&
# fix for gcc4 and smgl issues
local PATCH &&
- case "$FB_VER" in
- devel)
- PATCH=fb2.patch.bz2
+ case "$FB_VERX" in
+ old)
+ PATCH=fb15.patch.bz2
;;
*)
- PATCH=fb15.patch.bz2
+ PATCH=fb2.patch.bz2
;;
esac &&
#apply patches
diff --git a/database/firebird/PRE_INSTALL b/database/firebird/PRE_INSTALL
index f65fb42..899d373 100755
--- a/database/firebird/PRE_INSTALL
+++ b/database/firebird/PRE_INSTALL
@@ -1,4 +1,6 @@
default_pre_install &&
+if [ $FB_CLIENT == n ]; then
+
local FF &&

cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX &&
@@ -9,3 +11,4 @@ # preserve some existing files
rm $FF
fi
done
+fi
diff --git a/database/firebird/volatiles b/database/firebird/volatiles
index 3913611..58bd88e 100644
--- a/database/firebird/volatiles
+++ b/database/firebird/volatiles
@@ -1,3 +1,4 @@
-/usr/firebird/security2.fdb
-/usr/firebird/security.fdb
-/usr/firebird/aliases.conf
+${INSTALL_ROOT}/usr/firebird/security2.fdb
+${INSTALL_ROOT}/usr/firebird/security.fdb
+${INSTALL_ROOT}/usr/firebird/aliases.conf
+${INSTALL_ROOT}/usr/firebird/firebird.conf



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (280e200e3cb49625363709b43d67972a5d6b4c3b), Treeve Jelbert, 11/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page