Move project into intermediate sub-directory

4 files changed, 78 insertions, 0 deletions

diff --git a/libformat/libformat/buildfile b/libformat/libformat/buildfile
new file mode 100644
index 0000000..4f6f156
--- /dev/null
+++ b/libformat/libformat/buildfile
@@ -0,0 +1,21 @@
+lib{format}: {hxx cxx}{format} 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{format}: bin.lib.version = @"-$version.project_id"
+else
+  lib{format}: bin.lib.version = @"-$version.major.$version.minor"
+
+cxx.poptions =+ "-I$out_root" "-I$src_root"
+obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD
+
+lib{format}: cxx.export.poptions = "-I$out_root" "-I$src_root"
+liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC
+libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED
+
+# Install into the libformat/ subdirectory of, say, /usr/include/.
+#
+install.include = $install.include/libformat/
diff --git a/libformat/libformat/export.hxx b/libformat/libformat/export.hxx
new file mode 100644
index 0000000..125c9df
--- /dev/null
+++ b/libformat/libformat/export.hxx
@@ -0,0 +1,36 @@
+// file: libformat/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(LIBFORMAT_STATIC)         // Using static.
+#  define LIBFORMAT_EXPORT
+#elif defined(LIBFORMAT_STATIC_BUILD) // Building static.
+#  define LIBFORMAT_EXPORT
+#elif defined(LIBFORMAT_SHARED)       // Using shared.
+#  ifdef _WIN32
+#    define LIBFORMAT_EXPORT __declspec(dllimport)
+#  else
+#    define LIBFORMAT_EXPORT
+#  endif
+#elif defined(LIBFORMAT_SHARED_BUILD) // Building shared.
+#  ifdef _WIN32
+#    define LIBFORMAT_EXPORT __declspec(dllexport)
+#  else
+#    define LIBFORMAT_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 LIBFORMAT_EXPORT            // Using static or shared.
+#endif
diff --git a/libformat/libformat/format.cxx b/libformat/libformat/format.cxx
new file mode 100644
index 0000000..421f50d
--- /dev/null
+++ b/libformat/libformat/format.cxx
@@ -0,0 +1,11 @@
+// file: libformat/format.cxx -*- C++ -*-
+
+#include <libformat/format.hxx>
+
+using namespace std;
+
+string
+format (const string& g, const string& n)
+{
+  return g + ", " + n + '!';
+}
diff --git a/libformat/libformat/format.hxx b/libformat/libformat/format.hxx
new file mode 100644
index 0000000..9c813ac
--- /dev/null
+++ b/libformat/libformat/format.hxx
@@ -0,0 +1,10 @@
+// file: libformat/format.hxx -*- C++ -*-
+
+#pragma once
+
+#include <string>
+
+#include <libformat/export.hxx>
+
+LIBFORMAT_EXPORT std::string
+format (const std::string& greeting, const std::string& name);