Merge branch 'fix-and-test-source-tarball-process' of https://gitlab.com/eighthave/fdroidserver

MANIFEST.in

@@ -28,6 +28,7 @@ include fdroidserver/getsig/run.sh
 include fdroidserver/getsig/make.sh
 include fdroidserver/getsig/getsig.java
 include tests/run-tests
+include tests/urzip.apk
 include wp-fdroid/AndroidManifest.xml
 include wp-fdroid/android-permissions.php
 include wp-fdroid/readme.txt

tests/run-tests

@@ -42,7 +42,8 @@ create_test_file() {
 #------------------------------------------------------------------------------#
 # "main"
 
-if [ $# -ne 1 ]; then
+if [ $1 = "-h" ] || [ $1 = "--help" ]; then
+    set +x
     echo "Usage: $0 '/path/to/folder/with/apks'"
     exit 1
 fi
@@ -53,7 +54,11 @@ if [ -z $ANDROID_HOME ]; then
     exit 1
 fi
 
+if [ -z $1 ]; then
+    APKDIR=`pwd`
+else
     APKDIR=$1
+fi
 
 if [ -z $WORKSPACE ]; then
     WORKSPACE=`dirname $(pwd)`
@@ -70,6 +75,24 @@ if [ -z $aapt ]; then
     aapt=`ls -1 $ANDROID_HOME/build-tools/*/aapt | sort | tail -1`
 fi
 
+
+#------------------------------------------------------------------------------#
+echo_header "create a source tarball and use that to build a repo"
+
+cd $WORKSPACE
+python setup.py sdist
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+tar xzf `ls -1 $WORKSPACE/dist/fdroidserver-*.tar.gz | sort -n | tail -1`
+cd $REPOROOT/fdroidserver-*/fdroidserver/getsig
+./make.sh
+cd $REPOROOT
+./fdroidserver-*/fdroid init
+copy_apks_into_repo $REPOROOT
+./fdroidserver-*/fdroid update --create-metadata
+
+
 #------------------------------------------------------------------------------#
 echo_header "test config checks of local_copy_dir"