diff options
| -rw-r--r-- | bbot/.gitignore | 1 | ||||
| -rw-r--r-- | build/export.build | 4 | ||||
| -rw-r--r-- | build/root.build | 2 | ||||
| -rw-r--r-- | buildfile | 2 | ||||
| -rw-r--r-- | libbbot/.gitignore | 1 | ||||
| -rw-r--r-- | libbbot/build-config.cxx (renamed from bbot/build-config.cxx) | 6 | ||||
| -rw-r--r-- | libbbot/build-config.hxx (renamed from bbot/build-config) | 12 | ||||
| -rw-r--r-- | libbbot/buildfile (renamed from bbot/buildfile) | 6 | ||||
| -rw-r--r-- | libbbot/export.hxx (renamed from bbot/export) | 8 | ||||
| -rw-r--r-- | libbbot/manifest.cxx (renamed from bbot/manifest.cxx) | 4 | ||||
| -rw-r--r-- | libbbot/manifest.hxx (renamed from bbot/manifest) | 12 | ||||
| -rw-r--r-- | libbbot/version.hxx.in (renamed from bbot/version.in) | 2 | ||||
| -rw-r--r-- | tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/buildtab/buildfile | 4 | ||||
| -rw-r--r-- | tests/buildtab/driver.cxx | 2 | ||||
| -rw-r--r-- | tests/manifest/buildfile | 4 | ||||
| -rw-r--r-- | tests/manifest/driver.cxx | 2 |
17 files changed, 38 insertions, 36 deletions
diff --git a/bbot/.gitignore b/bbot/.gitignore deleted file mode 100644 index 088eda4..0000000 --- a/bbot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -version diff --git a/build/export.build b/build/export.build index 013e46f..66f5d7d 100644 --- a/build/export.build +++ b/build/export.build @@ -4,7 +4,7 @@ $out_root/: { - include bbot/ + include libbbot/ } -export $out_root/bbot/lib{bbot} +export $out_root/libbbot/lib{bbot} diff --git a/build/root.build b/build/root.build index af2c962..196d2a3 100644 --- a/build/root.build +++ b/build/root.build @@ -6,7 +6,7 @@ cxx.std = latest using cxx -hxx{*}: extension = +hxx{*}: extension = hxx ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx @@ -2,7 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -./: bbot/ tests/ doc{INSTALL LICENSE NEWS README version} file{manifest} +./: libbbot/ tests/ doc{INSTALL LICENSE NEWS README version} file{manifest} doc{version}: file{manifest} # Generated by the version module. doc{version}: dist = true diff --git a/libbbot/.gitignore b/libbbot/.gitignore new file mode 100644 index 0000000..426db9e --- /dev/null +++ b/libbbot/.gitignore @@ -0,0 +1 @@ +version.hxx diff --git a/bbot/build-config.cxx b/libbbot/build-config.cxx index 0ee00e9..d902d42 100644 --- a/bbot/build-config.cxx +++ b/libbbot/build-config.cxx @@ -1,8 +1,8 @@ -// file : bbot/build-config.cxx -*- C++ -*- +// file : libbbot/build-config.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <bbot/build-config> +#include <libbbot/build-config.hxx> #include <string> #include <cstddef> // size_t @@ -13,7 +13,7 @@ #include <butl/fdstream> #include <butl/tab-parser> -#include <bbot/manifest> // task_manifest::check_config() +#include <libbbot/manifest.hxx> // task_manifest::check_config() using namespace std; using namespace butl; diff --git a/bbot/build-config b/libbbot/build-config.hxx index d7a07d9..8a2e2d7 100644 --- a/bbot/build-config +++ b/libbbot/build-config.hxx @@ -1,9 +1,9 @@ -// file : bbot/build-config -*- C++ -*- +// file : libbbot/build-config.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BBOT_BUILD_CONFIG -#define BBOT_BUILD_CONFIG +#ifndef LIBBBOT_BUILD_CONFIG_HXX +#define LIBBBOT_BUILD_CONFIG_HXX #include <string> #include <vector> @@ -14,8 +14,8 @@ #include <butl/tab-parser> #include <butl/target-triplet> -#include <bbot/export> -#include <bbot/version> +#include <libbbot/export.hxx> +#include <libbbot/version.hxx> namespace bbot { @@ -50,4 +50,4 @@ namespace bbot parse_buildtab (const butl::path&); } -#endif // BBOT_BUILD_CONFIG +#endif // LIBBBOT_BUILD_CONFIG_HXX diff --git a/bbot/buildfile b/libbbot/buildfile index 1c7da48..c143032 100644 --- a/bbot/buildfile +++ b/libbbot/buildfile @@ -1,4 +1,4 @@ -# file : bbot/buildfile +# file : libbbot/buildfile # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file @@ -32,6 +32,6 @@ libs{bbot}: cxx.export.poptions += -DLIBBBOT_SHARED lib{bbot}: cxx.export.libs = $int_libs -# Install into the bbot/ subdirectory of, say, /usr/include/. +# Install into the libbbot/ subdirectory of, say, /usr/include/. # -install.include = $install.include/bbot/ +install.include = $install.include/libbbot/ diff --git a/bbot/export b/libbbot/export.hxx index 6947752..eef4cf7 100644 --- a/bbot/export +++ b/libbbot/export.hxx @@ -1,9 +1,9 @@ -// file : bbot/export -*- C++ -*- +// file : libbbot/export.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BBOT_EXPORT -#define BBOT_EXPORT +#ifndef LIBBBOT_EXPORT_HXX +#define LIBBBOT_EXPORT_HXX // Normally we don't export class templates (but do complete specializations), // inline functions, and classes with only inline member functions. Exporting @@ -38,4 +38,4 @@ # define LIBBBOT_EXPORT // Using static or shared. #endif -#endif // BBOT_EXPORT +#endif // LIBBBOT_EXPORT_HXX diff --git a/bbot/manifest.cxx b/libbbot/manifest.cxx index eab563b..3ea9d19 100644 --- a/bbot/manifest.cxx +++ b/libbbot/manifest.cxx @@ -1,8 +1,8 @@ -// file : bbot/manifest.cxx -*- C++ -*- +// file : libbbot/manifest.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <bbot/manifest> +#include <libbbot/manifest.hxx> #include <vector> #include <string> diff --git a/bbot/manifest b/libbbot/manifest.hxx index 115d9b6..615c4f9 100644 --- a/bbot/manifest +++ b/libbbot/manifest.hxx @@ -1,9 +1,9 @@ -// file : bbot/manifest -*- C++ -*- +// file : libbbot/manifest.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BBOT_MANIFEST -#define BBOT_MANIFEST +#ifndef LIBBBOT_MANIFEST_HXX +#define LIBBBOT_MANIFEST_HXX #include <string> #include <vector> @@ -15,8 +15,8 @@ #include <bpkg/manifest> // version, repository_location -#include <bbot/export> -#include <bbot/version> +#include <libbbot/export.hxx> +#include <libbbot/version.hxx> namespace bbot { @@ -294,4 +294,4 @@ namespace bbot }; } -#endif // BBOT_MANIFEST +#endif // LIBBBOT_MANIFEST_HXX diff --git a/bbot/version.in b/libbbot/version.hxx.in index 41c4ce6..6fca06c 100644 --- a/bbot/version.in +++ b/libbbot/version.hxx.in @@ -1,4 +1,4 @@ -// file : bbot/version.in -*- C++ -*- +// file : libbbot/version.hxx.in -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file diff --git a/tests/.gitignore b/tests/.gitignore index e54525b..2e508a9 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1 +1,3 @@ driver +test/ +test-*/ diff --git a/tests/buildtab/buildfile b/tests/buildtab/buildfile index 466c8ad..3da3faa 100644 --- a/tests/buildtab/buildfile +++ b/tests/buildtab/buildfile @@ -4,6 +4,6 @@ import libs = libbutl%lib{butl} -exe{driver}: cxx{driver} ../../bbot/lib{bbot} $libs test{testscript} +exe{driver}: cxx{driver} ../../libbbot/lib{bbot} $libs test{testscript} -include ../../bbot/ +include ../../libbbot/ diff --git a/tests/buildtab/driver.cxx b/tests/buildtab/driver.cxx index c3e3a60..28c48fb 100644 --- a/tests/buildtab/driver.cxx +++ b/tests/buildtab/driver.cxx @@ -8,7 +8,7 @@ #include <butl/utility> // operator<<(ostream,exception) -#include <bbot/build-config> +#include <libbbot/build-config.hxx> using namespace std; using namespace butl; diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile index b9af8ef..15e0b59 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -4,6 +4,6 @@ import libs = libbutl%lib{butl} -exe{driver}: cxx{driver} ../../bbot/lib{bbot} $libs test{*} +exe{driver}: cxx{driver} ../../libbbot/lib{bbot} $libs test{*} -include ../../bbot/ +include ../../libbbot/ diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx index 16240a5..fb58b27 100644 --- a/tests/manifest/driver.cxx +++ b/tests/manifest/driver.cxx @@ -11,7 +11,7 @@ #include <butl/manifest-parser> #include <butl/manifest-serializer> -#include <bbot/manifest> +#include <libbbot/manifest.hxx> using namespace std; using namespace butl; |