From 8bb21cfef3955e42bab30ca2dd074f29be5c2c36 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 19 Jun 2017 18:25:43 +0300 Subject: Move project into intermediate sub-directory --- .gitignore | 17 ----------------- build/.gitignore | 1 - build/bootstrap.build | 7 ------- build/root.build | 9 --------- buildfile | 11 ----------- hello.cxx | 22 ---------------------- hello/.gitignore | 17 +++++++++++++++++ hello/build/.gitignore | 1 + hello/build/bootstrap.build | 7 +++++++ hello/build/root.build | 9 +++++++++ hello/buildfile | 11 +++++++++++ hello/hello.cxx | 22 ++++++++++++++++++++++ hello/manifest | 18 ++++++++++++++++++ hello/test.out | 2 ++ manifest | 18 ------------------ test.out | 2 -- 16 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 .gitignore delete mode 100644 build/.gitignore delete mode 100644 build/bootstrap.build delete mode 100644 build/root.build delete mode 100644 buildfile delete mode 100644 hello.cxx create mode 100644 hello/.gitignore create mode 100644 hello/build/.gitignore create mode 100644 hello/build/bootstrap.build create mode 100644 hello/build/root.build create mode 100644 hello/buildfile create mode 100644 hello/hello.cxx create mode 100644 hello/manifest create mode 100644 hello/test.out delete mode 100644 manifest delete mode 100644 test.out diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1e10829..0000000 --- a/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -# Compiler/linker output. -# -*.d -*.ii -*.o -*.obj -*.so -*.dll -*.a -*.lib -*.exp -*.exe -*.exe.dlls/ -*.exe.manifest - -hello -version diff --git a/build/.gitignore b/build/.gitignore deleted file mode 100644 index 225c27f..0000000 --- a/build/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.build diff --git a/build/bootstrap.build b/build/bootstrap.build deleted file mode 100644 index 5990cab..0000000 --- a/build/bootstrap.build +++ /dev/null @@ -1,7 +0,0 @@ -project = hello - -using version -using config -using dist -using test -using install diff --git a/build/root.build b/build/root.build deleted file mode 100644 index 7c65dab..0000000 --- a/build/root.build +++ /dev/null @@ -1,9 +0,0 @@ -cxx.std = 11 - -using cxx - -cxx{*}: extension = cxx - -# Specify the test target for cross-testing. -# -test.target = $cxx.target diff --git a/buildfile b/buildfile deleted file mode 100644 index 95ac13d..0000000 --- a/buildfile +++ /dev/null @@ -1,11 +0,0 @@ -import libs = libhello%lib{hello} - -./: exe{hello} doc{version} file{manifest} - -doc{version}: file{manifest} # Generated by the version module. -doc{version}: dist = true - -exe{hello}: cxx{hello} $libs -exe{hello}: test.arguments = World "Planet #345732" -exe{hello}: test.output = test.out - diff --git a/hello.cxx b/hello.cxx deleted file mode 100644 index 728af76..0000000 --- a/hello.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// file: hello.cxx -*- C++ -*- - -#include - -#include - -using namespace std; - -int -main (int argc, char* argv[]) -{ - if (argc < 2) - { - cerr << "usage: hello ..." << endl; - return 1; - } - - using hello::say; - - for (int i (1); i != argc; ++i) - say (argv[i]); -} diff --git a/hello/.gitignore b/hello/.gitignore new file mode 100644 index 0000000..1e10829 --- /dev/null +++ b/hello/.gitignore @@ -0,0 +1,17 @@ +# Compiler/linker output. +# +*.d +*.ii +*.o +*.obj +*.so +*.dll +*.a +*.lib +*.exp +*.exe +*.exe.dlls/ +*.exe.manifest + +hello +version diff --git a/hello/build/.gitignore b/hello/build/.gitignore new file mode 100644 index 0000000..225c27f --- /dev/null +++ b/hello/build/.gitignore @@ -0,0 +1 @@ +config.build diff --git a/hello/build/bootstrap.build b/hello/build/bootstrap.build new file mode 100644 index 0000000..5990cab --- /dev/null +++ b/hello/build/bootstrap.build @@ -0,0 +1,7 @@ +project = hello + +using version +using config +using dist +using test +using install diff --git a/hello/build/root.build b/hello/build/root.build new file mode 100644 index 0000000..7c65dab --- /dev/null +++ b/hello/build/root.build @@ -0,0 +1,9 @@ +cxx.std = 11 + +using cxx + +cxx{*}: extension = cxx + +# Specify the test target for cross-testing. +# +test.target = $cxx.target diff --git a/hello/buildfile b/hello/buildfile new file mode 100644 index 0000000..95ac13d --- /dev/null +++ b/hello/buildfile @@ -0,0 +1,11 @@ +import libs = libhello%lib{hello} + +./: exe{hello} doc{version} file{manifest} + +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true + +exe{hello}: cxx{hello} $libs +exe{hello}: test.arguments = World "Planet #345732" +exe{hello}: test.output = test.out + diff --git a/hello/hello.cxx b/hello/hello.cxx new file mode 100644 index 0000000..728af76 --- /dev/null +++ b/hello/hello.cxx @@ -0,0 +1,22 @@ +// file: hello.cxx -*- C++ -*- + +#include + +#include + +using namespace std; + +int +main (int argc, char* argv[]) +{ + if (argc < 2) + { + cerr << "usage: hello ..." << endl; + return 1; + } + + using hello::say; + + for (int i (1); i != argc; ++i) + say (argv[i]); +} diff --git a/hello/manifest b/hello/manifest new file mode 100644 index 0000000..fb0a6d7 --- /dev/null +++ b/hello/manifest @@ -0,0 +1,18 @@ +: 1 +name: hello +version: 1.0.0 +summary: The "Hello World" example program +license: MIT +tags: c++, hello, world, example +description: \ +A simple program that implements the "Hello World" example in C++ using the +libhello library. Its primary goal is to show a canonical build2/bpkg +project/package. +\ +url: http://www.example.org/hello +email: hello-users@example.org +build-email: builds@build2.org +requires: c++11 +depends: * build2 >= 0.5.0- +depends: * bpkg >= 0.5.0- +depends: libhello [1.0.0 2.0.0-); compatible with libhello-1.X.Y diff --git a/hello/test.out b/hello/test.out new file mode 100644 index 0000000..275233c --- /dev/null +++ b/hello/test.out @@ -0,0 +1,2 @@ +Hello, World! +Hello, Planet #345732! diff --git a/manifest b/manifest deleted file mode 100644 index fb0a6d7..0000000 --- a/manifest +++ /dev/null @@ -1,18 +0,0 @@ -: 1 -name: hello -version: 1.0.0 -summary: The "Hello World" example program -license: MIT -tags: c++, hello, world, example -description: \ -A simple program that implements the "Hello World" example in C++ using the -libhello library. Its primary goal is to show a canonical build2/bpkg -project/package. -\ -url: http://www.example.org/hello -email: hello-users@example.org -build-email: builds@build2.org -requires: c++11 -depends: * build2 >= 0.5.0- -depends: * bpkg >= 0.5.0- -depends: libhello [1.0.0 2.0.0-); compatible with libhello-1.X.Y diff --git a/test.out b/test.out deleted file mode 100644 index 275233c..0000000 --- a/test.out +++ /dev/null @@ -1,2 +0,0 @@ -Hello, World! -Hello, Planet #345732! -- cgit v1.1