Update build script and dependencies

requirements.txt

@@ -0,0 +1 @@
+requirements/requirements-xenial.txt

requirements/requirements-trusty.txt

@@ -0,0 +1,13 @@
+Parsley==1.2
+Twisted==16.0.0
+cffi==1.5.2
+cryptography==1.2.3
+enum34==0.9.23
+idna==2.0
+pyOpenSSL==0.15.1
+pyasn1==0.1.9
+pycparser==2.10
+service_identity==16.0.0
+six==1.5.2
+transaction==1.1.1
+zope.interface==4.0.5

requirements/requirements-xenial.txt

@@ -0,0 +1,13 @@
+Parsley==1.2
+Twisted==16.0.0
+cffi==1.5.2
+cryptography==1.2.3
+enum34==1.1.2
+idna==2.0
+pyOpenSSL==0.15.1
+pyasn1==0.1.9
+pycparser==2.14
+service_identity==16.0.0
+six==1.10.0
+transaction==1.4.3
+zope.interface==4.1.3

scripts/build.sh

@@ -7,12 +7,13 @@ usage() {
   echo "Valid options:"
   echo " -h"
   echo -e " -t tagname (build specific release/branch)"
-  echo -e " -d distribution (available: precise, trusty, wheezy, jessie)"
+  echo -e " -d distribution (available: trusty, xenial, wheezy, jessie)"
   echo -e " -n (do not sign)"
   echo -e " -p (push on repository)"
 }
 
-DISTRIBUTION="precise"
+TARGETS="trusty xenial wheezy jessie"
+DISTRIBUTION="trusty"
 TAG="master"
 NOSIGN=0
 PUSH=0
@@ -37,18 +38,12 @@ while getopts "d:t:np:h" opt; do
   esac
 done
 
-if [ "$DISTRIBUTION" != "all" ] &&
-   [ "$DISTRIBUTION" != "precise" ] &&
-   [ "$DISTRIBUTION" != "trusty" ] &&
-   [ "$DISTRIBUTION" != "wheezy" ] &&
-   [ "$DISTRIBUTION" != "jessie" ]; then
+if ! [[ $TARGETS =~ $DISTRIBUTION ]] && [[ $DISTRIBUTION != 'all' ]]; then
  usage
  exit 1
 fi
 
-if [ "$DISTRIBUTION" == "all" ]; then
-  TARGETS="precise trusty wheezy jessie"
-else
+if [ "$DISTRIBUTION" != 'all' ]; then
   TARGETS=$DISTRIBUTION
 fi
 
@@ -89,14 +84,15 @@ for TARGET in $TARGETS; do
   cp -r $BUILDSRC $BUILDDIR
   cd $BUILDDIR/Tor2web
 
-  rm debian/control
+  rm debian/control requirements.txt
 
-  if [ "$TARGET" == 'xenial' ]; then
-    ln -s controlX/control.$TARGET debian/control
-  else
-    ln -s controlX/control.trusty debian/control
+  if [ "$TARGET" != 'xenial' ]; then
+    TARGET='trusty'
   fi
 
+  cp debian/controlX/control.$TARGET debian/control
+  cp requirements/requirements-$TARGET.txt requirements.txt
+
   sed -i "s/stable; urgency=/$TARGET; urgency=/g" debian/changelog
 
   if [ $NOSIGN -eq 1 ]; then

scripts/travis.sh

@@ -6,10 +6,8 @@ sudo apt-get update -y
 
 sudo apt-get install -y debhelper devscripts dh-apparmor dh-python python python-pip python-setuptools python-sphinx
 
+rm -rf requirements.txt
+ln -s requirements/requirements-xenial.txt requirements.txt
 pip install -r requirements.txt
-pip install coverage coveralls
-
-coverage run setup.py test # tests still to be implemented
-coveralls || true
 
 ./scripts/build.sh -d trusty -t $TRAVIS_COMMIT -n