Merge branch 'reproducible-build' of https://github.com/eighthave/android-database-sqlcipher into eighthave-reproducible-build

Conflicts:
	Makefile

Author: developernotes

Makefile

@@ -7,10 +7,11 @@ SQLCIPHER_DIR := ${EXTERNAL_DIR}/sqlcipher
 LICENSE := SQLCIPHER_LICENSE
 ASSETS_DIR := assets
 OPENSSL_DIR := ${EXTERNAL_DIR}/openssl
+GIT_DESCRIBE := $(shell git describe)
 LATEST_TAG := $(shell git tag | sort -r | head -1)
 SECOND_LATEST_TAG := $(shell git tag | sort -r | head -2 | tail -1)
-RELEASE_DIR := sqlipher-for-android-${LATEST_TAG}
-CHANGE_LOG_HEADER := "Changes included in the ${LATEST_TAG} release of SQLCipher for Android:"
+RELEASE_DIR := sqlcipher-for-android-${GIT_DESCRIBE}
+CHANGE_LOG_HEADER := "Changes included in the ${GIT_DESCRIBE} release of SQLCipher for Android:"
 README := ${RELEASE_DIR}/README
 
 # Use faketime to freeze time to make for reproducible builds.
@@ -21,8 +22,10 @@ README := ${RELEASE_DIR}/README
 # time to UTC so its always the same on all machines.
 ifeq ($(shell if which faketime > /dev/null; then echo faketime; fi),faketime)
   export TZ=UTC
-  TIMESTAMP := $(shell faketime "`git log -n1 --format=format:%ai`" \
-                   date --utc '+%Y-%m-%d %H:%M:%S')
+  TIMESTAMP := $(shell faketime -f "`git log -n1 --format=format:%ai`" \
+                   date -u '+%Y-%m-%d %H:%M:%S')
+  TOUCH := touch -t $(shell faketime -f "`git log -n1 --format=format:%ai`" \
+                        date -u '+%Y%m%d%H%M.%S')
 # frozen time
   FAKETIME := faketime -f "$(TIMESTAMP)"
 # time moving at 5% of normal speed
@@ -59,7 +62,10 @@ release:
 	cp ${LICENSE} ${RELEASE_DIR}
 	printf "%s\n\n" ${CHANGE_LOG_HEADER} > ${README}
 	git log --pretty=format:' * %s' ${SECOND_LATEST_TAG}..${LATEST_TAG} >> ${README}
-	zip -r ${RELEASE_DIR}.zip ${RELEASE_DIR}
+# fix the timestamp on the files to include in the zipball
+	find ${RELEASE_DIR} | xargs $(TOUCH)
+	ls -lR ${RELEASE_DIR}
+	find ${RELEASE_DIR} | sort -u | $(FAKETIME) zip -@9 ${RELEASE_DIR}.zip
 	rm -rf ${RELEASE_DIR}
 
 clean:

compare-to-official-release

@@ -0,0 +1,66 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 /path/to/sqlcipher-for-android.zip /another/sqlcipher-for-android.zip"
+    exit 1
+fi
+
+set -e
+set -x
+
+test -e "$1"
+test -e "$2"
+
+tmpdir=`mktemp -d /tmp/.compare-zips.XXXXXXXXXX`
+zip1=$(basename $1)
+zip2=$(basename $2)
+sourcedir1=$(cd `dirname $1` && pwd)
+sourcedir2=$(cd `dirname $2` && pwd)
+zipname1=`echo $zip1 | sed 's,\.zip$,,'`
+zipname2=`echo $zip2 | sed 's,\.zip$,,'`
+dir1=$tmpdir/`echo $(dirname $1) | sed 's,[/ ],_,g'`-$zipname1
+dir2=$tmpdir/`echo $(dirname $2) | sed 's,[/ ],_,g'`-$zipname2
+
+mkdir -p $dir1
+cd $dir1
+unzip "$sourcedir1/$zip1"
+# strip the full path to the zip for the comparison
+unzip -l "$sourcedir1/$zip1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt
+unzip -lv "$sourcedir1/$zip1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt
+mkdir -p $dir1/$zipname1/libs/sqlcipher
+cd $dir1/$zipname1/libs/sqlcipher
+unzip ../sqlcipher.jar
+unzip -l ../sqlcipher.jar > unzip-l.txt
+unzip -lv ../sqlcipher.jar > unzip-lv.txt
+mkdir -p $dir1/$zipname1/libs/sqlcipher-javadoc
+cd $dir1/$zipname1/libs/sqlcipher-javadoc
+unzip ../sqlcipher-javadoc.jar
+unzip -l ../sqlcipher-javadoc.jar > unzip-l.txt
+unzip -lv ../sqlcipher-javadoc.jar > unzip-lv.txt
+
+mkdir -p $dir2
+cd $dir2
+unzip "$sourcedir2/$zip2"
+# strip the full path to the zip for the comparison
+unzip -l "$sourcedir2/$zip2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt
+unzip -lv "$sourcedir2/$zip2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt
+mkdir -p $dir2/$zipname2/libs/sqlcipher
+cd $dir2/$zipname2/libs/sqlcipher
+unzip ../sqlcipher.jar
+unzip -l ../sqlcipher.jar > unzip-l.txt
+unzip -lv ../sqlcipher.jar > unzip-lv.txt
+mkdir -p $dir2/$zipname2/libs/sqlcipher-javadoc
+cd $dir2/$zipname2/libs/sqlcipher-javadoc
+unzip ../sqlcipher-javadoc.jar
+unzip -l ../sqlcipher-javadoc.jar > unzip-l.txt
+unzip -lv ../sqlcipher-javadoc.jar > unzip-lv.txt
+
+if which meld > /dev/null; then
+    meld $dir1 $dir2
+elif which opendiff > /dev/null; then
+    opendiff $dir1 $dir2
+else
+    echo "ERROR: meld or opendiff required for the comparison!"
+fi
+
+rm -rf $tmpdir/