Updated sqlcipher version to 2.0.3

internalG · Feb 29, 2012 · 479daed · 479daed
1 parent 35eb6b9
commit 479daed
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/build-droid/build-all.sh b/build-droid/build-all.sh
@@ -46,7 +46,7 @@ export EXPAT_VERSION="2.0.1"
 export YAJL_VERSION="2.0.1"
 
 # Project version to use to build sqlcipher
-export SQLCIPHER_VERSION="1.1.8"
+export SQLCIPHER_VERSION="2.0.3"
 
 # Project versions to use for SOCI (Sqlite3 C++ database library)
 export SOCI_VERSION="3.1.0"

diff --git a/build-droid/build-sqlcipher.sh b/build-droid/build-sqlcipher.sh
@@ -29,15 +29,15 @@ set -e
 # Download source
 if [ ! -e "sqlcipher-${SQLCIPHER_VERSION}.tar.gz" ]
 then
-  curl $PROXY -o "sqlcipher-${SQLCIPHER_VERSION}.tar.gz" -L "https://github.com/sjlombardo/sqlcipher/tarball/v${SQLCIPHER_VERSION}"
+  curl $PROXY -o "sqlcipher-${SQLCIPHER_VERSION}.tar.gz" -L "https://nodeload.github.com/sqlcipher/sqlcipher/tarball/v${SQLCIPHER_VERSION}"
 fi
 
 # Extract source
-rm -rf sjlombardo-sqlcipher-*
+rm -rf *-sqlcipher-*
 tar zxvf "sqlcipher-${SQLCIPHER_VERSION}.tar.gz"
 
 # Build
-pushd sjlombardo-sqlcipher-*
+pushd *-sqlcipher-*
 export CC=${DROIDTOOLS}-gcc
 export LD=${DROIDTOOLS}-ld
 export CPP=${DROIDTOOLS}-cpp
@@ -52,7 +52,7 @@ export LDFLAGS="-Os -fpic -lc -Wl,-rpath-link=${SYSROOT}/usr/lib -L${SYSROOT}/us
 export CFLAGS="-Os -D_FILE_OFFSET_BITS=64 -pipe -isysroot ${SYSROOT} -I${ROOTDIR}/include -DSQLITE_HAS_CODEC"
 export CXXFLAGS="-Os -D_FILE_OFFSET_BITS=64 -pipe -isysroot ${SYSROOT} -I${ROOTDIR}/include -DSQLITE_HAS_CODEC"
 
-./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --disable-readline --disable-tcl --enable-tempstore=no
+./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --disable-readline --disable-tcl --enable-threadsafe --enable-cross-thread-connections --enable-tempstore=no
 
 # Fix libtool to not create versioned shared libraries
 mv "libtool" "libtool~"
@@ -66,4 +66,4 @@ make install
 popd
 
 # Clean up
-rm -rf sjlombardo-sqlcipher-*
+rm -rf *-sqlcipher-*
diff --git a/build-ios/build-all.sh b/build-ios/build-all.sh
@@ -44,7 +44,7 @@ export EXPAT_VERSION="2.0.1"
 export YAJL_VERSION="2.0.1"
 
 # Project version to use to build sqlcipher
-export SQLCIPHER_VERSION="1.1.8"
+export SQLCIPHER_VERSION="2.0.3"
 
 # Project versions to use for SOCI (Sqlite3 C++ database library)
 export SOCI_VERSION="3.1.0"

diff --git a/build-ios/build-sqlcipher.sh b/build-ios/build-sqlcipher.sh
@@ -29,15 +29,15 @@ set -e
 # Download source
 if [ ! -e "sqlcipher-${SQLCIPHER_VERSION}.tar.gz" ]
 then
-  curl $PROXY -o "sqlcipher-${SQLCIPHER_VERSION}.tar.gz" -L "https://github.com/sjlombardo/sqlcipher/tarball/v${SQLCIPHER_VERSION}"
+  curl $PROXY -o "sqlcipher-${SQLCIPHER_VERSION}.tar.gz" -L "https://nodeload.github.com/sqlcipher/sqlcipher/tarball/v${SQLCIPHER_VERSION}"
 fi
 
 # Extract source
-rm -rf sjlombardo-sqlcipher-*
+rm -rf *-sqlcipher-*
 tar zxvf "sqlcipher-${SQLCIPHER_VERSION}.tar.gz"
 
 # Build
-pushd sjlombardo-sqlcipher-*
+pushd *-sqlcipher-*
 export DEVROOT="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
 export SDKROOT="${DEVROOT}/SDKs/${PLATFORM}${SDK}.sdk"
 export CC=${DEVROOT}/usr/bin/gcc
@@ -62,10 +62,10 @@ then
     export CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=10.5"
   fi
 fi
-./configure --host=${ARCH}-apple-darwin --prefix=${ROOTDIR} --disable-readline --disable-tcl --enable-tempstore=no
+./configure --host=${ARCH}-apple-darwin --prefix=${ROOTDIR} --disable-readline --disable-tcl --enable-threadsafe --enable-cross-thread-connections --enable-tempstore=no
 make
 make install
 popd
 
 # Clean up
-rm -rf sjlombardo-sqlcipher-*
+rm -rf *-sqlcipher-*