From d7583a719a73cf5ec75da7839b2fd2c11d676c45 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sat, 20 Jan 2018 14:22:34 +0000 Subject: Remove nTox from the repo. It's a maintenance burden nobody uses. Let's make toxic the official console client, instead. --- other/bootstrap_daemon/docker/Dockerfile.alpine | 2 +- other/travis/autotools-script | 1 - other/travis/env.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'other') diff --git a/other/bootstrap_daemon/docker/Dockerfile.alpine b/other/bootstrap_daemon/docker/Dockerfile.alpine index 2d15c846..f0b99bab 100644 --- a/other/bootstrap_daemon/docker/Dockerfile.alpine +++ b/other/bootstrap_daemon/docker/Dockerfile.alpine @@ -39,7 +39,7 @@ RUN set -x && \ # Compile cd c-toxcore-master && \ su_wrapper "./autogen.sh" && \ - su_wrapper "./configure --prefix=/usr --enable-daemon --disable-av --disable-ntox" && \ + su_wrapper "./configure --prefix=/usr --enable-daemon --disable-av" && \ su_wrapper "make" && \ # Run tests (they FAIL mostly if you don't have enough compute resources) # for i in $(seq 1 10); do echo "=== check attempt $i ==="; su_wrapper "make check"; ret=$?; echo "=== check returned $ret ==="; if [ $ret -eq 0 ]; then echo "=== check passed ==="; break; elif [ $i -eq 10 ]; then echo "=== too many failures, aborting ==="; exit 1; fi; done && \ diff --git a/other/travis/autotools-script b/other/travis/autotools-script index d47dc717..d72ec2a9 100755 --- a/other/travis/autotools-script +++ b/other/travis/autotools-script @@ -22,7 +22,6 @@ fi --enable-nacl \ --enable-daemon \ --enable-logging \ - --enable-ntox \ $IPV6_FLAG \ --with-log-level=TRACE diff --git a/other/travis/env.sh b/other/travis/env.sh index b0ccda62..f4ef8ef3 100644 --- a/other/travis/env.sh +++ b/other/travis/env.sh @@ -7,7 +7,7 @@ export LD_LIBRARY_PATH=$CACHE_DIR/lib export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle export CFLAGS="-O3 -DTRAVIS_ENV=1" -export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON -DBUILD_NTOX=ON" +export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON" export MAKE=make BUILD_DIR=_build -- cgit v1.2.3