diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-24 16:47:33 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-24 16:47:33 +0200 |
| commit | 0a049bbda4796c685e91e86ba1e3b868e4cabead (patch) | |
| tree | 45d16ac6388ea4f18d7a84d4c0c8bcc33a9bf562 | |
| parent | 8a9e7a174e1573974187c686a7c0d9c0b03715ab (diff) | |
Update for new build2
| -rw-r--r-- | bpkg/buildfile | 3 | ||||
| -rw-r--r-- | build/bootstrap.build | 1 | ||||
| -rw-r--r-- | build/root.build | 12 | ||||
| -rw-r--r-- | tests/manifest-roundtrip/buildfile | 3 | ||||
| -rw-r--r-- | tests/manifest/buildfile | 3 | ||||
| -rw-r--r-- | tests/package-version/buildfile | 1 | ||||
| -rw-r--r-- | tests/repository-location/buildfile | 1 |
7 files changed, 17 insertions, 7 deletions
diff --git a/bpkg/buildfile b/bpkg/buildfile index d887750..41cdb66 100644 --- a/bpkg/buildfile +++ b/bpkg/buildfile @@ -2,7 +2,8 @@ # copyright : Copyright (c) 2014-2015 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl +import libs += libbutl%lib{butl} + lib{bpkg}: cxx{manifest-parser manifest-serializer manifest} $libs cxx.poptions += -I$src_root lib{bpkg}: cxx.export.poptions = -I$src_root diff --git a/build/bootstrap.build b/build/bootstrap.build index 0fff8ad..4c443a9 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -4,3 +4,4 @@ project = libbpkg using config +using test diff --git a/build/root.build b/build/root.build index 1361f7b..4f10ff1 100644 --- a/build/root.build +++ b/build/root.build @@ -4,4 +4,16 @@ using cxx +hxx.ext = +ixx.ext = ixx +txx.ext = txx +cxx.ext = cxx + cxx.std = 14 + +# All exe{} in tests/ are, well, tests. +# +tests/: +{ + test.exe = true +} diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile index 0883303..d6133e9 100644 --- a/tests/manifest-roundtrip/buildfile +++ b/tests/manifest-roundtrip/buildfile @@ -3,7 +3,6 @@ # license : MIT; see accompanying LICENSE file exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} +exe{driver}: test.roundtrip = manifest include ../../bpkg/ - -# test: ./driver manifest | diff -u manifest - diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile index 8b2082b..9dc2258 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -3,7 +3,6 @@ # license : MIT; see accompanying LICENSE file exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} +exe{driver}: test.roundtrip = manifest include ../../bpkg/ - -# test: ./driver manifest | diff -u manifest - diff --git a/tests/package-version/buildfile b/tests/package-version/buildfile index 38430dc..2fc3c01 100644 --- a/tests/package-version/buildfile +++ b/tests/package-version/buildfile @@ -6,4 +6,3 @@ exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} include ../../bpkg/ -# test: ./driver diff --git a/tests/repository-location/buildfile b/tests/repository-location/buildfile index 24c6335..1a8e2f7 100644 --- a/tests/repository-location/buildfile +++ b/tests/repository-location/buildfile @@ -6,4 +6,3 @@ exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} include ../../bpkg/ -# test: ./driver |