diff options
| -rw-r--r-- | buildfile | 4 | ||||
| -rw-r--r-- | libbpkg/buildfile | 6 | ||||
| -rw-r--r-- | tests/buildfile | 5 | ||||
| -rw-r--r-- | tests/manifest/buildfile | 2 | ||||
| -rw-r--r-- | tests/package-version/buildfile | 2 | ||||
| -rw-r--r-- | tests/repository-location/buildfile | 2 |
6 files changed, 7 insertions, 14 deletions
@@ -2,12 +2,12 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -./: libbpkg/ tests/ doc{INSTALL LICENSE NEWS README version} file{manifest} +./: {*/ -build/} doc{INSTALL LICENSE NEWS README version} file{manifest} doc{version}: file{manifest} # Generated by the version module. doc{version}: dist = true # Don't install tests or the INSTALL file. # -dir{tests/}: install = false +dir{tests/}: install = false doc{INSTALL}@./: install = false diff --git a/libbpkg/buildfile b/libbpkg/buildfile index 8fda226..17ec0bd 100644 --- a/libbpkg/buildfile +++ b/libbpkg/buildfile @@ -4,11 +4,7 @@ import int_libs = libbutl%lib{butl} -lib{bpkg}: \ -{hxx }{ export } \ -{hxx cxx}{ manifest } \ -{hxx }{ version } \ - $int_libs +lib{bpkg}: {hxx ixx txx cxx}{** -version} {hxx}{version} $int_libs hxx{version}: in{version} $src_root/file{manifest} hxx{version}: dist = true diff --git a/tests/buildfile b/tests/buildfile index 47f5226..9eea969 100644 --- a/tests/buildfile +++ b/tests/buildfile @@ -2,7 +2,4 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -d = manifest/ package-version/ repository-location/ - -./: $d -include $d +./: {*/ -build/} diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile index ddc5938..964f4e4 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs test{testscript} +exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs test{testscript} include ../../libbpkg/ diff --git a/tests/package-version/buildfile b/tests/package-version/buildfile index 422e92a..044ded6 100644 --- a/tests/package-version/buildfile +++ b/tests/package-version/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs +exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs include ../../libbpkg/ diff --git a/tests/repository-location/buildfile b/tests/repository-location/buildfile index ecd7da2..813aa73 100644 --- a/tests/repository-location/buildfile +++ b/tests/repository-location/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs +exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs include ../../libbpkg/ |