Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 42 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,35 +126,69 @@ matrix:
- SDK="iphoneos"

###################################
### Xcode 10.1 on macOS 10.13
### Xcode 10.3 on macOS 10.14

- os: osx
osx_image: xcode10.1
osx_image: xcode10.3
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="platform=macOS"
- os: osx
osx_image: xcode10.1
osx_image: xcode10.3
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="generic/platform=iOS"
- os: osx
osx_image: xcode10.1
osx_image: xcode10.3
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="generic/platform=watchOS"
- os: osx
osx_image: xcode10.1
osx_image: xcode10.3
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="generic/platform=tvOS"
- os: osx
osx_image: xcode10.1
osx_image: xcode10.3
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.1"
- DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.4"
- os: osx
osx_image: xcode10.1
osx_image: xcode10.3
gemfile: .ci/Gemfile.travis
env:
- SDK="iphoneos"

###################################
### Xcode 11.2.1 on macOS 10.14

- os: osx
osx_image: xcode11.2
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="platform=macOS"
- os: osx
osx_image: xcode11.2
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="generic/platform=iOS"
- os: osx
osx_image: xcode11.2
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="generic/platform=watchOS"
- os: osx
osx_image: xcode11.2
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="generic/platform=tvOS"
- os: osx
osx_image: xcode11.2
gemfile: .ci/Gemfile.travis
env:
- DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=13.2.2"
- os: osx
osx_image: xcode11.2
gemfile: .ci/Gemfile.travis
env:
- SDK="iphoneos"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ If you need a specific version of SQLite, or specific SQLite compilation options



**May 28, 2019: Update SQLite to 3.28.0** ([changelog](https://github.com/swiftlyfalling/SQLiteLib/commits/master)).
**Nov 29, 2019: Update SQLite to 3.30.1** ([changelog](https://github.com/swiftlyfalling/SQLiteLib/commits/master)).

**Requirements**: iOS 8.0+ / OSX 10.9+, Xcode 7.3+

**SQLite Included:** **[3.28.0](https://www.sqlite.org/releaselog/3_28_0.html)**
**SQLite Included:** **[3.30.1](https://www.sqlite.org/releaselog/3_30_1.html)**



Expand Down
4 changes: 2 additions & 2 deletions SQLiteLib.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Debug;
};
Expand All @@ -280,7 +280,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Release;
};
Expand Down
1 change: 0 additions & 1 deletion sqlite/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,6 @@ SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
SHELL_OPT += -DSQLITE_ENABLE_DESERIALIZE
SHELL_OPT += -DSQLITE_INTROSPECTION_PRAGMAS
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
Expand Down
26 changes: 9 additions & 17 deletions sqlite/Makefile.linux-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TOP = ../sqlite
#### C Compiler and options for use in building executables that
# will run on the platform that is doing the build.
#
BCC = gcc -g -O2
BCC = gcc -g -O0
#BCC = /opt/ancic/bin/c89 -0

#### If the target operating system supports the "usleep()" system
Expand All @@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0
#### Specify any extra linker options needed to make the library
# thread safe
#
#THREADLIB = -lpthread
THREADLIB =
THREADLIB = -lpthread -lm -ldl
#THREADLIB =

#### Specify any extra libraries needed to access required functions.
#
Expand All @@ -54,11 +54,9 @@ TLIBS =
# You can make the library go almost twice as fast if you compile
# with -DNDEBUG=1
#
#OPTS = -DSQLITE_DEBUG=2
#OPTS = -DSQLITE_DEBUG=1
#OPTS =
OPTS = -DNDEBUG=1
OPTS += -DHAVE_FDATASYNC=1
OPTS += -DSQLITE_DEBUG=1
OPTS += -DSQLITE_ENABLE_WHERETRACE
OPTS += -DSQLITE_ENABLE_SELECTTRACE

#### The suffix to add to executable files. ".exe" for windows.
# Nothing for unix.
Expand All @@ -70,7 +68,7 @@ EXE =
# will run on the target platform. This is usually the same
# as BCC, unless you are cross-compiling.
#
TCC = gcc -O6
TCC = gcc -O0
#TCC = gcc -g -O0 -Wall
#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
#TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
Expand All @@ -91,18 +89,12 @@ SHPREFIX = lib

#### Extra compiler options needed for programs that use the TCL library.
#
#TCL_FLAGS =
#TCL_FLAGS = -DSTATIC_BUILD=1
TCL_FLAGS = -I/home/drh/tcltk/8.5linux
#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
TCL_FLAGS = -I/home/drh/tcl/include/tcl8.6

#### Linker options needed to link against the TCL library.
#
#LIBTCL = -ltcl -lm -ldl
LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
LIBTCL = /home/drh/tcl/lib/libtcl8.6.a -lm -lpthread -ldl -lz

#### Additional objects for SQLite library when TCL support is enabled.
#TCLOBJ =
Expand Down
3 changes: 1 addition & 2 deletions sqlite/Makefile.msc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ API_ARMOR = 0
!IFNDEF NO_WARN
!IF $(USE_FULLWARN)!=0
NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4130 -wd4152 -wd4189 -wd4206
NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4305 -wd4306 -wd4702 -wd4706
NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4244 -wd4305 -wd4306 -wd4702 -wd4706
!ENDIF
!ENDIF

Expand Down Expand Up @@ -351,7 +351,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
!ENDIF
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
Expand Down
27 changes: 5 additions & 22 deletions sqlite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,30 +306,13 @@ describes its purpose and role within the larger system.
<a name="vauth"></a>
## Verifying Code Authenticity

If you obtained an SQLite source tree from a secondary source, such as a
GitHub mirror, and you want to verify that it has not been altered, there
are a couple of ways to do that.

If you have a release version of SQLite, and you are using the
`sqlite3.c` amalgamation, then SHA3-256 hashes for the amalgamation are
available in the [change log](https://www.sqlite.org/changes.html) on
the official website. After building the `sqlite3.c` file, you can check
that it is authentic by comparing the hash. This does not ensure that the
test scripts are unaltered, but it does validate the deliverable part of
the code and the verification process only involves computing and
comparing a single hash.

For versions other than an official release, or if you are building the
`sqlite3.c` amalgamation using non-standard build options, the verification
process is a little more involved. The `manifest` file at the root directory
of the source tree
The `manifest` file at the root directory of the source tree
contains either a SHA3-256 hash (for newer files) or a SHA1 hash (for
older files) for every source file in the repository. You can write a script
to extracts hashes from `manifest` and verifies the hashes against the
corresponding files in the source tree. The SHA3-256 hash of the `manifest`
older files) for every source file in the repository.
The SHA3-256 hash of the `manifest`
file itself is the official name of the version of the source tree that you
have. The `manifest.uuid` file should contain the SHA3-256 hash of the
`manifest` file. If all of the above hash comparisons are correct, then
have. The `manifest.uuid` file should contain the SHA3-256 hash of the
`manifest` file. If all of the above hash comparisons are correct, then
you can be confident that your source tree is authentic and unadulterated.

The format of the `manifest` file should be mostly self-explanatory, but
Expand Down
2 changes: 1 addition & 1 deletion sqlite/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.28.0
3.30.1
2 changes: 1 addition & 1 deletion sqlite/autoconf/Makefile.msc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ API_ARMOR = 0
!IFNDEF NO_WARN
!IF $(USE_FULLWARN)!=0
NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4130 -wd4152 -wd4189 -wd4206
NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4305 -wd4306 -wd4702 -wd4706
NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4244 -wd4305 -wd4306 -wd4702 -wd4706
!ENDIF
!ENDIF

Expand Down
Loading