Merge pull request #89 from fatalmind/master

Building for new (released in 2016) and old SQLite versions

Author: xerial

Makefile

@@ -23,10 +23,16 @@ CCFLAGS:= -I$(SQLITE_OUT) -I$(SQLITE_AMAL_DIR) $(CCFLAGS)
 
 $(SQLITE_ARCHIVE):
 	@mkdir -p $(@D)
-	curl -o$@ http://www.sqlite.org/2015/$(SQLITE_AMAL_PREFIX).zip
+	curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2016/$(SQLITE_AMAL_PREFIX).zip || \
+	curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2015/$(SQLITE_AMAL_PREFIX).zip || \
+	curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2014/$(SQLITE_AMAL_PREFIX).zip || \
+	curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2013/$(SQLITE_AMAL_PREFIX).zip || \
+	curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/$(SQLITE_AMAL_PREFIX).zip || \
+	curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/$(SQLITE_OLD_AMAL_PREFIX).zip
 
 $(SQLITE_UNPACKED): $(SQLITE_ARCHIVE)
-	unzip -qo $< -d $(TARGET)
+	unzip -qo $< -d $(TARGET)/tmp.$(version)
+	(mv $(TARGET)/tmp.$(version)/$(SQLITE_AMAL_PREFIX) $(TARGET) && rmdir $(TARGET)/tmp.$(version)) || mv $(TARGET)/tmp.$(version)/ $(TARGET)/$(SQLITE_AMAL_PREFIX)
 	touch $@
 
 

Makefile.common

@@ -151,6 +151,7 @@ LINKFLAGS := $($(target)_LINKFLAGS)
 LIBNAME   := $($(target)_LIBNAME)
 SQLITE_FLAGS := $($(target)_SQLITE_FLAGS)
 SQLITE_AMAL_PREFIX = sqlite-amalgamation-$(shell ./amalgamation_version.sh $(version))
+SQLITE_OLD_AMAL_PREFIX = sqlite-amalgamation-$(subst .,_,$(version))
 CCFLAGS := $(CCFLAGS) 
 ifneq ($(jni_include),)
 CCFLAGS := $(CCFLAGS) -I"$(jni_include)"

src/main/ext/extension-functions.c

@@ -205,10 +205,12 @@ int double_cmp(const void *a, const void *b);
 #endif /* _MAP_H_ */
 
 
+#if SQLITE_VERSION_NUMBER >= 3006001
 static char *sqlite3StrDup( const char *z ) {
     char *res = sqlite3_malloc( strlen(z)+1 );
     return strcpy( res, z );
 }
+#endif
 
 /*
 ** These are copied verbatim from fun.c so as to not have the names exported

src/main/java/org/sqlite/core/NativeDB.c

@@ -962,6 +962,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_core_NativeDB_backup(
   jobject observer			  /* Progress function to invoke */     
 )
 {
+#if SQLITE_VERSION_NUMBER >= 3006011
   int rc;                     /* Function return code */
   sqlite3* pDb;               /* Database to back up */
   sqlite3* pFile;             /* Database connection opened on zFilename */
@@ -993,6 +994,9 @@ JNIEXPORT jint JNICALL Java_org_sqlite_core_NativeDB_backup(
   ** and return the result of this function. */
   (void)sqlite3_close(pFile);
   return rc;
+#else
+  return SQLITE_INTERNAL;
+#endif
 } 
 
 JNIEXPORT jint JNICALL Java_org_sqlite_core_NativeDB_restore(
@@ -1002,6 +1006,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_core_NativeDB_restore(
   jobject observer			  /* Progress function to invoke */     
 )
 {
+#if SQLITE_VERSION_NUMBER >= 3006011
   int rc;                     /* Function return code */
   sqlite3* pDb;               /* Database to back up */
   sqlite3* pFile;             /* Database connection opened on zFilename */
@@ -1039,5 +1044,8 @@ JNIEXPORT jint JNICALL Java_org_sqlite_core_NativeDB_restore(
   ** and return the result of this function. */
   (void)sqlite3_close(pFile);
   return rc;
+#else
+  return SQLITE_INTERNAL;
+#endif
 }