diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-28 18:22:11 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-28 18:22:11 +0300 |
| commit | cb93b6b3f03536ca833bde8d8d7a0018cf94927a (patch) | |
| tree | 580233cfcd00e4018b906f04edffc9cfc93ddb8a /tests/common | |
| parent | 67ab77401f4b1c4580b7ce54a783843e31a55ebb (diff) | |
Make tests to pass
Diffstat (limited to 'tests/common')
| -rw-r--r-- | tests/common/hello/libhello-1.0.0.tar.gz | bin | 2483 -> 2362 bytes | |||
| -rw-r--r-- | tests/common/libhello-1.0.0/buildfile | 7 | ||||
| -rw-r--r-- | tests/common/libhello-1.0.0/hello/buildfile | 6 | ||||
| -rw-r--r-- | tests/common/libhello-1.0.0/manifest | 2 | ||||
| -rw-r--r-- | tests/common/libhello-1.0.0/version | 1 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz Binary files differindex e9d9ff1..29341c7 100644 --- a/tests/common/hello/libhello-1.0.0.tar.gz +++ b/tests/common/hello/libhello-1.0.0.tar.gz diff --git a/tests/common/libhello-1.0.0/buildfile b/tests/common/libhello-1.0.0/buildfile index a416648..57e0f35 100644 --- a/tests/common/libhello-1.0.0/buildfile +++ b/tests/common/libhello-1.0.0/buildfile @@ -1,6 +1,7 @@ -d = hello/ tests/ -./: $d doc{INSTALL version} file{manifest} -include $d +./: hello/ tests/ doc{INSTALL version} file{manifest} + +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true # Don't install tests or the INSTALL file. # diff --git a/tests/common/libhello-1.0.0/hello/buildfile b/tests/common/libhello-1.0.0/hello/buildfile index bff7fce..9af86cf 100644 --- a/tests/common/libhello-1.0.0/hello/buildfile +++ b/tests/common/libhello-1.0.0/hello/buildfile @@ -3,10 +3,10 @@ lib{hello}: {hxx cxx}{hello} hxx{export} # For pre-releases use the complete version to make sure they cannot be used # in place of another pre-release or the final version. # -if $abi_prerelease - lib{hello}: bin.lib.version = @-$version +if $version.pre_release + lib{hello}: bin.lib.version = @"-$version.project_id" else - lib{hello}: bin.lib.version = @-$abi_major.$abi_minor + lib{hello}: bin.lib.version = @"-$version.major.$version.minor" cxx.poptions += "-I$src_root" obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD diff --git a/tests/common/libhello-1.0.0/manifest b/tests/common/libhello-1.0.0/manifest index 75dc91b..d7d43a7 100644 --- a/tests/common/libhello-1.0.0/manifest +++ b/tests/common/libhello-1.0.0/manifest @@ -11,4 +11,4 @@ goal is to show a canonical build2/bpkg project/package. url: http://www.example.org/libhello email: hello-users@example.org requires: c++11 -requires: build2 >= 0.4.0 +depends: * build2 >= 0.5.0- diff --git a/tests/common/libhello-1.0.0/version b/tests/common/libhello-1.0.0/version deleted file mode 100644 index 3eefcb9..0000000 --- a/tests/common/libhello-1.0.0/version +++ /dev/null @@ -1 +0,0 @@ -1.0.0 |