Date: Tuesday, January 31, 2006 @ 11:25:47
Author: csaba
Path: /cvsroot/carob/libmysequoia
Added: config/logger.cfg (1.1)
Modified: .cvsignore (1.10 -> 1.11) Makefile.am (1.5 -> 1.6) configure.ac
(1.3 -> 1.4) debian/rules (1.1 -> 1.2) include/CarobMySQL.hpp
(1.23 -> 1.24) libmysequoia.spec (1.3 -> 1.4)
- added /etc configuration directory
- updated the redhat and debian package to include the config dir
------------------------+
.cvsignore | 1 +
Makefile.am | 4 ++++
config/logger.cfg | 11 +++++++++++
configure.ac | 9 +++++++++
debian/rules | 4 ++--
include/CarobMySQL.hpp | 4 +++-
libmysequoia.spec | 29 ++++++++++++++---------------
7 files changed, 44 insertions(+), 18 deletions(-)
Index: libmysequoia/.cvsignore
diff -u libmysequoia/.cvsignore:1.10 libmysequoia/.cvsignore:1.11
--- libmysequoia/.cvsignore:1.10 Mon Jan 2 09:48:32 2006
+++ libmysequoia/.cvsignore Tue Jan 31 11:25:47 2006
@@ -16,3 +16,4 @@
libmysqlclient.so*
build-stamp
configure-stamp
+libmysequoia-*.tar.gz
Index: libmysequoia/Makefile.am
diff -u libmysequoia/Makefile.am:1.5 libmysequoia/Makefile.am:1.6
--- libmysequoia/Makefile.am:1.5 Mon Jan 30 12:09:18 2006
+++ libmysequoia/Makefile.am Tue Jan 31 11:25:47 2006
@@ -22,6 +22,7 @@
EXTRA_DIST = config/mysql.sh config/createtbl.sh \
config/controller/*.xml config/virtualdatabase/*.xml \
+ config/logger.cfg \
include/*.h* \
libmysequoia.spec
@@ -72,5 +73,8 @@
@echo "You must enable at configure time: ./configure --enable-gcov"
endif
+install-data-local:
+ $(INSTALL_DATA) -D $(srcdir)/config/logger.cfg
$(DESTDIR)$(sysconfdir)/logger.cfg
+
clean-local:
rm -rf $(DOC_OUT_HTML) $(DOC_OUT_PDF) $(LCOV_TMP) $(LCOV_HTML)
Index: libmysequoia/config/logger.cfg
diff -u /dev/null libmysequoia/config/logger.cfg:1.1
--- /dev/null Tue Jan 31 11:25:47 2006
+++ libmysequoia/config/logger.cfg Tue Jan 31 11:25:47 2006
@@ -0,0 +1,11 @@
+log4j.rootLogger=debug, file
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=/tmp/mysequoia.log
+log4j.appender.file.MaxFileSize=100KB
+log4j.appender.file.MaxBackupIndex=3
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %p %t %c (%F:%L) - %m%n
+
+# Print only messages of level ERROR or above in the namespace MySQLAPI.
+log4j.logger.MySQLAPI=ERROR
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.3 libmysequoia/configure.ac:1.4
--- libmysequoia/configure.ac:1.3 Mon Jan 30 11:53:42 2006
+++ libmysequoia/configure.ac Tue Jan 31 11:25:47 2006
@@ -100,6 +100,14 @@
# Checks for library functions.
AC_CHECK_FUNCS([memset])
+CFG_DIR=$sysconfdir
+CFG_DIR=`(
+ test "x$prefix" = xNONE && prefix=${ac_default_prefix}
+ eval echo "$CFG_DIR"
+)`
+AC_DEFINE_UNQUOTED(CONFIGFILE_DIR, "$CFG_DIR", [Configuration file directory])
+AC_SUBST(CONFIGFILE_DIR)
+
AC_CONFIG_FILES([Makefile
src/Makefile
test/Makefile])
@@ -108,4 +116,5 @@
echo
echo "Installing in prefix: $prefix"
+echo "Config files are in: $CFG_DIR"
echo
Index: libmysequoia/debian/rules
diff -u libmysequoia/debian/rules:1.1 libmysequoia/debian/rules:1.2
--- libmysequoia/debian/rules:1.1 Sun Dec 18 11:43:58 2005
+++ libmysequoia/debian/rules Tue Jan 31 11:25:47 2006
@@ -22,7 +22,7 @@
configure-stamp:
$(testdir)
- CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man
--infodir=/usr/share/info
+ CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libdir=/usr/lib/mysequoia
--sysconfdir=/etc/mysequoia --mandir=/usr/share/man --infodir=/usr/share/info
touch configure-stamp
build: build-stamp
@@ -72,7 +72,7 @@
$(INSTALL) -m 755 debian/postrm $(DEST_DIR)/DEBIAN
# find out the library dependencies
- dpkg-shlibdeps ${DEST_DIR}/usr/lib/libmysequoia.so
+ dpkg-shlibdeps ${DEST_DIR}/usr/lib/mysequoia/libmysequoia.so
# generate control file
dpkg-gencontrol -isp -P$(DEST_DIR)
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.23
libmysequoia/include/CarobMySQL.hpp:1.24
--- libmysequoia/include/CarobMySQL.hpp:1.23 Mon Jan 30 13:45:56 2006
+++ libmysequoia/include/CarobMySQL.hpp Tue Jan 31 11:25:47 2006
@@ -22,6 +22,8 @@
#ifndef _CAROBMYSQL_HPP
#define _CAROBMYSQL_HPP
+#include <config.h>
+
#include <CarobCommon.hpp>
/* MySQL includes */
@@ -38,7 +40,7 @@
const unsigned long MYSEQUOIA_MAGIC = 0xC00CA10B;
-#define LOGGER_CONFIG_FILE "logger.cfg"
+#define LOGGER_CONFIG_FILE CONFIGFILE_DIR"/logger.cfg"
class CarobMYSQL : public CarobCommon
{
Index: libmysequoia/libmysequoia.spec
diff -u libmysequoia/libmysequoia.spec:1.3 libmysequoia/libmysequoia.spec:1.4
--- libmysequoia/libmysequoia.spec:1.3 Mon Jan 30 19:39:36 2006
+++ libmysequoia/libmysequoia.spec Tue Jan 31 11:25:47 2006
@@ -1,3 +1,7 @@
+%define sysconfdir /etc/mysequoia
+%define prefix /usr
+%define libdir /usr/lib/mysequoia
+
Summary: Native MySQL API using Sequoia
Name: libmysequoia
Version: 0.0.1
@@ -11,7 +15,6 @@
Source: %{name}-%{version}.tar.gz
-Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -22,7 +25,7 @@
%package devel
Summary: Native MySQL API using Sequoia, static libraries
Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}, mysql-devel
%description devel
Reimplementation of libmysqlclient library, using Carob to benefit from
@@ -33,7 +36,7 @@
rm -rf $RPM_BUILD_ROOT
%setup
-CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-cppunit
--disable-gcov
+CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --libdir=%{libdir}
--sysconfdir=%{sysconfdir} --disable-cppunit --disable-gcov
%build
make
@@ -41,7 +44,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+make DESTDIR=$RPM_BUILD_ROOT install
+install -d -m 0755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo "%{libdir}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/mysequoia-i386.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -49,22 +54,16 @@
%post
/sbin/ldconfig
-cd /usr/lib/mysql
-ln -sf /usr/lib/%{name}.so.0.0.0 libmysqlclient.so
-ln -sf /usr/lib/%{name}.so.0.0.0 libmysqlclient.so.14
-
%postun
-cd /usr/lib/mysql
-ln -sf libmysqlclient.so.14.0.0 libmysqlclient.so
-ln -sf libmysqlclient.so.14.0.0 libmysqlclient.so.14
-
/sbin/ldconfig
%files
%defattr(-,root,root,755)
-%attr(755,root,root) %prefix/lib/lib*.so*
+%attr(644,root,root) /etc/ld.so.conf.d/mysequoia-i386.conf
+%attr(644,root,root) %{sysconfdir}/logger.cfg
+%attr(755,root,root) %{libdir}/lib*.so*
%files devel
%defattr(-,root,root,755)
-%attr(644,root,root) %prefix/lib/*.a
-%attr(644,root,root) %prefix/lib/*.la
+%attr(644,root,root) %{libdir}/*.a
+%attr(644,root,root) %{libdir}/*.la
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
