mirror
/
go-sqlcipher
mirror of https://github.com/xeodou/go-sqlcipher.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/darwin-icu' into update/options

This commit is contained in:
Gert-Jan Timmer 2018-05-25 12:24:53 +02:00
parent 59885cf9d4 2cee2f9651
commit 670bba5d74
2 changed files with 7 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
.travis.yml
View File

@ -12,8 +12,7 @@ env:
matrix: matrix:
- GOTAGS= - GOTAGS=
- GOTAGS=libsqlite3 - GOTAGS=libsqlite3
- GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" - GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth"
- GOTAGS=sqlite_trace
- GOTAGS=sqlite_vacuum_full - GOTAGS=sqlite_vacuum_full
- GOTAGS=sqlite_vacuum_incr - GOTAGS=sqlite_vacuum_incr
- GOTAGS=sqlite_vtable - GOTAGS=sqlite_vtable
@ -25,129 +24,57 @@ go:
matrix: matrix:
include: include:
- os: linux
go: 1.8.x
env: GOTAGS= GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.8.x go: 1.8.x
env: GOTAGS= GOOS=windows GOARCH=amd64 env: GOTAGS= GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.8.x go: 1.8.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
- os: linux - os: linux
go: 1.8.x go: 1.8.x
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386 env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
- os: linux
go: 1.8.x
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.8.x go: 1.8.x
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.8.x go: 1.8.x
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.8.x go: 1.8.x
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS= GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.9.x go: 1.9.x
env: GOTAGS= GOOS=windows GOARCH=amd64 env: GOTAGS= GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.9.x go: 1.9.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
- os: linux - os: linux
go: 1.9.x go: 1.9.x
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386 env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
- os: linux
go: 1.9.x
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.9.x go: 1.9.x
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.9.x go: 1.9.x
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.9.x go: 1.9.x
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS= GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.10.x go: 1.10.x
env: GOTAGS= GOOS=windows GOARCH=amd64 env: GOTAGS= GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.10.x go: 1.10.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
- os: linux - os: linux
go: 1.10.x go: 1.10.x
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386 env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
- os: linux
go: 1.10.x
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.10.x go: 1.10.x
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.10.x go: 1.10.x
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
- os: linux - os: linux
go: 1.10.x go: 1.10.x
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
@ -157,7 +84,7 @@ before_install:
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update brew update
brew install icu4c brew upgrade icu4c
fi fi
- | - |
if [[ "${GOOS}" != "windows" ]]; then if [[ "${GOOS}" != "windows" ]]; then

2
sqlite3_opt_icu.go
View File

@ -9,5 +9,7 @@ package sqlite3
/* /*
#cgo LDFLAGS: -licuuc -licui18n #cgo LDFLAGS: -licuuc -licui18n
#cgo CFLAGS: -DSQLITE_ENABLE_ICU #cgo CFLAGS: -DSQLITE_ENABLE_ICU
#cgo darwin CFLAGS: -I/usr/local/opt/icu4c/include
#cgo darwin LDFLAGS: -L/usr/local/opt/icu4c/lib
*/ */
import "C" import "C"