Commit Graph

87 Commits

Author SHA1 Message Date
Tom
028d8945a3 Exporting the built library's directory, for linking 2018-06-29 23:20:59 +01:00
gwenn
e1ba89c310 Merge remote-tracking branch 'jgallagher/master' into vtab 2018-06-10 18:49:40 +02:00
gwenn
1f0437c084
Merge pull request #344 from gwenn/rerun-if-env-changed
Use `rerun-if-env-changed` in libsqlite3-sys
2018-05-12 19:16:50 +02:00
gwenn
1e3dc542a4 Merge remote-tracking branch 'jgallagher/master' into vtab 2018-05-06 08:00:12 +02:00
gwenn
9c5c9e3c7e Merge remote-tracking branch 'jgallagher/master' into vtab 2018-04-30 22:02:14 +02:00
gwenn
9178e3f452 Use rerun-if-env-changed in libsqlite3-sys
Fix #329
2018-04-06 22:27:07 +02:00
gwenn
5d91fb088f Unlock notification 2018-03-24 08:03:21 +01:00
gwenn
08cda05406 Update to latest version of SQLite3 3.22.0 #326
Upgrade to bindgen 0.32
Add a shell script to upgrade bundled SQLite version
Upgrade bundle SQLite to 3.22.0
Upgrade libsqlite3-sys version to 0.9.2
2018-02-10 11:04:02 +01:00
gwenn
3aaab1e36f Merge remote-tracking branch 'remotes/jgallagher/master' into vtab 2018-01-20 12:29:07 +01:00
John Gallagher
00e90eaafe
Merge pull request #308 from jgallagher/lvillani-sqlcipher
Add support for linking to SQLCipher
2017-11-13 15:47:11 -07:00
John Gallagher
cbdbacddd8 Merge branch 'sqlcipher' of https://github.com/lvillani/rusqlite into lvillani-sqlcipher 2017-11-13 13:29:24 -07:00
John Gallagher
dc6268d4c9 Merge branch 'update-bindgen-dep' of https://github.com/fitzgen/rusqlite into fitzgen-update-bindgen-dep 2017-11-13 13:26:50 -07:00
Nick Fitzgerald
ea7207b83d Update bindgen dependency to the latest version
This also required adjusting the fixup inserting `SQLITE_DETERMINISTIC` into the
bindings if it was missing. Now that `bindgen` uses the `quote` crate for code
generation, instead of `syntex`, we can't rely on the output being formatted (it
only is formatted if there is a usable `rustfmt` on the `$PATH`). Even better
than this `contains` tweak would be switching to regexps or something.

Despite that formatting hiccup, newer `bindgen` releases are more reliable due
to many bug fixes, and also build in approximately half the time that older
`bindgen` versions do.
2017-11-11 17:09:19 -08:00
Lorenzo Villani
8cbfc00ec6 Add support for linking to SQLCipher 2017-10-24 19:52:19 +02:00
Ossi Herrala
28d58529b7 Update dependencies
* Gcc crate has been renamed to cc.
* Chrono::UTC has been renamed to Chrono::Utc.
* bitflags 1.0 uses associated constants. So prefix OpenFlags.
2017-10-09 23:25:40 +03:00
gwenn
c842e789bd Merge remote-tracking branch 'jgallagher/master' into vtab 2017-09-11 19:45:22 +02:00
John Gallagher
b1927b31bf Merge pull request #278 from mcgoo/vcpkg
for msvc abi builds, add support for using sqlite from a vcpkg installation if available
2017-05-29 10:23:08 -04:00
John Gallagher
b7ce75b463 Merge pull request #264 from gwenn/outdated
Upgrade outdated dependencies
2017-05-29 10:11:09 -04:00
Jim McGrath
b3faed0f75 only depend on vcpkg for cfg(target_env = "msvc") 2017-05-28 06:15:47 -05:00
Jim McGrath
0dd10f85ba for msvc abi builds, add support for using sqlite from a vcpkg installation if available 2017-05-27 22:35:46 -05:00
gwenn
e8bc9fcc21 TypeChooser has been renamed to ParseCallbacks 2017-04-27 18:42:10 +02:00
gwenn
1d684ae653 Merge remote-tracking branch 'jgallagher/master' into vtab 2017-04-21 20:01:04 +02:00
Steven Fackler
d4177c5217 Set HAVE_USLEEP
SQLite otherwise has to sleep for a second at a time when waiting for a
lock (!)
2017-04-18 12:37:04 +02:00
John Gallagher
5a5d28ec69 Add bindgen bindings for SQLite 3.7.16 to libsqlite3-sys.
Bump to version 0.10.3 to use libsqlite3-sys 0.8.0.
2017-04-06 13:42:01 -04:00
gwenn
c40b395410 Min SQLite version for vtab is 3.7.7 2017-03-09 19:24:02 +01:00
John Gallagher
f0dfab0349 Only check for and require SQLITE3_INCLUDE_DIR if we're running bindgen at buildtime. 2017-03-03 15:37:45 -05:00
John Gallagher
06383c65cb Update build process to use prebuilt bindings.
Adds buildtime_bindgen feature to run bindgen dynamically.
2017-03-03 15:37:45 -05:00
Sean Griffin
2c58b3f804 Remove the dependency on libc
Recent versions of bindgen use `std::os::raw` over `libc`, but currently
`libsqlite3-sys` is overriding that. `std::os::raw` is a subset of
`libc` that exports only the relevant type definitions, but not any
functions which require additional linking. This enables
`libsqlite3-sys` to be more easily used on targets that may not have a
libc available (presumably sqlite itself would have been compiled with
musl in that case)
2017-02-16 11:17:24 -05:00
John Gallagher
5dbfa2850e Manually insert SQLITE_DETERMINISTIC flag in bindgen output if needed.
See comment in libsqlite3-sys/build.rs for details - adding this flag is
harmless if it's not present in the header, and not having it can break
builds against older SQLite versions.
2017-02-08 21:41:34 -05:00
John Gallagher
161ac2bf0a Update libsqlite3-sys to run bindgen at build time 2017-02-08 20:40:30 -05:00
John Gallagher
36c5ed2ceb Upgrade dependencies.
In libsqlite3-sys, skip printing system libraries. See
https://github.com/sfackler/rust-openssl/issues/554#issuecomment-274878088.
2017-01-25 18:01:03 -05:00
John Gallagher
f130f62b1a Don't ask to link to /usr/lib directly if pkg-config fails to find SQLite. 2017-01-23 20:17:14 -05:00
John Gallagher
51f6a24d60 Set build flags for bundled libsqlite.
Build flags from @chamakits; see https://github.com/jgallagher/rusqlite/pull/176.
2016-12-31 01:02:29 -05:00
Chip Collier
dde6e9ee3a Added feature to build a static sqlite from the bundled amalgamation. 2016-06-15 16:34:13 +02:00
John Gallagher
7fbe1172e2 Make libsqlite3-sys's build script slightly more intelligent.
* If SQLITE3_LIB_DIR is present in the environment, we use that.
* If SQLITE3_LIB_DIR is not present, we try to use pkg-config.
* If SQLITE3_LIB_DIR is not present and pkg-config fails, we fall back
  to /usr/lib (if it exists).
2015-12-01 11:36:31 -05:00
John Gallagher
134f34362a Use new hyphen-less extern crate name 2015-03-26 15:47:51 -04:00
John Gallagher
03f368c4f4 Build raw sqlite interface as libsqlite3-sys
Use pkg-config to find it.
2015-02-23 20:37:55 -05:00