From af00f71ee83a06fa8bb0066b01e2565619b298ae Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 30 Jan 2016 20:26:28 +0200 Subject: Update to use new libhello --- tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz | Bin 0 -> 1489 bytes tests/repository/1/common/hello/libhello-1.0.0.tar.gz | Bin 1446 -> 0 bytes .../1/common/libhello-1.0.0+1/build/bootstrap.build | 15 +++++++++++++++ .../1/common/libhello-1.0.0+1/build/export.build | 6 ++++++ .../1/common/libhello-1.0.0+1/build/root.build | 10 ++++++++++ tests/repository/1/common/libhello-1.0.0+1/buildfile | 3 +++ .../1/common/libhello-1.0.0+1/hello/buildfile | 8 ++++++++ tests/repository/1/common/libhello-1.0.0+1/hello/hello | 11 +++++++++++ .../1/common/libhello-1.0.0+1/hello/hello.cxx | 16 ++++++++++++++++ tests/repository/1/common/libhello-1.0.0+1/manifest | 13 +++++++++++++ .../common/libhello-1.0.0+1/tests/build/bootstrap.build | 5 +++++ .../1/common/libhello-1.0.0+1/tests/build/root.build | 10 ++++++++++ .../1/common/libhello-1.0.0+1/tests/buildfile | 3 +++ .../1/common/libhello-1.0.0+1/tests/test/buildfile | 4 ++++ .../1/common/libhello-1.0.0+1/tests/test/driver.cxx | 11 +++++++++++ .../1/common/libhello-1.0.0+1/tests/test/test.out | 1 + tests/repository/1/common/libhello-1.0.0+1/version | 1 + .../1/common/libhello-1.0.0/build/bootstrap.build | 8 -------- .../1/common/libhello-1.0.0/build/export.build | 6 ------ .../repository/1/common/libhello-1.0.0/build/root.build | 10 ---------- tests/repository/1/common/libhello-1.0.0/buildfile | 3 --- .../repository/1/common/libhello-1.0.0/hello/buildfile | 8 -------- tests/repository/1/common/libhello-1.0.0/hello/hello | 12 ------------ .../repository/1/common/libhello-1.0.0/hello/hello.cxx | 16 ---------------- tests/repository/1/common/libhello-1.0.0/manifest | 10 ---------- .../1/common/libhello-1.0.0/tests/build/bootstrap.build | 4 ---- .../1/common/libhello-1.0.0/tests/build/root.build | 10 ---------- .../repository/1/common/libhello-1.0.0/tests/buildfile | 3 --- .../1/common/libhello-1.0.0/tests/test/buildfile | 4 ---- .../1/common/libhello-1.0.0/tests/test/driver.cxx | 11 ----------- .../1/common/libhello-1.0.0/tests/test/test.out | 1 - tests/repository/1/common/libhello-1.0.0/version | 1 - 32 files changed, 117 insertions(+), 107 deletions(-) create mode 100644 tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz delete mode 100644 tests/repository/1/common/hello/libhello-1.0.0.tar.gz create mode 100644 tests/repository/1/common/libhello-1.0.0+1/build/bootstrap.build create mode 100644 tests/repository/1/common/libhello-1.0.0+1/build/export.build create mode 100644 tests/repository/1/common/libhello-1.0.0+1/build/root.build create mode 100644 tests/repository/1/common/libhello-1.0.0+1/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0+1/hello/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0+1/hello/hello create mode 100644 tests/repository/1/common/libhello-1.0.0+1/hello/hello.cxx create mode 100644 tests/repository/1/common/libhello-1.0.0+1/manifest create mode 100644 tests/repository/1/common/libhello-1.0.0+1/tests/build/bootstrap.build create mode 100644 tests/repository/1/common/libhello-1.0.0+1/tests/build/root.build create mode 100644 tests/repository/1/common/libhello-1.0.0+1/tests/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0+1/tests/test/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0+1/tests/test/driver.cxx create mode 100644 tests/repository/1/common/libhello-1.0.0+1/tests/test/test.out create mode 100644 tests/repository/1/common/libhello-1.0.0+1/version delete mode 100644 tests/repository/1/common/libhello-1.0.0/build/bootstrap.build delete mode 100644 tests/repository/1/common/libhello-1.0.0/build/export.build delete mode 100644 tests/repository/1/common/libhello-1.0.0/build/root.build delete mode 100644 tests/repository/1/common/libhello-1.0.0/buildfile delete mode 100644 tests/repository/1/common/libhello-1.0.0/hello/buildfile delete mode 100644 tests/repository/1/common/libhello-1.0.0/hello/hello delete mode 100644 tests/repository/1/common/libhello-1.0.0/hello/hello.cxx delete mode 100644 tests/repository/1/common/libhello-1.0.0/manifest delete mode 100644 tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build delete mode 100644 tests/repository/1/common/libhello-1.0.0/tests/build/root.build delete mode 100644 tests/repository/1/common/libhello-1.0.0/tests/buildfile delete mode 100644 tests/repository/1/common/libhello-1.0.0/tests/test/buildfile delete mode 100644 tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx delete mode 100644 tests/repository/1/common/libhello-1.0.0/tests/test/test.out delete mode 100644 tests/repository/1/common/libhello-1.0.0/version (limited to 'tests/repository') diff --git a/tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz b/tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz new file mode 100644 index 0000000..eeff2a0 Binary files /dev/null and b/tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz differ diff --git a/tests/repository/1/common/hello/libhello-1.0.0.tar.gz b/tests/repository/1/common/hello/libhello-1.0.0.tar.gz deleted file mode 100644 index c1ada1e..0000000 Binary files a/tests/repository/1/common/hello/libhello-1.0.0.tar.gz and /dev/null differ diff --git a/tests/repository/1/common/libhello-1.0.0+1/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0+1/build/bootstrap.build new file mode 100644 index 0000000..c9bf24d --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/build/bootstrap.build @@ -0,0 +1,15 @@ +project = libhello +version = 1.0.0 +revision = 1 + +using config +using dist +using test +using install + +dist.package = $project-$version + +if ($revision != 0) +{ + dist.package += +$revision +} diff --git a/tests/repository/1/common/libhello-1.0.0+1/build/export.build b/tests/repository/1/common/libhello-1.0.0+1/build/export.build new file mode 100644 index 0000000..1eb73b7 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/build/export.build @@ -0,0 +1,6 @@ +$out_root/: +{ + include hello/ +} + +export $out_root/hello/lib{hello} diff --git a/tests/repository/1/common/libhello-1.0.0+1/build/root.build b/tests/repository/1/common/libhello-1.0.0+1/build/root.build new file mode 100644 index 0000000..ebe16d5 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/build/root.build @@ -0,0 +1,10 @@ +using cxx + +hxx{*}: extension = +cxx{*}: extension = cxx + +cxx.std = 11 + +# Don't install tests. +# +tests/: install = false diff --git a/tests/repository/1/common/libhello-1.0.0+1/buildfile b/tests/repository/1/common/libhello-1.0.0+1/buildfile new file mode 100644 index 0000000..f846f89 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/buildfile @@ -0,0 +1,3 @@ +d = hello/ tests/ +./: $d doc{version} file{manifest} +include $d diff --git a/tests/repository/1/common/libhello-1.0.0+1/hello/buildfile b/tests/repository/1/common/libhello-1.0.0+1/hello/buildfile new file mode 100644 index 0000000..4903a33 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/hello/buildfile @@ -0,0 +1,8 @@ +lib{hello}: {hxx cxx}{hello} + +cxx.poptions += -I$src_root +lib{hello}: cxx.export.poptions = -I$src_root + +# Install into the hello/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/hello diff --git a/tests/repository/1/common/libhello-1.0.0+1/hello/hello b/tests/repository/1/common/libhello-1.0.0+1/hello/hello new file mode 100644 index 0000000..4f85114 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/hello/hello @@ -0,0 +1,11 @@ +// file: hello/hello -*- C++ -*- + +#pragma once + +#include + +namespace hello +{ + void + say (const std::string& name); +} diff --git a/tests/repository/1/common/libhello-1.0.0+1/hello/hello.cxx b/tests/repository/1/common/libhello-1.0.0+1/hello/hello.cxx new file mode 100644 index 0000000..65d0aa7 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/hello/hello.cxx @@ -0,0 +1,16 @@ +// file: hello/hello.cxx -*- C++ -*- + +#include + +#include + +using namespace std; + +namespace hello +{ + void + say (const string& n) + { + cout << "Hello, " << n << '!' << endl; + } +} diff --git a/tests/repository/1/common/libhello-1.0.0+1/manifest b/tests/repository/1/common/libhello-1.0.0+1/manifest new file mode 100644 index 0000000..82d79c8 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/manifest @@ -0,0 +1,13 @@ +: 1 +name: libhello +version: 1.0.0+1 +summary: The "Hello World" example library +license: MIT +tags: c++, hello, world, example +description: \ +A simple library that implements the "Hello World" example in C++. Its primary +goal is to show a canonical build2/bpkg project/package. +\ +url: http://www.example.org/libhello +email: hello-users@example.org +requires: c++11 diff --git a/tests/repository/1/common/libhello-1.0.0+1/tests/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0+1/tests/build/bootstrap.build new file mode 100644 index 0000000..2c2de24 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/tests/build/bootstrap.build @@ -0,0 +1,5 @@ +project = # Unnamed subproject. + +using config +using dist +using test diff --git a/tests/repository/1/common/libhello-1.0.0+1/tests/build/root.build b/tests/repository/1/common/libhello-1.0.0+1/tests/build/root.build new file mode 100644 index 0000000..672eda8 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/tests/build/root.build @@ -0,0 +1,10 @@ +using cxx + +hxx{*}: extension = +cxx{*}: extension = cxx + +cxx.std = 11 + +# Every exe{} in this subproject is by default a test. +# +test.exe = true diff --git a/tests/repository/1/common/libhello-1.0.0+1/tests/buildfile b/tests/repository/1/common/libhello-1.0.0+1/tests/buildfile new file mode 100644 index 0000000..4dcbe2a --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/tests/buildfile @@ -0,0 +1,3 @@ +d = test/ +./: $d +include $d diff --git a/tests/repository/1/common/libhello-1.0.0+1/tests/test/buildfile b/tests/repository/1/common/libhello-1.0.0+1/tests/test/buildfile new file mode 100644 index 0000000..a46969d --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/tests/test/buildfile @@ -0,0 +1,4 @@ +import libs = libhello%lib{hello} + +exe{driver}: cxx{driver} $libs +exe{driver}: test.output = test.out diff --git a/tests/repository/1/common/libhello-1.0.0+1/tests/test/driver.cxx b/tests/repository/1/common/libhello-1.0.0+1/tests/test/driver.cxx new file mode 100644 index 0000000..59bfb2d --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/tests/test/driver.cxx @@ -0,0 +1,11 @@ +// file: tests/test/driver.cxx -*- C++ -*- + +#include + +int +main () +{ + using hello::say; + + say ("World"); +} diff --git a/tests/repository/1/common/libhello-1.0.0+1/tests/test/test.out b/tests/repository/1/common/libhello-1.0.0+1/tests/test/test.out new file mode 100644 index 0000000..8ab686e --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/tests/test/test.out @@ -0,0 +1 @@ +Hello, World! diff --git a/tests/repository/1/common/libhello-1.0.0+1/version b/tests/repository/1/common/libhello-1.0.0+1/version new file mode 100644 index 0000000..3eefcb9 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0+1/version @@ -0,0 +1 @@ +1.0.0 diff --git a/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build deleted file mode 100644 index 6f7d63b..0000000 --- a/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build +++ /dev/null @@ -1,8 +0,0 @@ -project = libhello -version = 1.0.0 -using config -using dist -using test -using install - -dist.package = $project-$version diff --git a/tests/repository/1/common/libhello-1.0.0/build/export.build b/tests/repository/1/common/libhello-1.0.0/build/export.build deleted file mode 100644 index 1eb73b7..0000000 --- a/tests/repository/1/common/libhello-1.0.0/build/export.build +++ /dev/null @@ -1,6 +0,0 @@ -$out_root/: -{ - include hello/ -} - -export $out_root/hello/lib{hello} diff --git a/tests/repository/1/common/libhello-1.0.0/build/root.build b/tests/repository/1/common/libhello-1.0.0/build/root.build deleted file mode 100644 index 1cf158c..0000000 --- a/tests/repository/1/common/libhello-1.0.0/build/root.build +++ /dev/null @@ -1,10 +0,0 @@ -using cxx - -hxx{*}: extension = -cxx{*}: extension = cxx - -cxx.std = 11 - -# Don't try to install tests. -# -tests/: install = false diff --git a/tests/repository/1/common/libhello-1.0.0/buildfile b/tests/repository/1/common/libhello-1.0.0/buildfile deleted file mode 100644 index 563ebdc..0000000 --- a/tests/repository/1/common/libhello-1.0.0/buildfile +++ /dev/null @@ -1,3 +0,0 @@ -d = hello/ tests/ -.: $d file{version manifest} -include $d diff --git a/tests/repository/1/common/libhello-1.0.0/hello/buildfile b/tests/repository/1/common/libhello-1.0.0/hello/buildfile deleted file mode 100644 index cef703d..0000000 --- a/tests/repository/1/common/libhello-1.0.0/hello/buildfile +++ /dev/null @@ -1,8 +0,0 @@ -lib{hello}: cxx{hello} hxx{hello} - -cxx.poptions += -I$src_root -lib{hello}: cxx.export.poptions = -I$src_root - -# Install into the hello/ subdirectory of, say, /usr/include/. -# -install.include = $install.include/hello diff --git a/tests/repository/1/common/libhello-1.0.0/hello/hello b/tests/repository/1/common/libhello-1.0.0/hello/hello deleted file mode 100644 index 64c84b8..0000000 --- a/tests/repository/1/common/libhello-1.0.0/hello/hello +++ /dev/null @@ -1,12 +0,0 @@ -// file: hello/hello -*- C++ -*- - -#ifndef HELLO_HELLO -#define HELLO_HELLO - -namespace hello -{ - void - say (const char* name); -} - -#endif // HELLO_HELLO diff --git a/tests/repository/1/common/libhello-1.0.0/hello/hello.cxx b/tests/repository/1/common/libhello-1.0.0/hello/hello.cxx deleted file mode 100644 index bba6649..0000000 --- a/tests/repository/1/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 char* n) - { - cout << "Hello, " << n << '!' << endl; - } -} diff --git a/tests/repository/1/common/libhello-1.0.0/manifest b/tests/repository/1/common/libhello-1.0.0/manifest deleted file mode 100644 index 065eb38..0000000 --- a/tests/repository/1/common/libhello-1.0.0/manifest +++ /dev/null @@ -1,10 +0,0 @@ -: 1 -name: libhello -version: 1.0.0 -summary: The Hello World example library -license: MIT -tags: c++, hello, world, example -description: A simple library that implements the Hello World example in\ - C++. Its primary goal is to show a canonical build2/bpkg project/package. -url: http://www.example.org/libhello -email: hello-users@example.org diff --git a/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build deleted file mode 100644 index 1151b0c..0000000 --- a/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build +++ /dev/null @@ -1,4 +0,0 @@ -project = # Unnamed. -using config -using dist -using test diff --git a/tests/repository/1/common/libhello-1.0.0/tests/build/root.build b/tests/repository/1/common/libhello-1.0.0/tests/build/root.build deleted file mode 100644 index 0efa852..0000000 --- a/tests/repository/1/common/libhello-1.0.0/tests/build/root.build +++ /dev/null @@ -1,10 +0,0 @@ -using cxx - -hxx{*}: extension = -cxx{*}: extension = cxx - -cxx.std = 11 - -# Every exe{} here is by default a test. -# -test.exe = true diff --git a/tests/repository/1/common/libhello-1.0.0/tests/buildfile b/tests/repository/1/common/libhello-1.0.0/tests/buildfile deleted file mode 100644 index 7688d2c..0000000 --- a/tests/repository/1/common/libhello-1.0.0/tests/buildfile +++ /dev/null @@ -1,3 +0,0 @@ -d = test/ -.: $d -include $d diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile b/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile deleted file mode 100644 index a46969d..0000000 --- a/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile +++ /dev/null @@ -1,4 +0,0 @@ -import libs = libhello%lib{hello} - -exe{driver}: cxx{driver} $libs -exe{driver}: test.output = test.out diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx b/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx deleted file mode 100644 index 59bfb2d..0000000 --- a/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx +++ /dev/null @@ -1,11 +0,0 @@ -// file: tests/test/driver.cxx -*- C++ -*- - -#include - -int -main () -{ - using hello::say; - - say ("World"); -} diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/test.out b/tests/repository/1/common/libhello-1.0.0/tests/test/test.out deleted file mode 100644 index 8ab686e..0000000 --- a/tests/repository/1/common/libhello-1.0.0/tests/test/test.out +++ /dev/null @@ -1 +0,0 @@ -Hello, World! diff --git a/tests/repository/1/common/libhello-1.0.0/version b/tests/repository/1/common/libhello-1.0.0/version deleted file mode 100644 index 3eefcb9..0000000 --- a/tests/repository/1/common/libhello-1.0.0/version +++ /dev/null @@ -1 +0,0 @@ -1.0.0 -- cgit v1.1