sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79392 by Treeve Jelbert for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79392 by Treeve Jelbert for review
Date: Tue, 16 May 2006 13:55:01 +0100 (BST)

Change 79392 by treeve_jelbert@treeve-knowhow on 2006/05/16 13:54:13

firebird-2.0.0.12654-ReleaseCandidate2

Affected files ...

... //sgl/grimoires/test/database/firebird/BUILD#8 integrate
... //sgl/grimoires/test/database/firebird/DEPENDS#7 integrate
... //sgl/grimoires/test/database/firebird/DETAILS#12 integrate
... //sgl/grimoires/test/database/firebird/FINAL#4 integrate
... //sgl/grimoires/test/database/firebird/HISTORY#22 integrate
... //sgl/grimoires/test/database/firebird/INSTALL#7 integrate
... //sgl/grimoires/test/database/firebird/PRE_INSTALL#1 branch
... //sgl/grimoires/test/database/firebird/init.d/firebird2#2 integrate

Differences ...

==== //sgl/grimoires/test/database/firebird/BUILD#8 (xtext) ====

@@ -1,4 +1,5 @@
- PREFIX=${INSTALL_ROOT}/usr/firebird &&
+ persistent_add FB_PREFIX &&
+ FB_PREFIX=${INSTALL_ROOT}/usr/firebird &&
OPTS="${OPTS} ${FB_SS}" &&
if spell_ok icu; then
ICU_FLAGS=`icu-config --ldflags-libsonly` &&
@@ -10,7 +11,7 @@
LDFLAGS="$LDFLAGS -lpthread" &&

./configure \
- --prefix=$PREFIX \
+ --prefix=$FB_PREFIX \
$OPTS &&
make &&
# prepare an install image

==== //sgl/grimoires/test/database/firebird/DEPENDS#7 (xtext) ====

@@ -1,11 +1,12 @@
-#depends gcc34 &&
depends g++ &&
depends libtool &&
depends openssl &&
depends libmcrypt &&
depends ncurses &&
if [ $FB_VER != stable ]; then
- depends CVS &&
depends icu
fi &&
+if [ $FB_VER == devel ]; then
+ depends CVS
+fi &&
optional_depends libedit "--with-editline" "--without-editline" "for fancy
line editing"

==== //sgl/grimoires/test/database/firebird/DETAILS#12 (xtext) ====

@@ -2,27 +2,18 @@
BUILD_API=2
case $FB_VER in
cvs)
- VERSION=T2_0_0_RC1
+ VERSION=HEAD
SOURCE=${SPELL}-$VERSION.tar.bz2
SFCVS=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot
SOURCE_URL[0]=$SFCVS/firebird:firebird2:$VERSION
SOURCE_IGNORE=volatile
-# FORCE_DOWNLOAD=on
+ FORCE_DOWNLOAD=on
;;
devel)
-# VERSION=na
-# /bin/echo no development version currently available!
-# return 1
- VERSION=T2_0_0_RC1
- SOURCE=${SPELL}-$VERSION.tar.bz2
- SFCVS=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot
- SOURCE_URL[0]=$SFCVS/firebird:firebird2:$VERSION
- SOURCE_IGNORE=volatile
-# FORCE_DOWNLOAD=on
-# SOURCE_HASH=sha512:
-# SOURCE=${SPELL}-${VERSION}.tar.bz2
-# SOURCE_URL[0]=http://www.firebirdsql.org/download/prerelease/$SOURCE
-# SOURCE_URL[1]=http://firebird.sourceforge.net/download/prerelease/$SOURCE
+ VERSION=2.0.0.12654-ReleaseCandidate2
+ SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:62cd5840fa7585a4076899b76cd9e7234a4684a8c3588d08f05258c7c7c4f9cef895807eb0363df294c249cff6a37abce857537e2d82d62c722fdf6c9f5fa099
+ SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
;;
*) #stable
VERSION=1.5.3.4870

==== //sgl/grimoires/test/database/firebird/FINAL#4 (xtext) ====

@@ -2,9 +2,9 @@
# constantly modified in normal use
local FF FileName DB &&

-cd $PREFIX &&
- chown -R root:root $PREFIX &&
- chmod -R uga-w $PREFIX &&
+cd $FB_PREFIX &&
+ chown -R root:root $FB_PREFIX &&
+ chmod -R uga-w $FB_PREFIX &&

cd bin &&

@@ -20,11 +20,11 @@
chown firebird:firebird security*.fdb &&
chmod 0600 security*.fdb &&
# all database should be owned by firebird
- for DB in `ls examples/*.fdb`
- do
- chmod ug+w $DB &&
- chown firebird:firebird $DB
- done &&
+# for DB in `ls examples/*.fdb`
+# do
+# chmod ug+w $DB &&
+# chown firebird:firebird $DB
+# done &&

# create lock files
for FF in isc_init1 isc_lock1 isc_event1 isc_guard1

==== //sgl/grimoires/test/database/firebird/HISTORY#22 (text) ====

@@ -1,3 +1,17 @@
+2006-05-16 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 2.0.0.12654-ReleaseCandidate2 (devel)
+ * DEPENDS: devel version no longer needs CVS
+ * PRE_INSTALL: added, to preserve some files (was in INSTALL)
+ * INSTALL: move some code to PRE_INSTALL
+ no longer create a symlink for libgds.so
+ * BUILD FINAL : use persistent FB_PREFIX
+ * FINAL: there are no example databases
+
+2006-04-28 Treeve Jelbert <treeve01 AT pi.be>
+ * init.d/firebird2: use pid for start/stop
+ as of rc2, preferred method of stopping is to kill the pid,
+ since it does not need knowledge of the password
+
2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: replaced 'gaze depends' call with
fast_up_depends, bug #10661

==== //sgl/grimoires/test/database/firebird/INSTALL#7 (xtext) ====

@@ -1,22 +1,2 @@
-local FF i FileName DB &&
-# new install script from here on
-
-# cd buildroot/${INSTALL_ROOT}/$PREFIX &&
- cd buildroot/$PREFIX &&
-# preserve some existing files
- for FF in `ls security*.fdb firebird.conf aliases.conf bin/*.sh`; do
- if [ -f $PREFIX/$FF ];then
- echo preserving file $FF
- rm $FF
- fi
- done &&
-
- cd $OLDPWD/buildroot/${INSTALL_ROOT} &&
-
- cp -rd * ${INSTALL_ROOT}/ &&
-
- cd $PREFIX/lib &&
-
-# make a symlink for use by old programs
- ln -sf libfbclient.so libgds.so &&
- cd ..
+# install prebuilt tree
+cp -ra $SOURCE_DIRECTORY/gen/buildroot/* /

==== //sgl/grimoires/test/database/firebird/init.d/firebird2#2 (xtext) ====

@@ -4,12 +4,13 @@
#
# This file belongs in /etc/init.d where it will be run
# on system startup and shutdown to start the background
-# Firebird database Super server daemon
+# Firebird2 database Super server daemon

-ISC_USER=SYSDBA
-ISC_PASSWORD=masterkey
FB=/usr/firebird/bin/fbmgr.bin
+# as of rc2, preferred method of stoppng is to kill the pid
+RUND=/var/run/firebird
+PID=$RUND/`basename $0`.pid

source /etc/init.d/smgl_functions

@@ -20,18 +21,19 @@
case $1 in
start)
echo "Starting Firebird Super Server"
- mkdir -p /var/run/firebird
- chown firebird:firebird /var/run/firebird
- su -l "firebird" -s /bin/sh -m -c "$FB -start -forever"
+ mkdir -p $RUND
+ chown firebird:firebird $RUND
+ su -l "firebird" -s /bin/sh -m \
+ -c "$FB -start -forever -pidfile $PID"
evaluate_retval
;;
stop)
echo "Stopping Firebird server"
- $FB -shut
+ kill `cat $PID`
evaluate_retval
;;

- restart|reload)
+ restart)
echo "Restarting Firebird server"
$0 stop
$0 start

[SM-Commit] PERFORCE change 79392 by Treeve Jelbert for review, Perforce Review Daemon, 05/16/2006