From 00eab4e6eca4227b1ecd2c6f502eedad41c3af96 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Thu, 28 Apr 2011 11:21:37 +0200 Subject: Add libodb-pgsql infrastructure files --- odb/pgsql/Makefile.am | 16 ++ odb/pgsql/details/config.h.in | 14 ++ odb/pgsql/details/config.hxx | 19 ++ odb/pgsql/details/export.hxx | 41 ++++ odb/pgsql/details/options.cli | 54 +++++ odb/pgsql/dummy.cxx | 6 + odb/pgsql/libodb-pgsql-vc10.vcxproj | 174 ++++++++++++++ odb/pgsql/libodb-pgsql-vc10.vcxproj.filters | 19 ++ odb/pgsql/libodb-pgsql-vc9.vcproj | 359 ++++++++++++++++++++++++++++ odb/pgsql/makefile | 128 ++++++++++ odb/pgsql/version.hxx | 45 ++++ 11 files changed, 875 insertions(+) create mode 100644 odb/pgsql/Makefile.am create mode 100644 odb/pgsql/details/config.h.in create mode 100644 odb/pgsql/details/config.hxx create mode 100644 odb/pgsql/details/export.hxx create mode 100644 odb/pgsql/details/options.cli create mode 100644 odb/pgsql/dummy.cxx create mode 100644 odb/pgsql/libodb-pgsql-vc10.vcxproj create mode 100644 odb/pgsql/libodb-pgsql-vc10.vcxproj.filters create mode 100644 odb/pgsql/libodb-pgsql-vc9.vcproj create mode 100644 odb/pgsql/makefile create mode 100644 odb/pgsql/version.hxx (limited to 'odb/pgsql') diff --git a/odb/pgsql/Makefile.am b/odb/pgsql/Makefile.am new file mode 100644 index 0000000..2c61b75 --- /dev/null +++ b/odb/pgsql/Makefile.am @@ -0,0 +1,16 @@ +# file : odb/pgsql/Makefile.am +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +lib_LTLIBRARIES = libodb-pgsql.la +libodb_pgsql_la_SOURCES = __path__(sources) + +odbpgsqlincludedir = $(includedir)/odb/pgsql/ +nobase_odbpgsqlinclude_HEADERS = __path__(headers) +nobase_nodist_odbpgsqlinclude_HEADERS = details/config.h + +EXTRA_DIST = __file__(extra_dist) + +AM_CPPFLAGS= -I'$(top_builddir)' -I'$(top_srcdir)' -DLIBODB_PGSQL_DYNAMIC_LIB +AM_LDFLAGS = -release __value__(interface_version) -no-undefined diff --git a/odb/pgsql/details/config.h.in b/odb/pgsql/details/config.h.in new file mode 100644 index 0000000..637f239 --- /dev/null +++ b/odb/pgsql/details/config.h.in @@ -0,0 +1,14 @@ +/* file : odb/pgsql/details/config.h.in + * author : Constantin Michael + * copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_PGSQL_DETAILS_CONFIG_H +#define ODB_PGSQL_DETAILS_CONFIG_H + +#undef LIBODB_PGSQL_STATIC_LIB + +#endif /* ODB_PGSQL_DETAILS_CONFIG_H */ diff --git a/odb/pgsql/details/config.hxx b/odb/pgsql/details/config.hxx new file mode 100644 index 0000000..bc89fbb --- /dev/null +++ b/odb/pgsql/details/config.hxx @@ -0,0 +1,19 @@ +// file : odb/pgsql/details/config.hxx +// author : Constantin Michael +// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_PGSQL_DETAILS_CONFIG_HXX +#define ODB_PGSQL_DETAILS_CONFIG_HXX + +// no pre + +#if defined(ODB_COMPILER) +# error libodb-pgsql header included in odb-compiled header +#else +# include +#endif + +// no post + +#endif // ODB_PGSQL_DETAILS_CONFIG_HXX diff --git a/odb/pgsql/details/export.hxx b/odb/pgsql/details/export.hxx new file mode 100644 index 0000000..2d830a9 --- /dev/null +++ b/odb/pgsql/details/export.hxx @@ -0,0 +1,41 @@ +// file : odb/pgsql/details/export.hxx +// author : Constantin Michael +// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_PGSQL_DETAILS_EXPORT_HXX +#define ODB_PGSQL_DETAILS_EXPORT_HXX + +#include + +#include + +#ifdef LIBODB_PGSQL_STATIC_LIB +# define LIBODB_PGSQL_EXPORT +#else +# ifdef _WIN32 +# ifdef _MSC_VER +# ifdef LIBODB_PGSQL_DYNAMIC_LIB +# define LIBODB_PGSQL_EXPORT __declspec(dllexport) +# else +# define LIBODB_PGSQL_EXPORT __declspec(dllimport) +# endif +# else +# ifdef LIBODB_PGSQL_DYNAMIC_LIB +# ifdef DLL_EXPORT +# define LIBODB_PGSQL_EXPORT __declspec(dllexport) +# else +# define LIBODB_PGSQL_EXPORT +# endif +# else +# define LIBODB_PGSQL_EXPORT __declspec(dllimport) +# endif +# endif +# else +# define LIBODB_PGSQL_EXPORT +# endif +#endif + +#include + +#endif // ODB_PGSQL_DETAILS_EXPORT_HXX diff --git a/odb/pgsql/details/options.cli b/odb/pgsql/details/options.cli new file mode 100644 index 0000000..925cef3 --- /dev/null +++ b/odb/pgsql/details/options.cli @@ -0,0 +1,54 @@ +// file : odb/pgsql/details/options.cli +// author : Constantin Michael +// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +include ; + +namespace odb +{ + namespace pgsql + { + namespace details + { + class options + { + std::string --user + { + "", + "PostgreSQL database user." + }; + + std::string --password + { + "", + "PostgreSQL database password" + }; + + std::string --dbname + { + "", + "PostgreSQL database name." + }; + + std::string --host + { + "", + "Name of the PostgreSQL host to connect to (localhost by default)." + }; + + std::string --hostaddr + { + "", + "Numeric IP address of host to connect to in dotted-decimal format." + }; + + unsigned int --port = 0 + { + "", + "PostgreSQL database port number." + }; + }; + } + } +} diff --git a/odb/pgsql/dummy.cxx b/odb/pgsql/dummy.cxx new file mode 100644 index 0000000..2fbc6c8 --- /dev/null +++ b/odb/pgsql/dummy.cxx @@ -0,0 +1,6 @@ +#include + +PGconn* dummy () +{ + return PQconnectdb ("connection info"); +} diff --git a/odb/pgsql/libodb-pgsql-vc10.vcxproj b/odb/pgsql/libodb-pgsql-vc10.vcxproj new file mode 100644 index 0000000..341e679 --- /dev/null +++ b/odb/pgsql/libodb-pgsql-vc10.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B6185C00-39EC-4429-B774-164B4397B995} + Win32Proj + libodb-pgsql + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-pgsql-d-__value__(interface_version)-vc10 + + + true + ..\..\bin64\ + odb-pgsql-d-__value__(interface_version)-vc10 + + + false + ..\..\bin\ + odb-pgsql-__value__(interface_version)-vc10 + + + false + ..\..\bin64\ + odb-pgsql-__value__(interface_version)-vc10 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb-d.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib\odb-pgsql-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb-d.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib64\odb-pgsql-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib\odb-pgsql.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib64\odb-pgsql.lib + + + +__header_entries__(headers) + + +__source_entries__(sources) + + + + + diff --git a/odb/pgsql/libodb-pgsql-vc10.vcxproj.filters b/odb/pgsql/libodb-pgsql-vc10.vcxproj.filters new file mode 100644 index 0000000..781fff8 --- /dev/null +++ b/odb/pgsql/libodb-pgsql-vc10.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {A070BD3A-62AD-4ED5-8080-860954BF9EF8} + cxx + + + {8586465A-41C6-4A76-B0AA-256E10243DC2} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) + + +__source_filter_entries__(sources) + + diff --git a/odb/pgsql/libodb-pgsql-vc9.vcproj b/odb/pgsql/libodb-pgsql-vc9.vcproj new file mode 100644 index 0000000..a4f643b --- /dev/null +++ b/odb/pgsql/libodb-pgsql-vc9.vcproj @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +__source_entries__(sources) + + +__file_entries__(headers) + + + + + diff --git a/odb/pgsql/makefile b/odb/pgsql/makefile new file mode 100644 index 0000000..63e0289 --- /dev/null +++ b/odb/pgsql/makefile @@ -0,0 +1,128 @@ +# file : odb/pgsql/makefile +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make + +cxx := \ +dummy.cxx + +cli_tun := details/options.cli +cxx_tun := $(cxx) +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(cli_tun:.cli=.o)) +cxx_od := $(cxx_obj:.o=.o.d) + +odb_pgsql.l := $(out_base)/odb-pgsql.l +odb_pgsql.l.cpp-options := $(out_base)/odb-pgsql.l.cpp-options + +default := $(out_base)/ +dist := $(out_base)/.dist +clean := $(out_base)/.clean + +# Import. +# +$(call import,\ + $(scf_root)/import/cli/stub.make,\ + cli: cli,cli-rules: cli_rules) + +$(call import,\ + $(scf_root)/import/libodb/stub.make,\ + l: odb.l,cpp-options: odb.l.cpp-options) + +$(call import,\ + $(scf_root)/import/libpq/stub.make,\ + l: pq.l,\ + cpp-options: pq.l.cpp-options,\ + cpp-options-inline: pq_cpp_options) + +# Build. +# +$(odb_pgsql.l): $(cxx_obj) $(odb.l) $(pq.l) +$(odb_pgsql.l.cpp-options): value := -I$(out_root) -I$(src_root) \ +$(pq_cpp_options) +$(odb_pgsql.l.cpp-options): $(odb.l.cpp-options) $(pq.l.cpp-options) + +$(cxx_obj) $(cxx_od): $(odb_pgsql.l.cpp-options) $(out_base)/details/config.h + +genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): $(cli) +$(gen): cli := $(cli) +$(gen): cli_options += \ +--long-usage \ +--generate-specifier \ +--generate-file-scanner \ +--cli-namespace odb::pgsql::details::cli \ +--guard-prefix LIBODB_PGSQL_DETAILS + +$(out_base)/details/config.h: + @echo '/* file : odb/pgsql/details/config.h' >$@ + @echo ' * author : automatically generated' >>$@ + @echo ' */' >>$@ + @echo '' >>$@ + @echo '#ifndef ODB_PGSQL_DETAILS_CONFIG_H' >>$@ + @echo '#define ODB_PGSQL_DETAILS_CONFIG_H' >>$@ + @echo '' >>$@ + @echo '#endif /* ODB_PGSQL_DETAILS_CONFIG_H */' >>$@ + +$(call include-dep,$(cxx_od),$(cxx_obj),$(gen) $(out_base)/details/config.h) + +# Convenience alias for default target. +# +$(out_base)/: $(odb_pgsql.l) + +# Dist. +# +$(dist): sources_dist := $(cxx) +$(dist): export sources := $(sources_dist) $(cli_tun:.cli=.cxx) +$(dist): headers_dist = $(subst $(src_base)/,,$(shell find $(src_base) \ +-name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): gen_headers := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) +$(dist): export headers = $(sort $(headers_dist) $(gen_headers)) +$(dist): gen_dist := $(gen) +$(dist): data_dist := $(cli_tun) details/config.h.in +$(dist): export extra_dist := $(data_dist) libodb-pgsql-vc9.vcproj \ +libodb-pgsql-vc10.vcxproj libodb-pgsql-vc10.vcxproj.filters +$(dist): export interface_version = $(shell sed -e \ +'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) + +$(dist): $(gen) + $(call dist-data,$(sources_dist) $(headers_dist) $(data_dist)) + $(call dist-data,$(gen_dist),$(dist_prefix)/odb/pgsql/details) + $(call meta-vc9proj,$(src_base)/libodb-pgsql-vc9.vcproj) + $(call meta-vc10proj,$(src_base)/libodb-pgsql-vc10.vcxproj) + $(call meta-automake) + +# Clean. +# +$(clean): $(odb_pgsql.l).o.clean \ + $(odb_pgsql.l.cpp-options).clean \ + $(addsuffix .cxx.clean,$(cxx_obj)) \ + $(addsuffix .cxx.clean,$(cxx_od)) \ + $(addprefix $(out_base)/,$(cli_tun:.cli=.cxx.cli.clean)) + $(call message,rm $$1,rm -f $$1,$(out_base)/details/config.h) + +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(odb_pgsql.l): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := details/config.h $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif + +# How to. +# +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/vc9proj.make) +$(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/automake.make) + +$(call include,$(cli_rules)) +$(call include,$(bld_root)/cxx/o-l.make) +$(call include,$(bld_root)/cxx/cxx-o.make) +$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/odb/pgsql/version.hxx b/odb/pgsql/version.hxx new file mode 100644 index 0000000..a09f93d --- /dev/null +++ b/odb/pgsql/version.hxx @@ -0,0 +1,45 @@ +// file : odb/pgsql/version.hxx +// author : Constantin Michael +// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_PGSQL_VERSION_HXX +#define ODB_PGSQL_VERSION_HXX + +#include + +#include +#include + +// Version format is AABBCCDD where +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// + +// Check that we have compatible ODB version. +// +#if ODB_VERSION != 10400 +# error incompatible odb interface version detected +#endif + +// libodb-pgsql version: odb interface version plus the bugfix +// version. +// +#define LIBODB_PGSQL_VERSION 1040000 +#define LIBODB_PGSQL_VERSION_STR "1.4.0" + +#include + +#endif // ODB_PGSQL_VERSION_HXX -- cgit v1.1