sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79870 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 79870 by Treeve Jelbert for review
Date: Fri, 26 May 2006 21:15:01 +0100 (BST)

Change 79870 by treeve_jelbert@treeve-knowhow on 2006/05/26 21:14:33

odbcjdbc - only support one version

Affected files ...

... //sgl/grimoires/devel/database/odbcjdbc/BUILD#3 edit
... //sgl/grimoires/devel/database/odbcjdbc/DETAILS#25 edit
... //sgl/grimoires/devel/database/odbcjdbc/HISTORY#30 edit
... //sgl/grimoires/devel/database/odbcjdbc/INSTALL#3 edit
... //sgl/grimoires/devel/database/odbcjdbc/PREPARE#2 delete
... //sgl/grimoires/devel/database/odbcjdbc/PRE_BUILD#3 edit
... //sgl/grimoires/devel/database/odbcjdbc/gcc.diff#2 delete

Differences ...

==== //sgl/grimoires/devel/database/odbcjdbc/BUILD#3 (xtext) ====

@@ -1,13 +1,3 @@
-if [ "$WHICH" == "stable" ]; then
- patch -p1 < ${SPELL_DIRECTORY}/gcc.diff
-fi &&
-if [ "$WHICH" == "devel" ]; then
- cd OdbcJdbc
-fi &&
- sedit "s|d:/Firebird|/usr/firebird|" Builds/makefile.environ &&
- cd Builds/Gcc.lin &&
-# can't use patch because file in msdos format
- sed -i "s|-g |-DPIC -fPIC $CFLAGS |;s|/opt|/usr|;s|/odbc||;s|-sh|$LDFLAGS
-sh|" \
- makefile.linux &&

- make -f makefile.linux
+cd $SOURCE_DIRECTORY/OdbcJdbc/Builds/Gcc.lin &&
+make -f makefile.linux

==== //sgl/grimoires/devel/database/odbcjdbc/DETAILS#25 (xtext) ====

@@ -3,34 +3,13 @@
SPELLX=OdbcJdbc
BUILD_API=2
WEB_SITE=http://www.ibphoenix.com
-case $WHICH in
- cvs)
- VERSION=v1-3-0
- SOURCE=${SPELLX}-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-$VERSION
-
SFCVS=cvs://:pserver:anonymous AT odbcjdbc.cvs.sourceforge.net:/cvsroot
- SOURCE_URL[0]=$SFCVS/firebird:$SPELLX:$VERSION
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-;;
- stable)
- VERSION=1-2-1
- SOURCE=${SPELLX}\_Source-${VERSION}.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}
- SOURCE_URL[0]=$WEB_SITE/downloads/$SOURCE
-
SOURCE_HASH=sha512:b5ae32ad1d18f705b249a1a7cfce1f359721705dc9c5c53b1130493aa4fa1946788f49600e4f2212bbd40a5101effc44542298c6952cfd82dae40a08e180ac7a
-;;
- devel)
VERSION=beta-2.0.0130

SOURCE_HASH=sha512:36c003e7ee8935b29195724a87c3b70f1cd54a417b0bd63114f2d778035203c8f320fe975aa7a2f278b3fa3a9ab169f3714cc517677e43d51b74d71dd510c575
SOURCE=${SPELLX}-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ODBC\_V2-0-BETA
SOURCE_URL[0]=http://www.praktik.km.ua/downloads/$SOURCE
-;;
-esac
LICENSE=IDPL
ENTERED=20031205
- UPDATED=20040302
DOCS="ChangeLog Install/HtmlHelp/*"
KEYWORDS="firebird database"
SHORT="OBDC/JDBC driver for Firebird database"

==== //sgl/grimoires/devel/database/odbcjdbc/HISTORY#30 (text) ====

@@ -1,6 +1,9 @@
2006-05-26 Treeve Jelbert <treeve01 AT pi.be>
- * DETAILS: fix CVS address
- bug #11880
+ remove cvs support - bug #11880
+ * DETAILS: remove cvs support
+ * PREPARE, gcc.diff: delete
+ * BUILD, PRE_BUILD: move patching to PRE_BUILD
+ * INSTALL: add a 'cd'

2006-04-19 Treeve Jelbert <treeve01 AT pi.be>
* DEPENDS: add firebird

==== //sgl/grimoires/devel/database/odbcjdbc/INSTALL#3 (xtext) ====

@@ -1,3 +1,4 @@
+ cd $SOURCE_DIRECTORY/OdbcJdbc &&
cp Release/*.so ${INSTALL_ROOT}/usr/lib &&
cd ${INSTALL_ROOT}/usr/lib &&
ln -sf libIscDbc.so* IscDbc

==== //sgl/grimoires/devel/database/odbcjdbc/PRE_BUILD#3 (xtext) ====

@@ -1,7 +1,7 @@
-if [[ "$WHICH" == "stable" ]]; then
- mk_source_dir $SOURCE_DIRECTORY &&
- cd $SOURCE_DIRECTORY &&
- unpack_file
-else
- default_pre_build
-fi
+ default_pre_build &&
+ cd $SOURCE_DIRECTORY/OdbcJdbc &&
+sedit "s|d:/Firebird|/usr/firebird|" Builds/makefile.environ &&
+ cd Builds/Gcc.lin &&
+# can't use patch because file in msdos format
+ sed -i "s|-g |-DPIC -fPIC $CFLAGS |;s|/opt|/usr|;s|/odbc||;s|-sh|$LDFLAGS
-sh|" \
+ makefile.linux

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