diff options
| -rw-r--r-- | bpkg/.gitignore | 1 | ||||
| -rw-r--r-- | build/export.build | 4 | ||||
| -rw-r--r-- | build/root.build | 2 | ||||
| -rw-r--r-- | buildfile | 2 | ||||
| -rw-r--r-- | libbpkg/.gitignore | 1 | ||||
| -rw-r--r-- | libbpkg/buildfile (renamed from bpkg/buildfile) | 6 | ||||
| -rw-r--r-- | libbpkg/export.hxx (renamed from bpkg/export) | 8 | ||||
| -rw-r--r-- | libbpkg/manifest.cxx (renamed from bpkg/manifest.cxx) | 4 | ||||
| -rw-r--r-- | libbpkg/manifest.hxx (renamed from bpkg/manifest) | 14 | ||||
| -rw-r--r-- | libbpkg/version.hxx.in (renamed from bpkg/version.in) | 2 | ||||
| -rw-r--r-- | tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/manifest/buildfile | 4 | ||||
| -rw-r--r-- | tests/manifest/driver.cxx | 2 | ||||
| -rw-r--r-- | tests/package-version/buildfile | 4 | ||||
| -rw-r--r-- | tests/package-version/driver.cxx | 2 | ||||
| -rw-r--r-- | tests/repository-location/buildfile | 4 | ||||
| -rw-r--r-- | tests/repository-location/driver.cxx | 2 |
17 files changed, 33 insertions, 31 deletions
diff --git a/bpkg/.gitignore b/bpkg/.gitignore deleted file mode 100644 index 088eda4..0000000 --- a/bpkg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -version diff --git a/build/export.build b/build/export.build index 58b6799..6e1378c 100644 --- a/build/export.build +++ b/build/export.build @@ -4,7 +4,7 @@ $out_root/: { - include bpkg/ + include libbpkg/ } -export $out_root/bpkg/lib{bpkg} +export $out_root/libbpkg/lib{bpkg} 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 -./: bpkg/ tests/ doc{INSTALL LICENSE NEWS README version} file{manifest} +./: libbpkg/ 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/libbpkg/.gitignore b/libbpkg/.gitignore new file mode 100644 index 0000000..426db9e --- /dev/null +++ b/libbpkg/.gitignore @@ -0,0 +1 @@ +version.hxx diff --git a/bpkg/buildfile b/libbpkg/buildfile index ae87591..8fda226 100644 --- a/bpkg/buildfile +++ b/libbpkg/buildfile @@ -1,4 +1,4 @@ -# file : bpkg/buildfile +# file : libbpkg/buildfile # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file @@ -31,6 +31,6 @@ libs{bpkg}: cxx.export.poptions += -DLIBBPKG_SHARED lib{bpkg}: cxx.export.libs = $int_libs -# Install into the bpkg/ subdirectory of, say, /usr/include/. +# Install into the libbpkg/ subdirectory of, say, /usr/include/. # -install.include = $install.include/bpkg/ +install.include = $install.include/libbpkg/ diff --git a/bpkg/export b/libbpkg/export.hxx index fadf41d..39f33e9 100644 --- a/bpkg/export +++ b/libbpkg/export.hxx @@ -1,9 +1,9 @@ -// file : bpkg/export -*- C++ -*- +// file : libbpkg/export.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BPKG_EXPORT -#define BPKG_EXPORT +#ifndef LIBBPKG_EXPORT_HXX +#define LIBBPKG_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 LIBBPKG_EXPORT // Using static or shared. #endif -#endif // BPKG_EXPORT +#endif // LIBBPKG_EXPORT_HXX diff --git a/bpkg/manifest.cxx b/libbpkg/manifest.cxx index ef86b99..2b34695 100644 --- a/bpkg/manifest.cxx +++ b/libbpkg/manifest.cxx @@ -1,8 +1,8 @@ -// file : bpkg/manifest.cxx -*- C++ -*- +// file : libbpkg/manifest.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <bpkg/manifest> +#include <libbpkg/manifest.hxx> #include <string> #include <ostream> diff --git a/bpkg/manifest b/libbpkg/manifest.hxx index d6caabf..1b8c694 100644 --- a/bpkg/manifest +++ b/libbpkg/manifest.hxx @@ -1,9 +1,9 @@ -// file : bpkg/manifest -*- C++ -*- +// file : libbpkg/manifest.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BPKG_MANIFEST -#define BPKG_MANIFEST +#ifndef LIBBPKG_MANIFEST_HXX +#define LIBBPKG_MANIFEST_HXX #include <string> #include <vector> @@ -17,14 +17,14 @@ #include <butl/optional> #include <butl/manifest-forward> -#include <bpkg/export> -#include <bpkg/version> +#include <libbpkg/export.hxx> +#include <libbpkg/version.hxx> namespace bpkg { using strings = std::vector<std::string>; - // @@ Let's create <bpkg/types> with "basic" package types. + // @@ Let's create <libbpkg/types.hxx> with "basic" package types. // class LIBBPKG_EXPORT version { @@ -633,4 +633,4 @@ namespace bpkg }; } -#endif // BPKG_MANIFEST +#endif // LIBBPKG_MANIFEST_HXX diff --git a/bpkg/version.in b/libbpkg/version.hxx.in index 113c9bf..26c6d95 100644 --- a/bpkg/version.in +++ b/libbpkg/version.hxx.in @@ -1,4 +1,4 @@ -// file : bpkg/version.in -*- C++ -*- +// file : libbpkg/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/manifest/buildfile b/tests/manifest/buildfile index c35024c..ddc5938 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs test{testscript} +exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs test{testscript} -include ../../bpkg/ +include ../../libbpkg/ diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx index 2b93e5a..157546e 100644 --- a/tests/manifest/driver.cxx +++ b/tests/manifest/driver.cxx @@ -10,7 +10,7 @@ #include <butl/manifest-parser> #include <butl/manifest-serializer> -#include <bpkg/manifest> +#include <libbpkg/manifest.hxx> using namespace std; using namespace butl; diff --git a/tests/package-version/buildfile b/tests/package-version/buildfile index 9a47c0b..422e92a 100644 --- a/tests/package-version/buildfile +++ b/tests/package-version/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs +exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs -include ../../bpkg/ +include ../../libbpkg/ diff --git a/tests/package-version/driver.cxx b/tests/package-version/driver.cxx index 60460ab..4659db9 100644 --- a/tests/package-version/driver.cxx +++ b/tests/package-version/driver.cxx @@ -12,7 +12,7 @@ #include <butl/utility> // operator<<(ostream, exception) #include <butl/optional> -#include <bpkg/manifest> +#include <libbpkg/manifest.hxx> using namespace std; using namespace butl; diff --git a/tests/repository-location/buildfile b/tests/repository-location/buildfile index 54811d3..ecd7da2 100644 --- a/tests/repository-location/buildfile +++ b/tests/repository-location/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs +exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs -include ../../bpkg/ +include ../../libbpkg/ diff --git a/tests/repository-location/driver.cxx b/tests/repository-location/driver.cxx index 953193a..3122393 100644 --- a/tests/repository-location/driver.cxx +++ b/tests/repository-location/driver.cxx @@ -13,7 +13,7 @@ #include <butl/optional> #include <butl/manifest-parser> -#include <bpkg/manifest> +#include <libbpkg/manifest.hxx> using namespace std; using namespace butl; |