summaryrefslogtreecommitdiff
path: root/other
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-01-20 14:22:34 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-01-20 19:05:53 +0000
commitd7583a719a73cf5ec75da7839b2fd2c11d676c45 (patch)
treec7dd6f9ba3e2e937dca98d4c9eb7ae30a0c68eb4 /other
parentc5976e37eaadf663dc3d0c18376ea023355048f3 (diff)
Remove nTox from the repo.
It's a maintenance burden nobody uses. Let's make toxic the official console client, instead.
Diffstat (limited to 'other')
-rw-r--r--other/bootstrap_daemon/docker/Dockerfile.alpine2
-rwxr-xr-xother/travis/autotools-script1
-rw-r--r--other/travis/env.sh2
3 files changed, 2 insertions, 3 deletions
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 && \
39# Compile 39# Compile
40 cd c-toxcore-master && \ 40 cd c-toxcore-master && \
41 su_wrapper "./autogen.sh" && \ 41 su_wrapper "./autogen.sh" && \
42 su_wrapper "./configure --prefix=/usr --enable-daemon --disable-av --disable-ntox" && \ 42 su_wrapper "./configure --prefix=/usr --enable-daemon --disable-av" && \
43 su_wrapper "make" && \ 43 su_wrapper "make" && \
44# Run tests (they FAIL mostly if you don't have enough compute resources) 44# Run tests (they FAIL mostly if you don't have enough compute resources)
45# 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 && \ 45# 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
22 --enable-nacl \ 22 --enable-nacl \
23 --enable-daemon \ 23 --enable-daemon \
24 --enable-logging \ 24 --enable-logging \
25 --enable-ntox \
26 $IPV6_FLAG \ 25 $IPV6_FLAG \
27 --with-log-level=TRACE 26 --with-log-level=TRACE
28 27
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
7export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig 7export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig
8export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle 8export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle
9export CFLAGS="-O3 -DTRAVIS_ENV=1" 9export CFLAGS="-O3 -DTRAVIS_ENV=1"
10export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON -DBUILD_NTOX=ON" 10export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON"
11export MAKE=make 11export MAKE=make
12 12
13BUILD_DIR=_build 13BUILD_DIR=_build