From 4923b1b703b30866d5b49d987303f98af0182ec4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 24 Oct 2013 08:51:28 +0200
Subject: Update for new release
---
binary/darwin/libcutl-configure | 2 ++
binary/darwin/test/gcc | 6 +++---
binary/darwin/test/gcc-qt | 6 +++---
binary/debian/changelog | 6 ++++++
binary/linux-gnu/libcutl-configure | 2 ++
binary/linux-gnu/test/clang-cxx11 | 2 +-
binary/linux-gnu/test/gcc | 2 +-
binary/linux-gnu/test/gcc-4.4 | 2 +-
binary/linux-gnu/test/gcc-minimal | 2 +-
binary/mingw-w64/libcutl-configure | 1 +
binary/redhat/odb.spec | 5 ++++-
binary/solaris/libcutl-configure | 2 ++
binary/solaris/test/cc-i686-12u2 | 6 +++---
binary/solaris/test/cc-i686-12u2-stlport | 6 +++---
binary/solaris/test/cc-sparc-12u2 | 6 +++---
test/windows/odb/mingw/build | 6 +++---
16 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/binary/darwin/libcutl-configure b/binary/darwin/libcutl-configure
index daab3ad..621d50b 100755
--- a/binary/darwin/libcutl-configure
+++ b/binary/darwin/libcutl-configure
@@ -7,6 +7,8 @@ libgcc_eh=`g++ --print-file-name libgcc_eh.a`
./configure \
--disable-shared \
--with-pic \
+CC="gcc -nodefaultlibs" \
+CFLAGS=-O2 \
CXX="g++ -nodefaultlibs" \
CXXFLAGS=-O2 \
LIBS="$libcxx $libgcc $libgcc_eh -lSystem"
diff --git a/binary/darwin/test/gcc b/binary/darwin/test/gcc
index 7ac3eb5..db3848d 100644
--- a/binary/darwin/test/gcc
+++ b/binary/darwin/test/gcc
@@ -8,13 +8,13 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql"
+mysql_use_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql"
pgsql_build_options=
-pgsql_use_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql"
+pgsql_use_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql"
oracle_build_options="--with-oci=$ORACLE"
-oracle_use_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
+oracle_use_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
# @@ While we have Qt installed (as a framework), we don't have a g++ build
# that is both recent enough (so it can handle friend access) and that supports
diff --git a/binary/darwin/test/gcc-qt b/binary/darwin/test/gcc-qt
index c17bdd0..b555209 100644
--- a/binary/darwin/test/gcc-qt
+++ b/binary/darwin/test/gcc-qt
@@ -8,13 +8,13 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql"
+mysql_use_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql"
pgsql_build_options=
-pgsql_use_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql"
+pgsql_use_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql"
oracle_build_options="--with-oci=$ORACLE"
-oracle_use_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
+oracle_use_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
with_qt=y
with_boost=y
diff --git a/binary/debian/changelog b/binary/debian/changelog
index 1f80f41..624fda5 100644
--- a/binary/debian/changelog
+++ b/binary/debian/changelog
@@ -1,3 +1,9 @@
+odb (2.3.0-1) unstable; urgency=low
+
+ * New major release.
+
+ -- Boris Kolpackov <boris@codesynthesis.com> Thu, 24 Oct 2013 07:09:26 +0200
+
odb (2.2.2-1) unstable; urgency=low
* New bugfix release.
diff --git a/binary/linux-gnu/libcutl-configure b/binary/linux-gnu/libcutl-configure
index c24abff..a448ca5 100755
--- a/binary/linux-gnu/libcutl-configure
+++ b/binary/linux-gnu/libcutl-configure
@@ -3,6 +3,8 @@
./configure \
--disable-shared \
--with-pic \
+CC="gcc -nodefaultlibs" \
+CFLAGS=-O2 \
CXX="g++ -nodefaultlibs" \
CXXFLAGS=-O2 \
LIBS="-Wl,-Bstatic,-lstdc++,-Bdynamic -Wl,-lgcc -Wl,-lgcc_eh -Wl,-lm -Wl,-lc"
diff --git a/binary/linux-gnu/test/clang-cxx11 b/binary/linux-gnu/test/clang-cxx11
index f2c6d97..fcdd85d 100644
--- a/binary/linux-gnu/test/clang-cxx11
+++ b/binary/linux-gnu/test/clang-cxx11
@@ -2,7 +2,7 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5"
+mysql_use_options="--with-mysql-host=192.168.0.2"
mssql_build_options=
mssql_use_options="--with-mssql-server=tcp:windows2008r2,1435"
diff --git a/binary/linux-gnu/test/gcc b/binary/linux-gnu/test/gcc
index f417bfd..69e64df 100644
--- a/binary/linux-gnu/test/gcc
+++ b/binary/linux-gnu/test/gcc
@@ -4,7 +4,7 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5"
+mysql_use_options="--with-mysql-host=192.168.0.2"
mssql_build_options=
mssql_use_options="--with-mssql-server=tcp:windows2008r2,1435"
diff --git a/binary/linux-gnu/test/gcc-4.4 b/binary/linux-gnu/test/gcc-4.4
index f941756..fe42354 100644
--- a/binary/linux-gnu/test/gcc-4.4
+++ b/binary/linux-gnu/test/gcc-4.4
@@ -4,7 +4,7 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5"
+mysql_use_options="--with-mysql-host=192.168.0.2"
mssql_build_options=
mssql_use_options="--with-mssql-server=tcp:windows2008r2,1435"
diff --git a/binary/linux-gnu/test/gcc-minimal b/binary/linux-gnu/test/gcc-minimal
index 1addab9..780ab96 100644
--- a/binary/linux-gnu/test/gcc-minimal
+++ b/binary/linux-gnu/test/gcc-minimal
@@ -2,7 +2,7 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5"
+mysql_use_options="--with-mysql-host=192.168.0.2"
mssql_build_options=
mssql_use_options="--with-mssql-server=tcp:windows2008r2,1435"
diff --git a/binary/mingw-w64/libcutl-configure b/binary/mingw-w64/libcutl-configure
index 23a3bd6..fea7051 100755
--- a/binary/mingw-w64/libcutl-configure
+++ b/binary/mingw-w64/libcutl-configure
@@ -6,4 +6,5 @@
--host i686-w64-mingw32 \
--target i686-w64-mingw32 \
--prefix=/mingw \
+CFLAGS=-O2 \
CXXFLAGS="-O2 -W -Wall"
diff --git a/binary/redhat/odb.spec b/binary/redhat/odb.spec
index 5d412e9..dbdd735 100644
--- a/binary/redhat/odb.spec
+++ b/binary/redhat/odb.spec
@@ -8,7 +8,7 @@
Summary: ORM for C++
Name: odb
-Version: 2.2.2
+Version: 2.3.0
Release: 1
License: GPLv2, GPLv3, LGPLv3
Group: Development/Tools
@@ -71,6 +71,9 @@ rm -rf ${RPM_BUILD_ROOT}
%config %{_sysconfdir}/odb/default.options
%changelog
+* Thu Oct 24 2013 Boris Kolpackov <boris@codesynthesis.com>
+ - new major release
+
* Fri Jun 21 2013 Boris Kolpackov <boris@codesynthesis.com>
- new bugfix release
diff --git a/binary/solaris/libcutl-configure b/binary/solaris/libcutl-configure
index c24abff..a448ca5 100755
--- a/binary/solaris/libcutl-configure
+++ b/binary/solaris/libcutl-configure
@@ -3,6 +3,8 @@
./configure \
--disable-shared \
--with-pic \
+CC="gcc -nodefaultlibs" \
+CFLAGS=-O2 \
CXX="g++ -nodefaultlibs" \
CXXFLAGS=-O2 \
LIBS="-Wl,-Bstatic,-lstdc++,-Bdynamic -Wl,-lgcc -Wl,-lgcc_eh -Wl,-lm -Wl,-lc"
diff --git a/binary/solaris/test/cc-i686-12u2 b/binary/solaris/test/cc-i686-12u2
index b60158a..a0e526e 100644
--- a/binary/solaris/test/cc-i686-12u2
+++ b/binary/solaris/test/cc-i686-12u2
@@ -8,13 +8,13 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql"
+mysql_use_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql"
pgsql_build_options=
-pgsql_use_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql"
+pgsql_use_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql"
oracle_build_options="--with-oci=$ORACLE"
-oracle_use_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
+oracle_use_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
with_qt=n
with_boost=y
diff --git a/binary/solaris/test/cc-i686-12u2-stlport b/binary/solaris/test/cc-i686-12u2-stlport
index 3a93eb2..18774dd 100644
--- a/binary/solaris/test/cc-i686-12u2-stlport
+++ b/binary/solaris/test/cc-i686-12u2-stlport
@@ -8,13 +8,13 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql"
+mysql_use_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql"
pgsql_build_options=
-pgsql_use_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql"
+pgsql_use_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql"
oracle_build_options="--with-oci=$ORACLE"
-oracle_use_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
+oracle_use_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
with_qt=n
with_boost=y
diff --git a/binary/solaris/test/cc-sparc-12u2 b/binary/solaris/test/cc-sparc-12u2
index 834474f..627cd24 100644
--- a/binary/solaris/test/cc-sparc-12u2
+++ b/binary/solaris/test/cc-sparc-12u2
@@ -8,13 +8,13 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql"
+mysql_use_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql"
pgsql_build_options=
-pgsql_use_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql"
+pgsql_use_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql"
oracle_build_options="--with-oci=$ORACLE"
-oracle_use_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
+oracle_use_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
with_qt=n
with_boost=y
diff --git a/test/windows/odb/mingw/build b/test/windows/odb/mingw/build
index 8592db4..6394fdf 100755
--- a/test/windows/odb/mingw/build
+++ b/test/windows/odb/mingw/build
@@ -32,10 +32,10 @@ CPPFLAGS="-I$BOOST -I$QTCORE/include -I$QTCORE/include/QtCore -I$ORACLE/sdk/incl
LDFLAGS="-L$BOOST/stage/lib -L$QTCORE/lib -L$ORACLE/sdk/lib -L$PGSQL/lib -L$SQLITE -L$MYSQL/lib -Wl,--enable-auto-import"
PATH="$QTCORE/bin:$ORACLE:$PATH"
-mysql_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql.exe"
+mysql_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql.exe"
sqlite_options="--with-sqlite-db=c:\\projects\\odb\\odb_test.db"
-pgsql_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql.exe"
-oracle_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus.exe"
+pgsql_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql.exe"
+oracle_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus.exe"
mssql_options="--with-mssql-server=windows2008r2\\ss2008r2,1435"
test=n
--
cgit v1.1