Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ff23ee7e451cbe8c187038bf84c29b1e89be4816)
  • Date: Thu, 8 Sep 2011 06:23:02 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/fbcopy/BUILD | 3 +--
database/fbcopy/CONFLICTS | 1 +
database/fbcopy/DEPENDS | 3 ---
database/fbcopy/DETAILS | 22 +++++-----------------
database/fbcopy/DOWNLOAD | 1 +
database/fbcopy/HISTORY | 42 ++++--------------------------------------
database/fbcopy/INSTALL | 1 +
database/fbcopy/PRE_BUILD | 8 +-------
database/fbcopy/UP_TRIGGERS | 1 +
database/fbexport/BUILD | 1 -
database/fbexport/CONFLICTS | 1 +
database/fbexport/DEPENDS | 2 +-
database/fbexport/DETAILS | 6 +++---
database/fbexport/HISTORY | 10 ++++++++++
database/fbexport/INSTALL | 1 -
database/fbexport/Makefile | 28 ++++++++++++++++++++++++++++
database/fbexport/PRE_BUILD | 17 +++++++----------
17 files changed, 65 insertions(+), 83 deletions(-)

New commits:
commit ff23ee7e451cbe8c187038bf84c29b1e89be4816
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate database/fbcopy [replaced by fbexport]

commit 4f4a33a5ea8bbcaa1ff00eab4a425293c3563a20
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fbexport: => 1.90

diff --git a/database/fbcopy/BUILD b/database/fbcopy/BUILD
index c589bc5..27ba77d 100755
--- a/database/fbcopy/BUILD
+++ b/database/fbcopy/BUILD
@@ -1,2 +1 @@
- sedit "s/-03/$CFLAGS/;s:/local::" Makefile &&
- make
+true
diff --git a/database/fbcopy/CONFLICTS b/database/fbcopy/CONFLICTS
new file mode 100755
index 0000000..bbc8131
--- /dev/null
+++ b/database/fbcopy/CONFLICTS
@@ -0,0 +1 @@
+conflicts fbcopy y
diff --git a/database/fbcopy/DEPENDS b/database/fbcopy/DEPENDS
deleted file mode 100755
index 20b4e47..0000000
--- a/database/fbcopy/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends -sub CXX gcc &&
-depends firebird
-
diff --git a/database/fbcopy/DETAILS b/database/fbcopy/DETAILS
index db83373..ab3ab02 100755
--- a/database/fbcopy/DETAILS
+++ b/database/fbcopy/DETAILS
@@ -1,20 +1,8 @@
SPELL=fbcopy
- VERSION=1.70
-
SOURCE_HASH=sha512:757a1e43192dbb92437fb7460dfad0d999fcdece74286997841203de5615c9d0ec0b1fb3c3c23f72794cd45fa14570738382622eb1ef935146d3f4c7e8c4bcf1
- SOURCE=fbcopy-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.firebirdfaq.org/files/$SOURCE
- WEB_SITE=http://fbexport.SourceForge.net/fbcopy.html
- LICENCE=MIT
- DOCS="manual.html"
- ENTERED=20050220
- KEYWORDS="firebird database"
-SHORT="a command-line tool to copy data between Firebird tables and
databases"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
- With FBCopy, you can easily copy data between Firebird tables and
-databases. FBCopy is a command-line tool, so you can use it inside batch
-scripts, cron jobs, etc. Currently, Linux and Windows versions are
-available, but I hope it can be built with any compiler that can build IBPP
-library.
-
+deprecated spell [replaced by fbexport]
EOF
+
diff --git a/database/fbcopy/DOWNLOAD b/database/fbcopy/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/database/fbcopy/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/database/fbcopy/HISTORY b/database/fbcopy/HISTORY
index c647d9c..b95bc3d 100644
--- a/database/fbcopy/HISTORY
+++ b/database/fbcopy/HISTORY
@@ -1,38 +1,4 @@
-2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: changed dependency on g++ to dependency on gcc with
- sub-depends on CXX (scripted)
-
-2008-10-14 Treeve Jelbert <treeve AT sourcemage.org>
- * PRE_BUILD: added, fix use of gcc-4.3.2
-
-2008-01-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.70
- new URL
-
-2006-07-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.52
- change LICENCE
- * DEPENDS: remove ibpp, add g++, firebird
- * BUILD: adapt to new layout
- * INSTALL: delete
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2005-12-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.15
- * BUILD: remove fix
-
-2005-12-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.11
- * BUILD: fix compilation problem
-
-2005-11-29 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-03-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.06
-
-2005-02-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.00
-
+2011-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by fbexport]
diff --git a/database/fbcopy/INSTALL b/database/fbcopy/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/database/fbcopy/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/database/fbcopy/PRE_BUILD b/database/fbcopy/PRE_BUILD
index 648b107..27ba77d 100755
--- a/database/fbcopy/PRE_BUILD
+++ b/database/fbcopy/PRE_BUILD
@@ -1,7 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix problem with gcc-4.3.2
-sed -i -e "/\<limits\>/ a\
-#include <cstring>
-#include <memory>
-" source/ibpp/core/_ibpp.h
+true
diff --git a/database/fbcopy/UP_TRIGGERS b/database/fbcopy/UP_TRIGGERS
new file mode 100755
index 0000000..e787644
--- /dev/null
+++ b/database/fbcopy/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger fbexport cast_self
diff --git a/database/fbexport/BUILD b/database/fbexport/BUILD
index 7766bfe..8f58e6d 100755
--- a/database/fbexport/BUILD
+++ b/database/fbexport/BUILD
@@ -1,2 +1 @@
-cd source &&
make
diff --git a/database/fbexport/CONFLICTS b/database/fbexport/CONFLICTS
new file mode 100755
index 0000000..bbc8131
--- /dev/null
+++ b/database/fbexport/CONFLICTS
@@ -0,0 +1 @@
+conflicts fbcopy y
diff --git a/database/fbexport/DEPENDS b/database/fbexport/DEPENDS
index c48c5ec..0148be7 100755
--- a/database/fbexport/DEPENDS
+++ b/database/fbexport/DEPENDS
@@ -1,2 +1,2 @@
-depends firebird &&
+depends FIREBIRD &&
depends -sub CXX gcc
diff --git a/database/fbexport/DETAILS b/database/fbexport/DETAILS
index b1a4f53..0f983e2 100755
--- a/database/fbexport/DETAILS
+++ b/database/fbexport/DETAILS
@@ -1,7 +1,7 @@
SPELL=fbexport
- VERSION=1.70
-
SOURCE_HASH=sha512:16028787a06045d7a1f5ebd60bf39065fc15b81d35a4b143a99729b4752e3e23f097dfea333f5e4e4fb91fde934ae523f4bdd9b9a72a793f953987b548b2f293
- SOURCE=$SPELL-$VERSION.tgz
+ VERSION=1.90
+
SOURCE_HASH=sha512:7914b07ee30674f80028916c40a73f90b2e92d5ae5836cb1cd0f0f083e790dd862a00b19b5954f2a73e749d0d11f48171db1695614dfecf042829a5d87754763
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.firebirdfaq.org/files/$SOURCE
WEB_SITE=http://www.firebirdfaq.org/fbexport.php
diff --git a/database/fbexport/HISTORY b/database/fbexport/HISTORY
index c15ecc0..dc66254 100644
--- a/database/fbexport/HISTORY
+++ b/database/fbexport/HISTORY
@@ -1,3 +1,13 @@
+2011-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.90
+ * DEPENDS: firebird => FIREBIRD
+ * INSTALL: deleted
+ * BUILD: adjust
+ * CONFLICTS: added, fbcopy is now included in fbexport
+ * Makefile: added
+ * PRE_BUILD: copy my Makefile
+ fix glibc problem
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/database/fbexport/INSTALL b/database/fbexport/INSTALL
deleted file mode 100755
index 772ddf5..0000000
--- a/database/fbexport/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make install
diff --git a/database/fbexport/Makefile b/database/fbexport/Makefile
new file mode 100644
index 0000000..41bb057
--- /dev/null
+++ b/database/fbexport/Makefile
@@ -0,0 +1,28 @@
+###############################################################################
+.SUFFIXES: .o .cpp
+
+OBJECTS_FBE=fbexport/ParseArgs.o fbexport/FBExport.o fbexport/cli-main.o
+OBJECTS_FBC=fbcopy/args.o fbcopy/fbcopy.o fbcopy/TableDependency.o
fbcopy/main.o
+
+# Compiler & linker flags
+COMPILE_FLAGS=-O3 -DIBPP_LINUX -DIBPP_GCC -Iibpp
+LINK_FLAGS=-pthread -L/opt/firebird/lib -lfbclient
+
+
+all: exe/fbcopy exe/fbexport
+
+exe/fbexport: $(OBJECTS_FBE) ibpp/all_in_one.o
+ g++ $(LINK_FLAGS) ibpp/all_in_one.o $(OBJECTS_FBE) -oexe/fbexport
+
+exe/fbcopy: $(OBJECTS_FBC) ibpp/all_in_one.o
+ g++ $(LINK_FLAGS) ibpp/all_in_one.o $(OBJECTS_FBC) -oexe/fbcopy
+
+
+install:
+ install exe/fbcopy /usr/bin/fbcopy
+ install exe/fbexport /usr/bin/fbexport
+
+.cpp.o:
+ g++ -c $(COMPILE_FLAGS) -o $@ $<
+
+#EOF
diff --git a/database/fbexport/PRE_BUILD b/database/fbexport/PRE_BUILD
index ea0cd92..f82e4a0 100755
--- a/database/fbexport/PRE_BUILD
+++ b/database/fbexport/PRE_BUILD
@@ -1,13 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# use my makefile
+cp $SPELL_DIRECTORY/Makefile . &&
# fix smgl issues
-sed -i "s|gds|fbclient|;s|/local||;s|-O3|$CXXFLAGS|" source/Makefile &&
-
-# fix problem with gcc-4.3.2
-sed -i -e "/\<limits\>/ a\
-#include <cstring>
-#include <memory>
-" source/ibpp/_ibpp.h &&
-sed -i -e "/\<string\>/ a\
-#include <cstring>
-" source/FBExport.cpp
+sed -i "s|-O3|$CXXFLAGS|" Makefile &&
+# fix glibc problem
+sed -i -e "/^#/ a\
+#include <stdio.h>
+" fbcopy/TableDependency.cpp



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ff23ee7e451cbe8c187038bf84c29b1e89be4816), Treeve Jelbert, 09/08/2011

Archive powered by MHonArc 2.6.24.

Top of Page