From 783efe3b1649f3426613e3c151e47c33a854010c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 8 Nov 2016 18:24:02 +0200 Subject: Add initial support for build2 build --- cutl/buildfile | 76 +++++++++++++++++++++++++++++++++++++++++ cutl/details/build2/config-vc.h | 16 +++++++++ cutl/details/build2/config.h | 16 +++++++++ cutl/details/config.hxx | 14 ++++++-- cutl/details/export.hxx | 39 +++++++++++++++++++++ 5 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 cutl/buildfile create mode 100644 cutl/details/build2/config-vc.h create mode 100644 cutl/details/build2/config.h (limited to 'cutl') diff --git a/cutl/buildfile b/cutl/buildfile new file mode 100644 index 0000000..192a84b --- /dev/null +++ b/cutl/buildfile @@ -0,0 +1,76 @@ +# file : cutl/buildfile +# copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC +# license : MIT; see accompanying LICENSE file + +# {hxx }{ re } \ +# re/{ txx cxx}{ re } \ + +lib{cutl}: \ + {hxx cxx}{ exception } \ + {hxx }{ shared-ptr } \ + shared-ptr/{hxx ixx txx cxx}{ base } \ + {hxx }{ static-ptr } \ + compiler/{hxx txx }{ code-stream } \ + compiler/{hxx txx cxx}{ context } \ + compiler/{hxx ixx txx cxx}{ cxx-indenter } \ + compiler/{hxx txx }{ sloc-counter } \ + compiler/{hxx txx }{ traversal } \ + compiler/{hxx ixx txx }{ type-id } \ + compiler/{hxx ixx cxx}{ type-info } \ + container/{hxx }{ any } \ + container/{hxx txx }{ graph } \ + container/{hxx }{ key } \ + container/{hxx }{ map-iterator } \ + container/{hxx }{ multi-index } \ + container/{hxx }{ pointer-iterator } \ + details/{hxx }{ config.hxx } \ + details/{hxx }{ export.hxx } \ +details/build2/{h }{ config } \ +details/build2/{h }{ config-vc } \ + fs/{hxx cxx}{ auto-remove } \ + fs/{hxx cxx}{ exception } \ + fs/{hxx ixx txx cxx}{ path } \ + meta/{hxx }{ answer } \ + meta/{hxx }{ class-p } \ + meta/{hxx }{ polymorphic-p } \ + meta/{hxx }{ remove-c } \ + meta/{hxx }{ remove-cv } \ + meta/{hxx }{ remove-p } \ + meta/{hxx }{ remove-v } + +# For pre-releases use the complete version to make sure they cannot be used +# in place of another pre-release or the final version. +# +if $abi_prerelease + lib{cutl}: bin.lib.version = @-$version +else + lib{cutl}: bin.lib.version = @-$abi_major.$abi_minor + +cxx.poptions =+ -I$src_root -DLIBCUTL_BUILD2 +obja{*}: cxx.poptions += -DLIBCUTL_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBCUTL_SHARED_BUILD + +lib{cutl}: cxx.export.poptions = -I$src_root -DLIBCUTL_BUILD2 +liba{cutl}: cxx.export.poptions += -DLIBCUTL_STATIC +libs{cutl}: cxx.export.poptions += -DLIBCUTL_SHARED + +# Install into the cutl/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/cutl/ +install.include.subdirs = true # Recreate subdirectories. + +# We want these to be picked up even when LIBCUTL_BUILD2 is not defined. +# +details/build2/: +{ + if ($cxx.id == "msvc") + { + h{config}@./: install = false + h{config-vc}@./: install = $install.include/details/ + } + else + { + h{config}@./: install = $install.include/details/ + h{config-vc}@./: install = false + } +} diff --git a/cutl/details/build2/config-vc.h b/cutl/details/build2/config-vc.h new file mode 100644 index 0000000..a73781e --- /dev/null +++ b/cutl/details/build2/config-vc.h @@ -0,0 +1,16 @@ +/* file : cutl/details/build2/config-vc.h + * copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC + * license : MIT; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++ for the build2 build. */ + +#ifndef CUTL_DETAILS_CONFIG_VC_H +#define CUTL_DETAILS_CONFIG_VC_H + +/* Define LIBCUTL_BUILD2 for the installed case. */ +#ifndef LIBCUTL_BUILD2 +# define LIBCUTL_BUILD2 +#endif + +#endif /* CUTL_DETAILS_CONFIG_VC_H */ diff --git a/cutl/details/build2/config.h b/cutl/details/build2/config.h new file mode 100644 index 0000000..f7547b6 --- /dev/null +++ b/cutl/details/build2/config.h @@ -0,0 +1,16 @@ +/* file : cutl/details/build2/config.h + * copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC + * license : MIT; see accompanying LICENSE file + */ + +/* Static configuration file for the build2 build. */ + +#ifndef CUTL_DETAILS_CONFIG_H +#define CUTL_DETAILS_CONFIG_H + +/* Define LIBCUTL_BUILD2 for the installed case. */ +#ifndef LIBCUTL_BUILD2 +# define LIBCUTL_BUILD2 +#endif + +#endif /* CUTL_DETAILS_CONFIG_H */ diff --git a/cutl/details/config.hxx b/cutl/details/config.hxx index 8a4adc0..2d0ec8d 100644 --- a/cutl/details/config.hxx +++ b/cutl/details/config.hxx @@ -5,10 +5,18 @@ #ifndef CUTL_DETAILS_CONFIG_HXX #define CUTL_DETAILS_CONFIG_HXX -#ifdef _MSC_VER -# include +#ifdef LIBCUTL_BUILD2 +# ifdef _MSC_VER +# include +# else +# include +# endif #else -# include +# ifdef _MSC_VER +# include +# else +# include +# endif #endif #endif // CUTL_DETAILS_CONFIG_HXX diff --git a/cutl/details/export.hxx b/cutl/details/export.hxx index f9f764f..c6c9f39 100644 --- a/cutl/details/export.hxx +++ b/cutl/details/export.hxx @@ -7,6 +7,43 @@ #include +// Normally we don't export class templates (but do complete specializations), +// inline functions, and classes with only inline member functions. Exporting +// classes that inherit from non-exported/imported bases (e.g., std::string) +// will end up badly. The only known workarounds are to not inherit or to not +// export. Also, MinGW GCC doesn't like seeing non-exported function being +// used before their inline definition. The workaround is to reorder code. In +// the end it's all trial and error. + +#ifdef LIBCUTL_BUILD2 + +#if defined(LIBCUTL_STATIC) // Using static. +# define LIBCUTL_EXPORT +#elif defined(LIBCUTL_STATIC_BUILD) // Building static. +# define LIBCUTL_EXPORT +#elif defined(LIBCUTL_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBCUTL_EXPORT __declspec(dllimport) +# else +# define LIBCUTL_EXPORT +# endif +#elif defined(LIBCUTL_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBCUTL_EXPORT __declspec(dllexport) +# else +# define LIBCUTL_EXPORT +# endif +#else +// If none of the above macros are defined, then we assume we are being used +// by some third-party build system that cannot/doesn't signal the library +// type. Note that this fallback works for both static and shared but in case +// of shared will be sub-optimal compared to having dllimport. +// +# define LIBCUTL_EXPORT // Using static or shared. +#endif + +#else // LIBCUTL_BUILD2 + #ifdef LIBCUTL_STATIC_LIB # define LIBCUTL_EXPORT #else @@ -33,4 +70,6 @@ # endif #endif +#endif // LIBCUTL_BUILD2 + #endif // CUTL_DETAILS_EXPORT_HXX -- cgit v1.1