diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-02-19 00:09:49 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-02-19 21:00:19 +0000 |
commit | c4a734e30462d59d7f9bfe4a865b33936907e0d5 (patch) | |
tree | 1066d8802a0889de0c0fd920e5b848968c386084 /other | |
parent | 097f41f26467249a9b3016dde9151871ae0de501 (diff) |
Remove apidsl from the build.
apidsl is in feature freeze. We can rely on the web service, instead.
Diffstat (limited to 'other')
-rwxr-xr-x | other/astyle/format-source | 4 | ||||
-rwxr-xr-x | other/travis/toxcore-linux-install | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/other/astyle/format-source b/other/astyle/format-source index cf190982..e558149a 100755 --- a/other/astyle/format-source +++ b/other/astyle/format-source | |||
@@ -3,8 +3,8 @@ | |||
3 | set -e | 3 | set -e |
4 | 4 | ||
5 | SOURCE_DIR="$1" | 5 | SOURCE_DIR="$1" |
6 | APIDSL="$2" | 6 | ASTYLE="$2" |
7 | ASTYLE="$3" | 7 | APIDSL="$3" |
8 | 8 | ||
9 | # Go to the source root. | 9 | # Go to the source root. |
10 | if [ -z "$SOURCE_DIR" ]; then | 10 | if [ -z "$SOURCE_DIR" ]; then |
diff --git a/other/travis/toxcore-linux-install b/other/travis/toxcore-linux-install index 502d3de7..3bf452f1 100755 --- a/other/travis/toxcore-linux-install +++ b/other/travis/toxcore-linux-install | |||
@@ -1,16 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | # Set up opam. | ||
4 | opam init -y | ||
5 | eval `opam config env` | ||
6 | |||
7 | # Install required opam packages. | ||
8 | opam install -y ocamlfind ppx_deriving menhir | ||
9 | |||
10 | # Build apidsl. | ||
11 | git clone --depth=1 https://github.com/TokTok/apidsl ../apidsl | ||
12 | make -C ../apidsl -j$NPROC | ||
13 | |||
14 | # Install cpp-coveralls to upload test coverage results. | 3 | # Install cpp-coveralls to upload test coverage results. |
15 | pip install --user urllib3[secure] cpp-coveralls | 4 | pip install --user urllib3[secure] cpp-coveralls |
16 | 5 | ||