From 34b0c86b92ac5f1d3b8b4e7c61d70b8e3f41c2e3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 29 Apr 2017 08:22:45 +0200 Subject: Bump version to 3.18.0-a.0.z, switch to version module --- build/bootstrap.build | 11 +---------- buildfile | 5 +---- manifest | 6 +++--- sqlite3/buildfile | 8 +++++++- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/build/bootstrap.build b/build/bootstrap.build index 2a3a219..255b363 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,8 +3,6 @@ project = libsqlite3 -using build@0.4.0 - # 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 @@ -13,9 +11,6 @@ using build@0.4.0 # # See also: https://www.sqlite.org/versionnumbers.html # -version = 3.14.1 -revision = 0 - # The SQLite documentation says that as long as the major version stays the # same, then it is backwards-compatible. And since we have the major version # already embedded into the library name, it doesn't make much sense to repeat @@ -43,11 +38,7 @@ revision = 0 # abi_major = 1 -dist.package = $project-$version - -if ($revision != 0) - dist.package += +$revision - +using version using config using dist using test diff --git a/buildfile b/buildfile index eed14d0..ec37811 100644 --- a/buildfile +++ b/buildfile @@ -1,10 +1,7 @@ # file : buildfile # copyright : not copyrighted - public domain -d = sqlite3/ test/ -./: $d doc{INSTALL README} file{manifest} -include $d - +./: sqlite3/ test/ doc{INSTALL README} file{manifest} # Don't install tests or the INSTALL file. # diff --git a/manifest b/manifest index 744b23a..7cf81bf 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libsqlite3 -version: 3.14.1 +version: 3.18.0-a.0.z summary: SQL database engine as an in-process C library license: public domain tags: sql, database, embeddable, serverless, self-contained, transactional @@ -10,5 +10,5 @@ email: sqlite-users@mailinglists.sqlite.org; Mailing list. package-url: https://git.build2.org/cgit/packaging/sqlite/ package-email: packaging@build2.org; Mailing list. build-email: builds@build2.org -depends: * build2 >= 0.4.0 -depends: * bpkg >= 0.4.0 +depends: * build2 >= 0.5.0- +depends: * bpkg >= 0.5.0- diff --git a/sqlite3/buildfile b/sqlite3/buildfile index d26170c..a6f7716 100644 --- a/sqlite3/buildfile +++ b/sqlite3/buildfile @@ -2,7 +2,13 @@ # copyright : not copyrighted - public domain lib{sqlite3}: {h c}{sqlite3} h{sqlite3ext} -lib{sqlite3}: bin.lib.version = @-$abi_major # See bootstrap.build. + +# See bootstrap.build for details. +# +if $version.pre_release + lib{sqlite3}: bin.lib.version = @"-$version.project_id" +else + lib{sqlite3}: bin.lib.version = @"-$abi_major" # The set of features we enable by default is inspired by Debian, Fedora, and # the official documentation. -- cgit v1.1