StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Remove apidsl from the build.

Browse Source 
apidsl is in feature freeze. We can rely on the web service, instead.
This commit is contained in:
iphydf 2018-02-19 00:09:49 +00:00
parent 097f41f264
commit c4a734e304
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -13,10 +13,7 @@ matrix:
compiler: clang compiler: clang
addons: addons:
apt: &apt-dependencies apt: &apt-dependencies
sources:
- avsm
packages: packages:
- aspcud # For Opam
- libconfig-dev # For tox-bootstrapd. - libconfig-dev # For tox-bootstrapd.
- libcv-dev # For av_test. - libcv-dev # For av_test.
- libhighgui-dev # For av_test. - libhighgui-dev # For av_test.
@ -25,7 +22,6 @@ matrix:
- libsndfile1-dev # For av_test. - libsndfile1-dev # For av_test.
- libgtest-dev # For unit tests. - libgtest-dev # For unit tests.
- libvpx-dev # For toxav. - libvpx-dev # For toxav.
- opam # For apidsl and Frama-C.
- portaudio19-dev # For av_test. - portaudio19-dev # For av_test.
- stage: "Stage 1" - stage: "Stage 1"
if: type IN (push, api, cron) if: type IN (push, api, cron)

5
CMakeLists.txt
View File

@ -399,16 +399,15 @@ set(TEST_TIMEOUT_SECONDS "" CACHE STRING "Limit runtime of each test to the numb
option(FORMAT_TEST "Require the format_test to be executed; fail cmake if it can't" OFF) option(FORMAT_TEST "Require the format_test to be executed; fail cmake if it can't" OFF)
if(APIDSL AND ASTYLE) if(ASTYLE)
add_test( add_test(
NAME format_test NAME format_test
COMMAND ${toxcore_SOURCE_DIR}/other/astyle/format-source COMMAND ${toxcore_SOURCE_DIR}/other/astyle/format-source
"${toxcore_SOURCE_DIR}" "${toxcore_SOURCE_DIR}"
"${APIDSL}"
"${ASTYLE}") "${ASTYLE}")
set_tests_properties(format_test PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}") set_tests_properties(format_test PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
elseif(FORMAT_TEST) elseif(FORMAT_TEST)
message(FATAL_ERROR "format_test can not be run, because either APIDSL (${APIDSL}) or ASTYLE (${ASTYLE}) could not be found") message(FATAL_ERROR "format_test can not be run, because ASTYLE (${ASTYLE}) could not be found")
endif() endif()
function(auto_test target) function(auto_test target)

4
other/astyle/format-source
View File

@ -3,8 +3,8 @@
set -e set -e
SOURCE_DIR="$1" SOURCE_DIR="$1"
APIDSL="$2" ASTYLE="$2"
ASTYLE="$3" APIDSL="$3"
# Go to the source root. # Go to the source root.
if [ -z "$SOURCE_DIR" ]; then if [ -z "$SOURCE_DIR" ]; then

11
other/travis/toxcore-linux-install
View File

@ -1,16 +1,5 @@
#!/bin/sh #!/bin/sh
# Set up opam.
opam init -y
eval `opam config env`
# Install required opam packages.
opam install -y ocamlfind ppx_deriving menhir
# Build apidsl.
git clone --depth=1 https://github.com/TokTok/apidsl ../apidsl
make -C ../apidsl -j$NPROC
# Install cpp-coveralls to upload test coverage results. # Install cpp-coveralls to upload test coverage results.
pip install --user urllib3[secure] cpp-coveralls pip install --user urllib3[secure] cpp-coveralls