From ba52dc31ae0e67b4afdf8c7059650ca880c49931 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 28 Apr 2017 20:10:18 +0100 Subject: Standalone split --- .gitmodules | 3 +++ Jamroot.jam | 40 ---------------------------------------- libdbpp/Jamfile.jam | 8 ++------ libdbpp/unittests/Jamfile.jam | 4 ++-- libdbpp/unittests/pq | 1 + 5 files changed, 8 insertions(+), 48 deletions(-) create mode 100644 .gitmodules create mode 160000 libdbpp/unittests/pq diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..314d94b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libdbpp/unittests/pq"] + path = libdbpp/unittests/pq + url = http://git.randomdan.homeip.net/git/libdbpp-postgresql diff --git a/Jamroot.jam b/Jamroot.jam index 3e015d5..2031151 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -1,9 +1,7 @@ import os ; -import slice ; using gcc : : [ os.environ CXX ] ; -variant component ; variant coverage : debug ; project @@ -14,55 +12,17 @@ project debug:"-Wl,-z,defs,--warn-once" coverage:"-W -Wall -Werror -Wwrite-strings -std=c++1y --coverage -fvisibility=hidden" coverage:"-Wl,-z,defs,--warn-once --coverage" - component:"-W -Wall -Werror -Wwrite-strings -std=c++1y -fPIC -fvisibility=hidden" - component:"-Wl,-z,lazy,--warn-once,-fPIC" ; -build-project gentoobrowse-api ; -build-project gentoobrowse-client ; -# build-project icetray ; -build-project libadhocutil ; build-project libdbpp ; -build-project libjsonpp ; -build-project libmisc ; -build-project libmysqlpp ; -build-project libodbcpp ; -build-project libpqpp ; -build-project libsqlitepp ; -build-project libtmdb ; -build-project mythfs ; -build-project netfs ; -# build-project p2pvr ; -build-project project2 ; -build-project slicer ; # Some useful aliases -lib xml++-3.0 ; -lib xml2 ; lib glibmm-2.4 ; lib gobject-2.0 ; lib glib-2.0 ; lib sigc-2.0 ; -alias libxmlpp : : : : - /usr/include/libxml++-3.0 - /usr/lib/libxml++-3.0/include - /usr/include/libxml2 - /usr/include/glibmm-2.4 - /usr/lib/glibmm-2.4/include - /usr/include/glib-2.0 - /usr/lib/glib-2.0/include - /usr/include/sigc++-2.0 - /usr/lib/sigc++-2.0/include - xml++-3.0 - xml2 - glibmm-2.4 - gobject-2.0 - glib-2.0 - sigc-2.0 - ; - alias glibmm : : : : /usr/include/glibmm-2.4 /usr/lib/glibmm-2.4/include diff --git a/libdbpp/Jamfile.jam b/libdbpp/Jamfile.jam index 9e7ad28..8152a3a 100644 --- a/libdbpp/Jamfile.jam +++ b/libdbpp/Jamfile.jam @@ -1,10 +1,6 @@ import package ; import lex ; -alias glibmm : : : : - "`pkg-config --cflags glibmm-2.4`" - "`pkg-config --libs glibmm-2.4`" - ; lib boost_date_time : : boost_date_time ; lib boost_filesystem ; lib boost_system ; @@ -15,7 +11,7 @@ lib boost_utf : : boost_unit_test_framework ; lib dbppcore : [ glob *.cpp *.ll : test*.cpp createMockDb.cpp ] : - glibmm + ..//glibmm adhocutil boost_system boost_thread @@ -23,7 +19,7 @@ lib dbppcore : . : : . - glibmm + ..//glibmm boost_date_time boost_system boost_filesystem diff --git a/libdbpp/unittests/Jamfile.jam b/libdbpp/unittests/Jamfile.jam index 5aec066..d27a0a2 100644 --- a/libdbpp/unittests/Jamfile.jam +++ b/libdbpp/unittests/Jamfile.jam @@ -35,7 +35,7 @@ alias libpq : : : : ; lib dbpp-local-postgresql : - [ glob ../../libpqpp/*.cpp ] : + [ glob pq/libpqpp/*.cpp ] : ../..//glibmm libpq ..//adhocutil @@ -43,7 +43,7 @@ lib dbpp-local-postgresql : boost_date_time boost_system : : - ../../libpqpp + pq/libpqpp "-I`pg_config --includedir`" ../..//glibmm ..//dbppcore diff --git a/libdbpp/unittests/pq b/libdbpp/unittests/pq new file mode 160000 index 0000000..c8a1a8f --- /dev/null +++ b/libdbpp/unittests/pq @@ -0,0 +1 @@ +Subproject commit c8a1a8f06cc9dd3b421db816012af8754d8fbd8f -- cgit v1.2.3