From f05b71bd468bac9358d9fae169b4ca147f0e97fb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 4 Sep 2016 15:29:53 +0200
Subject: Update libhello in tests

---
 .../common/libhello-1.0.0+1/hello/buildfile        | 14 ---------
 .../common/libhello-1.0.0+1/hello/export           | 36 ----------------------
 .../build2.org/common/libhello-1.0.0+1/hello/hello | 13 --------
 .../common/libhello-1.0.0+1/hello/hello.cxx        | 16 ----------
 4 files changed, 79 deletions(-)
 delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
 delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export
 delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello
 delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx

(limited to 'tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello')

diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
deleted file mode 100644
index ddd20d5..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
+++ /dev/null
@@ -1,14 +0,0 @@
-lib{hello}: {hxx cxx}{hello}
-
-cxx.poptions += -I$src_root
-lib{hello}: cxx.export.poptions = -I$src_root
-
-liba{butl}: cxx.export.poptions += -DLIBHELLO_STATIC
-libs{butl}: cxx.export.poptions += -DLIBHELLO_SHARED
-
-obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
-
-# Install into the hello/ subdirectory of, say, /usr/include/.
-#
-install.include = $install.include/hello/
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export
deleted file mode 100644
index 2da8177..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/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/import 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 using
-// 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/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello
deleted file mode 100644
index 5fb7d9e..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello
+++ /dev/null
@@ -1,13 +0,0 @@
-// file: hello/hello -*- C++ -*-
-
-#pragma once
-
-#include <string>
-
-#include <hello/export>
-
-namespace hello
-{
-  LIBHELLO_EXPORT void
-  say (const std::string& name);
-}
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx
deleted file mode 100644
index 65d0aa7..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-// file: hello/hello.cxx -*- C++ -*-
-
-#include <hello/hello>
-
-#include <iostream>
-
-using namespace std;
-
-namespace hello
-{
-  void
-  say (const string& n)
-  {
-    cout << "Hello, " << n << '!' << endl;
-  }
-}
-- 
cgit v1.1