From 8ad1710addea9f1459c7fa45c1f4f34e6a8fe6d4 Mon Sep 17 00:00:00 2001 From: Guillaume VILLENA Date: Sat, 13 Mar 2021 16:22:23 +0100 Subject: [PATCH 1/2] Next snapshot for 3.35.0 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 19a667a40d..d4f3a2bca8 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -version=3.34.1 -artifactVersion=3.34.1-SNAPSHOT +version=3.35.0 +artifactVersion=3.35.0-SNAPSHOT From 7307e47d3514304af3cb5094f339cfdbcc21f29c Mon Sep 17 00:00:00 2001 From: Villena Guillaume Date: Sun, 14 Mar 2021 10:44:07 +0100 Subject: [PATCH 2/2] Update Makefile --- .travis.yml | 4 +-- Makefile | 79 +++++++++++++++++++++++++++-------------------------- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 861f94c7f6..758d490557 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ jdk: jobs: include: - name: build - if: branch != develop && branch != master - script: make + if: branch != develop + script: make all - name: deploy-snapshot if: branch = develop script: make all deploy diff --git a/Makefile b/Makefile index 90fe89d32e..933e23a670 100644 --- a/Makefile +++ b/Makefile @@ -70,44 +70,47 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED) $(CC) -v $(CC) -o $@ -c $(CCFLAGS) \ - -DCODEC_TYPE=CODEC_TYPE_CHACHA20 \ - -DSQLITE_THREADSAFE=1 \ - -DSQLITE_DQS=0 \ - -DSQLITE_MAX_ATTACHED=10 \ - -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 \ - -DSQLITE_SOUNDEX=1 \ - -DSQLITE_ENABLE_COLUMN_METADATA=1 \ - -DSQLITE_SECURE_DELETE=1 \ - -DSQLITE_ENABLE_DESERIALIZE=1 \ - -DSQLITE_ENABLE_FTS3=1 \ - -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \ - -DSQLITE_ENABLE_FTS4=1 \ - -DSQLITE_ENABLE_FTS5=1 \ - -DSQLITE_ENABLE_JSON1=1 \ - -DSQLITE_ENABLE_RTREE=1 \ - -DSQLITE_ENABLE_GEOPOLY=1 \ - -DSQLITE_CORE=1 \ - -DSQLITE_ENABLE_EXTFUNC=1 \ - -DSQLITE_ENABLE_CSV=1 \ - -DSQLITE_ENABLE_SHA3 \ - -DSQLITE_ENABLE_FILEIO \ - -DSQLITE_ENABLE_CARRAY=1 \ - -DSQLITE_ENABLE_SERIES=1 \ - -DSQLITE_ENABLE_UUID=1 \ - -DSQLITE_TEMP_STORE=2 \ - -DSQLITE_USE_URI=1 \ - -DSQLITE_USER_AUTHENTICATION=1 \ - -DNDEBUG \ - -DSQLITE_ENABLE_LOAD_EXTENSION=1 \ - -DSQLITE_HAVE_ISNAN \ - -DSQLITE_HAVE_USLEEP \ - -DSQLITE_ENABLE_STAT2 \ - -DSQLITE_DEFAULT_MEMSTATUS=0 \ - -DSQLITE_DEFAULT_FILE_PERMISSIONS=0666 \ - -DSQLITE_MAX_VARIABLE_NUMBER=250000 \ - -DSQLITE_MAX_MMAP_SIZE=1099511627776 \ - $(SQLITE_FLAGS) \ - $(SQLITE_OUT)/sqlite3mc_amalgamation.c + -DCODEC_TYPE=CODEC_TYPE_CHACHA20 \ + -DSQLITE_THREADSAFE=1 \ + -DSQLITE_DQS=0 \ + -DSQLITE_MAX_ATTACHED=10 \ + -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 \ + -DSQLITE_SOUNDEX=1 \ + -DSQLITE_ENABLE_COLUMN_METADATA=1 \ + -DSQLITE_SECURE_DELETE=1 \ + -DSQLITE_ENABLE_DESERIALIZE=1 \ + -DSQLITE_ENABLE_FTS3=1 \ + -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \ + -DSQLITE_ENABLE_FTS4=1 \ + -DSQLITE_ENABLE_FTS5=1 \ + -DSQLITE_ENABLE_JSON1=1 \ + -DSQLITE_ENABLE_RTREE=1 \ + -DSQLITE_ENABLE_GEOPOLY=1 \ + -DSQLITE_CORE=1 \ + -DSQLITE_ENABLE_EXTFUNC=1 \ + -DSQLITE_ENABLE_CSV=1 \ + -DSQLITE_ENABLE_SHA3 \ + -DSQLITE_ENABLE_FILEIO \ + -DSQLITE_ENABLE_CARRAY=1 \ + -DSQLITE_ENABLE_SERIES=1 \ + -DSQLITE_ENABLE_UUID=1 \ + -DSQLITE_TEMP_STORE=2 \ + -DSQLITE_USE_URI=1 \ + -DSQLITE_USER_AUTHENTICATION=1 \ + -DSQLITE_ENABLE_LOAD_EXTENSION=1 \ + -DSQLITE_HAVE_ISNAN \ + -DSQLITE_HAVE_USLEEP \ + -DSQLITE_ENABLE_STAT2 \ + -DSQLITE_DEFAULT_MEMSTATUS=0 \ + -DSQLITE_DEFAULT_FILE_PERMISSIONS=0666 \ + -DSQLITE_MAX_VARIABLE_NUMBER=250000 \ + -DSQLITE_MAX_MMAP_SIZE=1099511627776 \ + -DSQLITE_ENABLE_MATH_FUNCTIONS=1 \ + -DSQLITE_ENABLE_REGEXP=1 \ + -DSQLITE_ENABLE_VSV=1 \ + -DNDEBUG \ + $(SQLITE_FLAGS) \ + $(SQLITE_OUT)/sqlite3mc_amalgamation.c $(SQLITE_SOURCE)/sqlite3mc_amalgamation.h: $(SQLITE_UNPACKED)