From 9646f4bb0cee026bdf9dbe4bf318f24e60697bae Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 29 Apr 2017 16:22:25 +0300 Subject: Add hxx extension for headers and lib prefix for library dirs --- build/export.build | 4 ++-- build/root.build | 2 +- buildfile | 2 +- libprint/buildfile | 21 +++++++++++++++++++++ libprint/export.hxx | 36 ++++++++++++++++++++++++++++++++++++ libprint/print.cxx | 13 +++++++++++++ libprint/print.hxx | 10 ++++++++++ print/buildfile | 21 --------------------- print/export | 36 ------------------------------------ print/print | 10 ---------- print/print.cxx | 13 ------------- 11 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 libprint/buildfile create mode 100644 libprint/export.hxx create mode 100644 libprint/print.cxx create mode 100644 libprint/print.hxx delete mode 100644 print/buildfile delete mode 100644 print/export delete mode 100644 print/print delete mode 100644 print/print.cxx diff --git a/build/export.build b/build/export.build index dd96278..4871c4a 100644 --- a/build/export.build +++ b/build/export.build @@ -1,6 +1,6 @@ $out_root/: { - include print/ + include libprint/ } -export $out_root/print/lib{print} +export $out_root/libprint/lib{print} 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 2f92924..a85a1dc 100644 --- a/buildfile +++ b/buildfile @@ -1,4 +1,4 @@ -./: print/ doc{version} file{manifest} +./: libprint/ doc{version} file{manifest} doc{version}: file{manifest} # Generated by the version module. doc{version}: dist = true diff --git a/libprint/buildfile b/libprint/buildfile new file mode 100644 index 0000000..f7d8a74 --- /dev/null +++ b/libprint/buildfile @@ -0,0 +1,21 @@ +lib{print}: {hxx cxx}{print} hxx{export} + +# 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{print}: bin.lib.version = @"-$version.project_id" +else + lib{print}: bin.lib.version = @"-$version.major.$version.minor" + +cxx.poptions =+ "-I$out_root" "-I$src_root" +obja{*}: cxx.poptions += -DLIBPRINT_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBPRINT_SHARED_BUILD + +lib{print}: cxx.export.poptions = "-I$out_root" "-I$src_root" +liba{print}: cxx.export.poptions += -DLIBPRINT_STATIC +libs{print}: cxx.export.poptions += -DLIBPRINT_SHARED + +# Install into the libprint/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/libprint/ diff --git a/libprint/export.hxx b/libprint/export.hxx new file mode 100644 index 0000000..dedfa65 --- /dev/null +++ b/libprint/export.hxx @@ -0,0 +1,36 @@ +// file: libprint/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(LIBPRINT_STATIC) // Using static. +# define LIBPRINT_EXPORT +#elif defined(LIBPRINT_STATIC_BUILD) // Building static. +# define LIBPRINT_EXPORT +#elif defined(LIBPRINT_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBPRINT_EXPORT __declspec(dllimport) +# else +# define LIBPRINT_EXPORT +# endif +#elif defined(LIBPRINT_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBPRINT_EXPORT __declspec(dllexport) +# else +# define LIBPRINT_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 LIBPRINT_EXPORT // Using static or shared. +#endif diff --git a/libprint/print.cxx b/libprint/print.cxx new file mode 100644 index 0000000..32c827d --- /dev/null +++ b/libprint/print.cxx @@ -0,0 +1,13 @@ +// file: libprint/libprint.cxx -*- C++ -*- + +#include + +#include + +using namespace std; + +void +print (const string& h) +{ + cout << h << endl; +} diff --git a/libprint/print.hxx b/libprint/print.hxx new file mode 100644 index 0000000..63cb541 --- /dev/null +++ b/libprint/print.hxx @@ -0,0 +1,10 @@ +// file: libprint/print.hxx -*- C++ -*- + +#pragma once + +#include + +#include + +LIBPRINT_EXPORT void +print (const std::string& hello); diff --git a/print/buildfile b/print/buildfile deleted file mode 100644 index 7eed5ed..0000000 --- a/print/buildfile +++ /dev/null @@ -1,21 +0,0 @@ -lib{print}: {hxx cxx}{print} hxx{export} - -# 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{print}: bin.lib.version = @"-$version.project_id" -else - lib{print}: bin.lib.version = @"-$version.major.$version.minor" - -cxx.poptions =+ "-I$out_root" "-I$src_root" -obja{*}: cxx.poptions += -DLIBPRINT_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBPRINT_SHARED_BUILD - -lib{print}: cxx.export.poptions = "-I$out_root" "-I$src_root" -liba{print}: cxx.export.poptions += -DLIBPRINT_STATIC -libs{print}: cxx.export.poptions += -DLIBPRINT_SHARED - -# Install into the print/ subdirectory of, say, /usr/include/. -# -install.include = $install.include/print/ diff --git a/print/export b/print/export deleted file mode 100644 index c96ae14..0000000 --- a/print/export +++ /dev/null @@ -1,36 +0,0 @@ -// file: print/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(LIBPRINT_STATIC) // Using static. -# define LIBPRINT_EXPORT -#elif defined(LIBPRINT_STATIC_BUILD) // Building static. -# define LIBPRINT_EXPORT -#elif defined(LIBPRINT_SHARED) // Using shared. -# ifdef _WIN32 -# define LIBPRINT_EXPORT __declspec(dllimport) -# else -# define LIBPRINT_EXPORT -# endif -#elif defined(LIBPRINT_SHARED_BUILD) // Building shared. -# ifdef _WIN32 -# define LIBPRINT_EXPORT __declspec(dllexport) -# else -# define LIBPRINT_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 LIBPRINT_EXPORT // Using static or shared. -#endif diff --git a/print/print b/print/print deleted file mode 100644 index dc6a1a0..0000000 --- a/print/print +++ /dev/null @@ -1,10 +0,0 @@ -// file: print/print -*- C++ -*- - -#pragma once - -#include - -#include - -LIBPRINT_EXPORT void -print (const std::string& hello); diff --git a/print/print.cxx b/print/print.cxx deleted file mode 100644 index 99a466d..0000000 --- a/print/print.cxx +++ /dev/null @@ -1,13 +0,0 @@ -// file: print/print.cxx -*- C++ -*- - -#include - -#include - -using namespace std; - -void -print (const string& h) -{ - cout << h << endl; -} -- cgit v1.1