22 files changed, 104 insertions, 77 deletions
diff --git a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz
deleted file mode 100644
index 5850e44..0000000
--- a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz
new file mode 100644
index 0000000..de9d167
--- /dev/null
+++ b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/buildfile
deleted file mode 100644
index f846f89..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/buildfile
+++ /dev/null
@@ -1,3 +0,0 @@
-d = hello/ tests/
-./: $d doc{version} file{manifest}
-include $d
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
deleted file mode 100644
index ddd20d5..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
+++ /dev/null
@@ -1,14 +0,0 @@
-lib{hello}: {hxx cxx}{hello}
-
-cxx.poptions += -I$src_root
-lib{hello}: cxx.export.poptions = -I$src_root
-
-liba{butl}: cxx.export.poptions += -DLIBHELLO_STATIC
-libs{butl}: cxx.export.poptions += -DLIBHELLO_SHARED
-
-obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
-
-# Install into the hello/ subdirectory of, say, /usr/include/.
-#
-install.include = $install.include/hello/
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL b/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL
new file mode 100644
index 0000000..485b10f
--- /dev/null
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL
@@ -0,0 +1 @@
+Just use build2, bro.
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build
index c9bf24d..8d8db2b 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/bootstrap.build
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build
@@ -1,15 +1,22 @@
 project = libhello
+
+using build@0.4.0-a1
+
 version = 1.0.0
-revision = 1
 
-using config
-using dist
-using test
-using install
+abi_major = 1
+abi_minor = 0
+abi_patch = 0
+abi_prerelease = false
+
+revision = 0
 
 dist.package = $project-$version
 
 if ($revision != 0)
-{
   dist.package += +$revision
-}
+
+using config
+using dist
+using test
+using install
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/export.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build
index 1eb73b7..1eb73b7 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/export.build
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build
index d7f04c2..4f70114 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/root.build
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build
@@ -1,10 +1,6 @@
+cxx.std = 11
+
 using cxx
 
 hxx{*}: extension =
 cxx{*}: extension = cxx
-
-cxx.std = 11
-
-# Don't install tests.
-#
-dir{tests/}: install = false
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile
new file mode 100644
index 0000000..a416648
--- /dev/null
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile
@@ -0,0 +1,8 @@
+d = hello/ tests/
+./: $d doc{INSTALL version} file{manifest}
+include $d
+
+# Don't install tests or the INSTALL file.
+#
+dir{tests/}: install = false
+doc{INSTALL}@./: install = false
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile
new file mode 100644
index 0000000..8331a7b
--- /dev/null
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile
@@ -0,0 +1,21 @@
+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
+else
+  lib{hello}: bin.lib.version = @-$abi_major.$abi_minor
+
+cxx.poptions += -I$src_root
+obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
+
+lib{hello}: cxx.export.poptions = -I$src_root
+liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
+libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
+
+# Install into the hello/ subdirectory of, say, /usr/include/.
+#
+install.include = $install.include/hello/
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export
index 2da8177..18f4968 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export
@@ -4,7 +4,7 @@
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
-// classes that inherit from non-exported/import bases (e.g., std::string)
+// classes that inherit from non-exported/imported bases (e.g., std::string)
 // will end up badly. The only known workarounds are to not inherit or to not
 // export. Also, MinGW GCC doesn't like seeing non-exported function being
 // used before their inline definition. The workaround is to reorder code. In
@@ -27,7 +27,7 @@
 #    define LIBHELLO_EXPORT
 #  endif
 #else
-// If none of the above macros are defined, then we assume we are being using
+// If none of the above macros are defined, then we assume we are being used
 // by some third-party build system that cannot/doesn't signal the library
 // type. Note that this fallback works for both static and shared but in case
 // of shared will be sub-optimal compared to having dllimport.
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello
index 5fb7d9e..5fb7d9e 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx
index 65d0aa7..65d0aa7 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/manifest b/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest
index 82d79c8..75dc91b 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/manifest
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libhello
-version: 1.0.0+1
+version: 1.0.0
 summary: The "Hello World" example library
 license: MIT
 tags: c++, hello, world, example
@@ -11,3 +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
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build
index 2c2de24..2c2de24 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/bootstrap.build
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build
index 672eda8..1f7c350 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/root.build
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build
@@ -1,10 +1,10 @@
+cxx.std = 11
+
 using cxx
 
 hxx{*}: extension =
 cxx{*}: extension = cxx
 
-cxx.std = 11
-
 # Every exe{} in this subproject is by default a test.
 #
-test.exe = true
+exe{*}: test = true
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile
index 4dcbe2a..4dcbe2a 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/buildfile
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile
index a46969d..a46969d 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/buildfile
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/driver.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx
index 59bfb2d..59bfb2d 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/driver.cxx
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/test.out b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out
index 8ab686e..8ab686e 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/test.out
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/version b/tests/pkg/1/build2.org/common/libhello-1.0.0/version
index 3eefcb9..3eefcb9 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/version
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/version
diff --git a/tests/test.sh b/tests/test.sh
index 85fde8e..7b2fdf2 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -234,7 +234,7 @@ fail pkg-verify                 # archive expected
 fail pkg-verify ./no-such-file  # archive does not exist
 fail pkg-verify pkg/1/build2.org/common/not-a-package.tar.gz
 fail pkg-verify --silent pkg/1/build2.org/common/not-a-package.tar.gz
-test pkg-verify pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz
+test pkg-verify pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz
 
 
 ##
@@ -261,6 +261,7 @@ fail rep-info # repository location expected
 test rep-info --trust-yes $rep/common/foo/testing <<EOF
 ${repn}common/foo/testing `location common/foo/testing`
 complement ${repn}common/foo/stable `location common/foo/stable`
+
 libfoo/1.1.0
 EOF
 
@@ -309,7 +310,7 @@ test rep-info -m -p --trust $hello_fp $rep/common/hello <<EOF
 sha256sum: 8d324fa7911038778b215d28805c6546e737e0092f79f7bd167cf2e28f4ad96f
 :
 name: libhello
-version: 1.0.0+1
+version: 1.0.0
 summary: The "Hello World" example library
 license: MIT
 tags: c++, hello, world, example
@@ -320,8 +321,9 @@ goal is to show a canonical build2/bpkg project/package.
 url: http://www.example.org/libhello
 email: hello-users@example.org
 requires: c++11
-location: libhello-1.0.0+1.tar.gz
-sha256sum: 1d8f7d987044c09bfb7a621f217cfc6530c3d0f0337eaf749f059a932c9fc1d7
+requires: build2 >= 0.4.0
+location: libhello-1.0.0.tar.gz
+sha256sum: 4d3f26addc718eb186192edc50b0c60b4eda3da92ebb4537b3f187206a260f12
 EOF
 
 ##
@@ -434,7 +436,7 @@ test pkg-purge libfoo
 test cfg-create --wipe
 test rep-add $rep/common/hello
 test rep-fetch --trust $hello_fp
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 test pkg-purge libhello
 
 
@@ -491,7 +493,7 @@ test pkg-purge libfoo
 test cfg-create --wipe
 test rep-add $rep/common/hello
 test rep-fetch --trust $hello_fp
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 test pkg-unpack libhello
 test pkg-purge libhello
 
@@ -607,7 +609,7 @@ fail pkg-configure libhello1              # no such package
 fail pkg-disfigure                        # package name expected
 fail pkg-disfigure libhello1              # no such package
 
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 
 fail pkg-configure libhello $cxx_options  # wrong package state
 fail pkg-disfigure libhello               # wrong package state
@@ -616,47 +618,47 @@ test pkg-purge libhello
 
 # src == out
 #
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 test pkg-unpack libhello
 test pkg-configure libhello $cxx_options
-stat libhello "configured 1.0.0+1; available sys:?"
+stat libhello "configured 1.0.0; available sys:?"
 test pkg-disfigure libhello
-stat libhello "unpacked 1.0.0+1; available sys:?"
+stat libhello "unpacked 1.0.0; available sys:?"
 test pkg-purge libhello
-stat libhello/1.0.0 "available 1.0.0+1"
+stat libhello/1.0.0 "available"
 
 # src != out
 #
 test cfg-create --wipe
-test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1
+test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0
 test pkg-configure libhello $cxx_options
-stat libhello "configured 1.0.0+1"
+stat libhello "configured 1.0.0"
 test pkg-disfigure libhello
-stat libhello "unpacked 1.0.0+1"
+stat libhello "unpacked 1.0.0"
 test pkg-purge libhello
 stat libhello unknown
-gone $cfg/libhello-1.0.0+1
+gone $cfg/libhello-1.0.0
 
 # out still exists after disfigure
 #
-test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1
+test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0
 test pkg-configure libhello $cxx_options
-touch $cfg/libhello-1.0.0+1/stray
+touch $cfg/libhello-1.0.0/stray
 fail pkg-disfigure libhello
-stat libhello/1.0.0+1 broken
-rm -r $cfg/libhello-1.0.0+1
+stat libhello/1.0.0 broken
+rm -r $cfg/libhello-1.0.0
 test pkg-purge -f libhello
 stat libhello unknown
 
 # disfigure failed
 #
-test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1
+test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0
 test pkg-configure libhello $cxx_options
-chmod 555 $cfg/libhello-1.0.0+1
+chmod 555 $cfg/libhello-1.0.0
 fail pkg-disfigure libhello
-stat libhello/1.0.0+1 broken
-chmod 755 $cfg/libhello-1.0.0+1
-rm -r $cfg/libhello-1.0.0+1
+stat libhello/1.0.0 broken
+chmod 755 $cfg/libhello-1.0.0
+rm -r $cfg/libhello-1.0.0
 test pkg-purge -f libhello
 stat libhello unknown
 
@@ -668,25 +670,25 @@ stat libhello unknown
 if [ "$msys" != "y" ]; then
   # configure failed but disfigure succeeds
   #
-  test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1
-  mkdir -p $cfg/libhello-1.0.0+1/build
-  chmod 555 $cfg/libhello-1.0.0+1/build
+  test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0
+  mkdir -p $cfg/libhello-1.0.0/build
+  chmod 555 $cfg/libhello-1.0.0/build
   fail pkg-configure libhello $cxx_options
-  stat libhello "unpacked 1.0.0+1"
+  stat libhello "unpacked 1.0.0"
   test pkg-purge libhello
   stat libhello unknown
 
   # configure and disfigure both failed
   #
-  test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1
-  mkdir -p $cfg/libhello-1.0.0+1/build
+  test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0
+  mkdir -p $cfg/libhello-1.0.0/build
   # Trip both con/dis.
   #
-  chmod 555 $cfg/libhello-1.0.0+1 $cfg/libhello-1.0.0+1/build
+  chmod 555 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build
   fail pkg-configure libhello $cxx_options
-  stat libhello/1.0.0+1 broken
-  chmod 755 $cfg/libhello-1.0.0+1 $cfg/libhello-1.0.0+1/build
-  rm -r $cfg/libhello-1.0.0+1
+  stat libhello/1.0.0 broken
+  chmod 755 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build
+  rm -r $cfg/libhello-1.0.0
   test pkg-purge -f libhello
   stat libhello unknown
 fi
@@ -815,13 +817,13 @@ test rep-fetch --trust $hello_fp
 
 fail pkg-update                # package name expected
 fail pkg-update libhello       # no such package
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 fail pkg-update libhello       # wrong package state
 test pkg-purge libhello
 
 # src == out
 #
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 test pkg-unpack libhello
 test pkg-configure libhello $cxx_options
 test pkg-update libhello
@@ -832,7 +834,7 @@ test pkg-purge libhello
 # src != out
 #
 test cfg-create --wipe
-test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1
+test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0
 test pkg-configure libhello $cxx_options
 test pkg-update libhello
 test pkg-update libhello
@@ -849,13 +851,13 @@ test rep-fetch --trust $hello_fp
 
 fail pkg-clean                  # package name expected
 fail pkg-clean libhello         # no such package
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 fail pkg-clean libhello         # wrong package state
 test pkg-purge libhello
 
 # src == out
 #
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 test pkg-unpack libhello
 test pkg-configure libhello $cxx_options
 test pkg-update libhello
@@ -867,7 +869,7 @@ test pkg-purge libhello
 # src != out
 #
 test cfg-create --wipe
-test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1
+test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0
 test pkg-configure libhello $cxx_options
 test pkg-update libhello
 test pkg-clean libhello
@@ -886,7 +888,7 @@ test pkg-purge libhello
 test cfg-create --wipe cxx $cxx_options
 test rep-add $rep/common/hello
 test rep-fetch --trust $hello_fp
-test pkg-fetch libhello/1.0.0+1
+test pkg-fetch libhello/1.0.0
 test pkg-unpack libhello
 test pkg-configure libhello $cxx_options
 test pkg-update libhello
@@ -1588,6 +1590,7 @@ test rep-info --trust-no --trust $signed_fp -d $cfg $rep/auth/signed <<EOF
 ${repn}auth/signed `location auth/signed`
 CN=build2.org/O=Code Synthesis/info@build2.org
 $signed_fp
+
 libfoo/1.0.0
 EOF
 
@@ -1595,6 +1598,7 @@ test rep-info --trust-no -d $cfg $rep/auth/signed <<EOF
 ${repn}auth/signed `location auth/signed`
 CN=build2.org/O=Code Synthesis/info@build2.org
 $signed_fp
+
 libfoo/1.0.0
 EOF
 
@@ -1603,6 +1607,7 @@ test rep-info --trust-yes $rep/auth/signed <<EOF
 ${repn}auth/signed `location auth/signed`
 CN=build2.org/O=Code Synthesis/info@build2.org
 $signed_fp
+
 libfoo/1.0.0
 EOF
 
@@ -1610,28 +1615,33 @@ fail rep-info --trust-no $rep/auth/signed <<EOF
 ${repn}auth/signed `location auth/signed`
 CN=build2.org/O=Code Synthesis/info@build2.org
 $signed_fp
+
 libfoo/1.0.0
 EOF
 
 test cfg-create --wipe
 test rep-info --trust-yes -d $cfg $rep/auth/unsigned1 <<EOF
 ${repn}auth/unsigned1 `location auth/unsigned1`
+
 libfoo/1.0.0
 EOF
 
 test rep-info --trust-no -d $cfg $rep/auth/unsigned2 <<EOF
 ${repn}auth/unsigned2 `location auth/unsigned2`
+
 libfoo/1.0.0
 EOF
 
 test cfg-create --wipe
 test rep-info --trust-yes $rep/auth/unsigned1 <<EOF
 ${repn}auth/unsigned1 `location auth/unsigned1`
+
 libfoo/1.0.0
 EOF
 
 fail rep-info --trust-no $rep/auth/unsigned1 <<EOF
 ${repn}auth/unsigned1 `location auth/unsigned1`
+
 libfoo/1.0.0
 EOF