From 5c396d4dd3a6e2528147b55fc35b86cbcbc93524 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 1 Sep 2016 02:35:39 +0300
Subject: Build infrastructure update

---
 INSTALL               |  0
 build/bootstrap.build | 19 +++++++++++++------
 build/root.build      |  7 ++++++-
 buildfile             |  8 +++++++-
 sqlite3/buildfile     | 10 ++++++++++
 5 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 INSTALL

diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..e69de29
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 5bc2a95..e6b071f 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -3,6 +3,8 @@
 
 project = libsqlite3
 
+using build@0.4.0-a1
+
 # SQLite releases usually have 3-component versions but once in a while they
 # will make a 4-component release for what appears to be important bug fixes
 # only. So instead of dragging the fourth component around (and confusing a
@@ -10,15 +12,20 @@ project = libsqlite3
 # handle an occasional bugfix release with a revision.
 #
 version = 3.14.1
-revision = 0
 
-using build@0.4.0-a1
-using config
-using dist
-using test
-using install
+abi_major = 3
+abi_minor = 14
+abi_patch = 1
+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/build/root.build b/build/root.build
index 4d7fd53..51c13ed 100644
--- a/build/root.build
+++ b/build/root.build
@@ -3,4 +3,9 @@
 
 using c
 
-test/: install = false # Don't install tests.
+h{*}: extension = h
+c{*}: extension = c
+
+# All exe{} in test/ are, well, tests.
+#
+test/exe{*}: test = true
diff --git a/buildfile b/buildfile
index ceb02a4..eed14d0 100644
--- a/buildfile
+++ b/buildfile
@@ -2,5 +2,11 @@
 # copyright : not copyrighted - public domain
 
 d = sqlite3/ test/
-./: $d doc{README} file{manifest}
+./: $d doc{INSTALL README} file{manifest}
 include $d
+
+
+# Don't install tests or the INSTALL file.
+#
+dir{test/}: install = false
+doc{INSTALL}@./: install = false
diff --git a/sqlite3/buildfile b/sqlite3/buildfile
index 948c32d..98c0ee6 100644
--- a/sqlite3/buildfile
+++ b/sqlite3/buildfile
@@ -3,6 +3,14 @@
 
 lib{sqlite3}: {h c}{sqlite3} h{sqlite3ext}
 
+# 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{sqlite3}: bin.lib.version = @-$version
+else
+  lib{sqlite3}: bin.lib.version = @-$abi_major.$abi_minor
+
 # The set of features we enable by default is inspired by Debian, Fedora, and
 # the official documentation.
 #
@@ -28,6 +36,8 @@ cc.poptions =+ \
 -DSQLITE_ENABLE_COLUMN_METADATA=1 \
 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
 
+c.poptions += -I$src_base
+
 if ($c.target.class != "windows")
 {
   cc.poptions =+ -DHAVE_USLEEP=1
-- 
cgit v1.1