From 3dc9c1698aa18be1f5a0c67a70a4e6cd655a3da4 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 29 Apr 2017 16:20:50 +0300 Subject: Add hxx extension for headers and lib prefix for library dirs --- build/export.build | 4 ++-- build/root.build | 2 +- buildfile | 2 +- hello/buildfile | 26 -------------------------- hello/export | 36 ------------------------------------ hello/hello | 28 ---------------------------- hello/hello.cxx | 16 ---------------- libhello/buildfile | 26 ++++++++++++++++++++++++++ libhello/export.hxx | 36 ++++++++++++++++++++++++++++++++++++ libhello/hello.cxx | 16 ++++++++++++++++ libhello/hello.hxx | 28 ++++++++++++++++++++++++++++ tests/build/root.build | 2 +- tests/test/driver.cxx | 2 +- 13 files changed, 112 insertions(+), 112 deletions(-) delete mode 100644 hello/buildfile delete mode 100644 hello/export delete mode 100644 hello/hello delete mode 100644 hello/hello.cxx create mode 100644 libhello/buildfile create mode 100644 libhello/export.hxx create mode 100644 libhello/hello.cxx create mode 100644 libhello/hello.hxx diff --git a/build/export.build b/build/export.build index 1eb73b7..0151425 100644 --- a/build/export.build +++ b/build/export.build @@ -1,6 +1,6 @@ $out_root/: { - include hello/ + include libhello/ } -export $out_root/hello/lib{hello} +export $out_root/libhello/lib{hello} diff --git a/build/root.build b/build/root.build index 4f70114..8ceadfa 100644 --- a/build/root.build +++ b/build/root.build @@ -2,5 +2,5 @@ cxx.std = 11 using cxx -hxx{*}: extension = +hxx{*}: extension = hxx cxx{*}: extension = cxx diff --git a/buildfile b/buildfile index 57e0f35..b3ad7e3 100644 --- a/buildfile +++ b/buildfile @@ -1,4 +1,4 @@ -./: hello/ tests/ doc{INSTALL version} file{manifest} +./: libhello/ tests/ doc{INSTALL version} file{manifest} doc{version}: file{manifest} # Generated by the version module. doc{version}: dist = true diff --git a/hello/buildfile b/hello/buildfile deleted file mode 100644 index 30787e2..0000000 --- a/hello/buildfile +++ /dev/null @@ -1,26 +0,0 @@ -import int_libs = libformat%lib{format} -import imp_libs = libprint%lib{print} - -lib{hello}: {hxx cxx}{hello} hxx{export} $imp_libs $int_libs - -# 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 $version.pre_release - lib{hello}: bin.lib.version = @"-$version.project_id" -else - lib{hello}: bin.lib.version = @"-$version.major.$version.minor" - -cxx.poptions =+ "-I$out_root" "-I$src_root" -obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD - -lib{hello}: cxx.export.poptions = "-I$out_root" "-I$src_root" -liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC -libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED - -lib{hello}: cxx.export.libs = $int_libs - -# Install into the hello/ subdirectory of, say, /usr/include/. -# -install.include = $install.include/hello/ diff --git a/hello/export b/hello/export deleted file mode 100644 index 18f4968..0000000 --- a/hello/export +++ /dev/null @@ -1,36 +0,0 @@ -// file: hello/export -*- C++ -*- - -#pragma once - -// 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. - -#if defined(LIBHELLO_STATIC) // Using static. -# define LIBHELLO_EXPORT -#elif defined(LIBHELLO_STATIC_BUILD) // Building static. -# define LIBHELLO_EXPORT -#elif defined(LIBHELLO_SHARED) // Using shared. -# ifdef _WIN32 -# define LIBHELLO_EXPORT __declspec(dllimport) -# else -# define LIBHELLO_EXPORT -# endif -#elif defined(LIBHELLO_SHARED_BUILD) // Building shared. -# ifdef _WIN32 -# define LIBHELLO_EXPORT __declspec(dllexport) -# else -# define LIBHELLO_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 LIBHELLO_EXPORT // Using static or shared. -#endif diff --git a/hello/hello b/hello/hello deleted file mode 100644 index 75a47a0..0000000 --- a/hello/hello +++ /dev/null @@ -1,28 +0,0 @@ -// file: hello/hello -*- C++ -*- - -#pragma once - -#include - -#include - -#include - -namespace hello -{ - // If you compare this interface to version 1.0, then you will notice that - // while it is API/source-compatible (the signature of say() is unchanged) - // it is not ABI/binary-compatible (say() is now inline). - // - // Notice also that inline say() calls format() which means libformat is an - // interface dependency of libhello. - - LIBHELLO_EXPORT void - say_formatted (const std::string& message); - - inline void - say (const std::string& name) - { - say_formatted (format ("Hello", name)); - } -} diff --git a/hello/hello.cxx b/hello/hello.cxx deleted file mode 100644 index 8fdd5a6..0000000 --- a/hello/hello.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// file: hello/hello.cxx -*- C++ -*- - -#include - -#include - -using namespace std; - -namespace hello -{ - void - say_formatted (const string& m) - { - print (m); - } -} diff --git a/libhello/buildfile b/libhello/buildfile new file mode 100644 index 0000000..e65edde --- /dev/null +++ b/libhello/buildfile @@ -0,0 +1,26 @@ +import int_libs = libformat%lib{format} +import imp_libs = libprint%lib{print} + +lib{hello}: {hxx cxx}{hello} hxx{export} $imp_libs $int_libs + +# 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 $version.pre_release + lib{hello}: bin.lib.version = @"-$version.project_id" +else + lib{hello}: bin.lib.version = @"-$version.major.$version.minor" + +cxx.poptions =+ "-I$out_root" "-I$src_root" +obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD + +lib{hello}: cxx.export.poptions = "-I$out_root" "-I$src_root" +liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC +libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED + +lib{hello}: cxx.export.libs = $int_libs + +# Install into the libhello/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/libhello/ diff --git a/libhello/export.hxx b/libhello/export.hxx new file mode 100644 index 0000000..e6c723e --- /dev/null +++ b/libhello/export.hxx @@ -0,0 +1,36 @@ +// file: libhello/export.hxx -*- C++ -*- + +#pragma once + +// 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. + +#if defined(LIBHELLO_STATIC) // Using static. +# define LIBHELLO_EXPORT +#elif defined(LIBHELLO_STATIC_BUILD) // Building static. +# define LIBHELLO_EXPORT +#elif defined(LIBHELLO_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBHELLO_EXPORT __declspec(dllimport) +# else +# define LIBHELLO_EXPORT +# endif +#elif defined(LIBHELLO_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBHELLO_EXPORT __declspec(dllexport) +# else +# define LIBHELLO_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 LIBHELLO_EXPORT // Using static or shared. +#endif diff --git a/libhello/hello.cxx b/libhello/hello.cxx new file mode 100644 index 0000000..f7e3b7f --- /dev/null +++ b/libhello/hello.cxx @@ -0,0 +1,16 @@ +// file: libhello/hello.cxx -*- C++ -*- + +#include + +#include + +using namespace std; + +namespace hello +{ + void + say_formatted (const string& m) + { + print (m); + } +} diff --git a/libhello/hello.hxx b/libhello/hello.hxx new file mode 100644 index 0000000..ccc43c2 --- /dev/null +++ b/libhello/hello.hxx @@ -0,0 +1,28 @@ +// file: libhello/hello.hxx -*- C++ -*- + +#pragma once + +#include + +#include + +#include + +namespace hello +{ + // If you compare this interface to version 1.0, then you will notice that + // while it is API/source-compatible (the signature of say() is unchanged) + // it is not ABI/binary-compatible (say() is now inline). + // + // Notice also that inline say() calls format() which means libformat is an + // interface dependency of libhello. + + LIBHELLO_EXPORT void + say_formatted (const std::string& message); + + inline void + say (const std::string& name) + { + say_formatted (format ("Hello", name)); + } +} diff --git a/tests/build/root.build b/tests/build/root.build index de723b8..a2ee38a 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -2,7 +2,7 @@ cxx.std = 11 using cxx -hxx{*}: extension = +hxx{*}: extension = hxx cxx{*}: extension = cxx # Every exe{} in this subproject is by default a test. diff --git a/tests/test/driver.cxx b/tests/test/driver.cxx index 59bfb2d..38937f0 100644 --- a/tests/test/driver.cxx +++ b/tests/test/driver.cxx @@ -1,6 +1,6 @@ // file: tests/test/driver.cxx -*- C++ -*- -#include +#include int main () -- cgit v1.1