From a791b1ce0fa2bc9859474fb6f7a9c0ff8cbd1d4a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 22 Feb 2017 00:58:53 +0300 Subject: Port test.sh to testscript --- .../common/libhello-1.0.0/hello/buildfile | 21 ------------- .../build2.org/common/libhello-1.0.0/hello/export | 36 ---------------------- .../1/build2.org/common/libhello-1.0.0/hello/hello | 13 -------- .../common/libhello-1.0.0/hello/hello.cxx | 16 ---------- 4 files changed, 86 deletions(-) delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx (limited to 'tests/pkg/1/build2.org/common/libhello-1.0.0/hello') diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile deleted file mode 100644 index bff7fce..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile +++ /dev/null @@ -1,21 +0,0 @@ -lib{hello}: {hxx cxx}{hello} 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 $abi_prerelease - lib{hello}: bin.lib.version = @-$version -else - lib{hello}: bin.lib.version = @-$abi_major.$abi_minor - -cxx.poptions += "-I$src_root" -obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD - -lib{hello}: cxx.export.poptions = "-I$src_root" -liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC -libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED - -# 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/hello/export b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export deleted file mode 100644 index 18f4968..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello deleted file mode 100644 index 5fb7d9e..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello +++ /dev/null @@ -1,13 +0,0 @@ -// file: hello/hello -*- C++ -*- - -#pragma once - -#include - -#include - -namespace hello -{ - LIBHELLO_EXPORT void - say (const std::string& name); -} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx deleted file mode 100644 index 65d0aa7..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// file: hello/hello.cxx -*- C++ -*- - -#include - -#include - -using namespace std; - -namespace hello -{ - void - say (const string& n) - { - cout << "Hello, " << n << '!' << endl; - } -} -- cgit v1.1