aboutsummaryrefslogtreecommitdiff
path: root/tests/common/libhello-1.0.0
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-05-01 13:50:13 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-05-01 15:02:14 +0300
commit2319d01e262b705716e19474865f555f3ca81a7d (patch)
tree15ffb5b3f998a2cc0def729d2f1f76f578d8d139 /tests/common/libhello-1.0.0
parent5fb0df6f63e02c141e8a0e5ad4543dea525df3fc (diff)
Add hxx extension for headers and lib prefix for library dirs
Diffstat (limited to 'tests/common/libhello-1.0.0')
-rw-r--r--tests/common/libhello-1.0.0/build/export.build4
-rw-r--r--tests/common/libhello-1.0.0/build/root.build2
-rw-r--r--tests/common/libhello-1.0.0/buildfile2
-rw-r--r--tests/common/libhello-1.0.0/libhello/buildfile (renamed from tests/common/libhello-1.0.0/hello/buildfile)4
-rw-r--r--tests/common/libhello-1.0.0/libhello/export.hxx (renamed from tests/common/libhello-1.0.0/hello/export)2
-rw-r--r--tests/common/libhello-1.0.0/libhello/hello.cxx (renamed from tests/common/libhello-1.0.0/hello/hello.cxx)4
-rw-r--r--tests/common/libhello-1.0.0/libhello/hello.hxx (renamed from tests/common/libhello-1.0.0/hello/hello)4
-rw-r--r--tests/common/libhello-1.0.0/tests/.gitignore1
-rw-r--r--tests/common/libhello-1.0.0/tests/build/root.build2
-rw-r--r--tests/common/libhello-1.0.0/tests/test/driver.cxx2
10 files changed, 14 insertions, 13 deletions
diff --git a/tests/common/libhello-1.0.0/build/export.build b/tests/common/libhello-1.0.0/build/export.build
index 1eb73b7..0151425 100644
--- a/tests/common/libhello-1.0.0/build/export.build
+++ b/tests/common/libhello-1.0.0/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/tests/common/libhello-1.0.0/build/root.build b/tests/common/libhello-1.0.0/build/root.build
index 4f70114..8ceadfa 100644
--- a/tests/common/libhello-1.0.0/build/root.build
+++ b/tests/common/libhello-1.0.0/build/root.build
@@ -2,5 +2,5 @@ cxx.std = 11
using cxx
-hxx{*}: extension =
+hxx{*}: extension = hxx
cxx{*}: extension = cxx
diff --git a/tests/common/libhello-1.0.0/buildfile b/tests/common/libhello-1.0.0/buildfile
index 57e0f35..b3ad7e3 100644
--- a/tests/common/libhello-1.0.0/buildfile
+++ b/tests/common/libhello-1.0.0/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/tests/common/libhello-1.0.0/hello/buildfile b/tests/common/libhello-1.0.0/libhello/buildfile
index 9af86cf..f79b9e7 100644
--- a/tests/common/libhello-1.0.0/hello/buildfile
+++ b/tests/common/libhello-1.0.0/libhello/buildfile
@@ -16,6 +16,6 @@ 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 into the libhello/ subdirectory of, say, /usr/include/.
#
-install.include = $install.include/hello/
+install.include = $install.include/libhello/
diff --git a/tests/common/libhello-1.0.0/hello/export b/tests/common/libhello-1.0.0/libhello/export.hxx
index 18f4968..e6c723e 100644
--- a/tests/common/libhello-1.0.0/hello/export
+++ b/tests/common/libhello-1.0.0/libhello/export.hxx
@@ -1,4 +1,4 @@
-// file: hello/export -*- C++ -*-
+// file: libhello/export.hxx -*- C++ -*-
#pragma once
diff --git a/tests/common/libhello-1.0.0/hello/hello.cxx b/tests/common/libhello-1.0.0/libhello/hello.cxx
index 65d0aa7..677815d 100644
--- a/tests/common/libhello-1.0.0/hello/hello.cxx
+++ b/tests/common/libhello-1.0.0/libhello/hello.cxx
@@ -1,6 +1,6 @@
-// file: hello/hello.cxx -*- C++ -*-
+// file: libhello/hello.cxx -*- C++ -*-
-#include <hello/hello>
+#include <libhello/hello.hxx>
#include <iostream>
diff --git a/tests/common/libhello-1.0.0/hello/hello b/tests/common/libhello-1.0.0/libhello/hello.hxx
index 5fb7d9e..58bd7b2 100644
--- a/tests/common/libhello-1.0.0/hello/hello
+++ b/tests/common/libhello-1.0.0/libhello/hello.hxx
@@ -1,10 +1,10 @@
-// file: hello/hello -*- C++ -*-
+// file: libhello/hello.hxx -*- C++ -*-
#pragma once
#include <string>
-#include <hello/export>
+#include <libhello/export.hxx>
namespace hello
{
diff --git a/tests/common/libhello-1.0.0/tests/.gitignore b/tests/common/libhello-1.0.0/tests/.gitignore
new file mode 100644
index 0000000..93fe433
--- /dev/null
+++ b/tests/common/libhello-1.0.0/tests/.gitignore
@@ -0,0 +1 @@
+!test/
diff --git a/tests/common/libhello-1.0.0/tests/build/root.build b/tests/common/libhello-1.0.0/tests/build/root.build
index de723b8..a2ee38a 100644
--- a/tests/common/libhello-1.0.0/tests/build/root.build
+++ b/tests/common/libhello-1.0.0/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/common/libhello-1.0.0/tests/test/driver.cxx b/tests/common/libhello-1.0.0/tests/test/driver.cxx
index 59bfb2d..38937f0 100644
--- a/tests/common/libhello-1.0.0/tests/test/driver.cxx
+++ b/tests/common/libhello-1.0.0/tests/test/driver.cxx
@@ -1,6 +1,6 @@
// file: tests/test/driver.cxx -*- C++ -*-
-#include <hello/hello>
+#include <libhello/hello.hxx>
int
main ()