diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2020-01-29 23:08:12 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-01-29 23:08:12 +0300 |
commit | 018586c2aad72ee2944105d443ec98eb02aa8974 (patch) | |
tree | 0a4585c2fde5f3e430ee6100a1bb2fc9a16bb387 /sqlite3 | |
parent | 0a054f609f7022f7d27f59094041641b8b48b3d8 (diff) |
Release version 3.27.2+1v3.27.2+1
Enable zlib usage
Stop using cc.poptions variable as it now come after c.poptions
Diffstat (limited to 'sqlite3')
-rw-r--r-- | sqlite3/.gitignore | 4 | ||||
-rw-r--r-- | sqlite3/buildfile | 16 | ||||
-rw-r--r-- | sqlite3/manifest | 3 | ||||
-rw-r--r-- | sqlite3/test.out | 1 | ||||
-rw-r--r-- | sqlite3/testscript | 23 |
5 files changed, 34 insertions, 13 deletions
diff --git a/sqlite3/.gitignore b/sqlite3/.gitignore index 7a3c058..9e8f177 100644 --- a/sqlite3/.gitignore +++ b/sqlite3/.gitignore @@ -19,3 +19,7 @@ *.pc sqlite3 + +# Testscript output directory (can be symlink). +# +test-sqlite3 diff --git a/sqlite3/buildfile b/sqlite3/buildfile index b85acd4..a8e7466 100644 --- a/sqlite3/buildfile +++ b/sqlite3/buildfile @@ -3,9 +3,10 @@ ./: exe{sqlite3} doc{INSTALL README} man1{sqlite3} manifest -import libs = libsqlite3%lib{sqlite3} +import libs = libsqlite3%lib{sqlite3} +import libs += libz%lib{z} -exe{sqlite3}: {h c}{*} $libs +exe{sqlite3}: {h c}{*} $libs testscript gcc = ($c.class == 'gcc') @@ -22,7 +23,8 @@ gcc = ($c.class == 'gcc') # This is the subset of features that we enable by default in libsqlite3 and # that affect the shell. They can be overridden in the same way. # -cc.poptions =+ -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_SESSION=1 +c.poptions =+ -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_SESSION=1 \ + -DSQLITE_HAVE_ZLIB # Both Debian and Fedora add this so gotta be important. # @@ -39,14 +41,6 @@ if $gcc if $gcc c.coptions += -Wno-extra -Wno-error -# Smoke test. -# -exe{sqlite3}: file{test.out}: test.stdout = true -exe{sqlite3}: test.arguments = ':memory:' \ -'CREATE TABLE test (id INTEGER PRIMARY KEY); -INSERT INTO test VALUES(123); -SELECT * FROM test;' - # Don't install INSTALL file. # doc{INSTALL}@./: install = false diff --git a/sqlite3/manifest b/sqlite3/manifest index e2e8e7a..80556fe 100644 --- a/sqlite3/manifest +++ b/sqlite3/manifest @@ -1,6 +1,6 @@ : 1 name: sqlite3 -version: 3.27.2 +version: 3.27.2+1 project: sqlite summary: SQLite database engine shell program license: public domain @@ -17,3 +17,4 @@ builds: all depends: * build2 >= 0.11.0 depends: * bpkg >= 0.11.0 depends: libsqlite3 == $ +depends: libz >= 1.2.1100 diff --git a/sqlite3/test.out b/sqlite3/test.out deleted file mode 100644 index 190a180..0000000 --- a/sqlite3/test.out +++ /dev/null @@ -1 +0,0 @@ -123 diff --git a/sqlite3/testscript b/sqlite3/testscript new file mode 100644 index 0000000..cfc48c8 --- /dev/null +++ b/sqlite3/testscript @@ -0,0 +1,23 @@ +# file : testscript +# copyright : not copyrighted - public domain + +: basics +: +{ + sql = 'CREATE TABLE test (id INTEGER PRIMARY KEY); +INSERT INTO test VALUES(123); +SELECT * FROM test;' + + $* ':memory:' "$sql" >'123' +} + +: archive +: +{ + echo 'abc' >=f.txt; + $* f.sqlar -Ac f.txt &f.sqlar; # Creates archive adding a file. + $* f.sqlar -At >f.txt; # Lists files in archive. + rm f.txt; + $* f.sqlar -Ax; # Extracts files from archive. + cat f.txt >'abc' +} |