Skip to content

Commit

Permalink
Merge remote-tracking branch 'release-0.3.0' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
naxuroqa committed May 28, 2018
2 parents a9bff73 + f21aad4 commit fa69454
Show file tree
Hide file tree
Showing 304 changed files with 29,074 additions and 27,706 deletions.
21 changes: 21 additions & 0 deletions .coafile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[all]
ignore = **/build/**

[all.vala]
bears = SpaceConsistencyBear, FilenameBear
files = **.vala
use_spaces = True
file_naming_convention = pascal

[all.xml]
bears = XMLBear
files = **.(ui|xml)

[all.git]
bears = GitCommitBear
shortlog_length = 79
shortlog_regex = ^VENOM-\d+: .*

[all.po]
bears = DennisBear
files = **.(po|pot)
10 changes: 4 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
*~
icons/CMakeFiles
icons/Makefile
icons/cmake_install.cmake
theme/CMakeFiles
theme/Makefile
theme/cmake_install.cmake
build

# GNOME Builder
.buildconfig
.flatpak-builder
69 changes: 12 additions & 57 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,15 @@
language: c
compiler:
- gcc
sudo: required
language: generic
services: [docker]

before_install:
- sudo apt-add-repository -y ppa:vala-team/ppa
- sudo apt-get update -qq > /dev/null
- sudo apt-get install -qq valac cmake libgtk-3-dev check libjson-glib-dev libsqlite3-dev yasm libqrencode-dev libnotify-dev > /dev/null

before_script:
#installing libsodium, needed for Core
- _libsodium_ver=0.7.0
- git clone git://github.com/jedisct1/libsodium.git > /dev/null
- pushd libsodium
- git checkout tags/${_libsodium_ver} > /dev/null
- ./autogen.sh > /dev/null
- ./configure --prefix=/usr > /dev/null
- make -j3 > /dev/null
- sudo make install > /dev/null
- popd
#installing libopus, needed for audio encoding/decoding
- _opus_ver=1.0.3
- wget http://downloads.xiph.org/releases/opus/opus-${_opus_ver}.tar.gz > /dev/null
- tar xzf opus-${_opus_ver}.tar.gz > /dev/null
- pushd opus-${_opus_ver}
- ./configure --prefix=/usr > /dev/null
- make -j3 > /dev/null
- sudo make install > /dev/null
- popd
#installing vpx
- git clone http://git.chromium.org/webm/libvpx.git > /dev/null
- pushd libvpx
- ./configure --prefix=/usr --enable-shared > /dev/null
- make -j3 > /dev/null
- sudo make install > /dev/null
- popd
#installing toxcore
- git clone http://github.com/irungentoo/ProjectTox-Core.git > /dev/null
- pushd ProjectTox-Core
- autoreconf -i > /dev/null
- ./configure --prefix=/usr --disable-ntox --disable-daemon > /dev/null
- make -j3 > /dev/null
- sudo make install > /dev/null
- popd
#compiling djbdns needed for glib < 2.34
- wget http://cr.yp.to/djbdns/djbdns-1.05.tar.gz
- tar -xzf djbdns-1.05.tar.gz
- pushd djbdns-1.05
- echo gcc -O2 -include /usr/include/errno.h > conf-cc
- make
- popd
#creating libraries links and updating cache
- sudo ldconfig > /dev/null
install:
- docker build --tag test-image .
- docker run --detach --interactive --name test-image-container --volume "$(pwd)":/tmp/venom --workdir /tmp/venom test-image

script:
- mkdir build
- cd build
- cmake -DDJBDNS_DIRECTORY="../djbdns-1.05" -DENABLE_QR_ENCODE=ON -DENABLE_LIBNOTIFY=ON ..
- make -j3
- sudo make install
- docker exec test-image-container meson -D b_coverage=true build
- docker exec test-image-container ninja -C build
- docker exec test-image-container ninja -C build test

after_success:
- bash <(curl -s https://codecov.io/bash)
8 changes: 1 addition & 7 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
See https://github.com/naxuroqa/Venom for a list of contributors.

venom_faenza.svg is styled after Matthieu James' Faenza icon theme.
See http://tiheum.deviantart.com/art/Faenza-Icons-173323228.

venom.svg/venom.png and venom_numix.svg are styled after numixproject's numix icon theme.
See https://github.com/numixproject/numix-icon-theme.
See https://github.com/naxuroqa/Venom/graphs/contributors for a list of contributors.
84 changes: 0 additions & 84 deletions CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion ChangeLog

This file was deleted.

29 changes: 29 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM debian:sid

RUN \
apt-get update && \
apt-get -y upgrade && \
apt-get install -y \
build-essential \
cmake \
libgtk-3-dev \
libjson-glib-dev \
libopus-dev \
libsodium-dev \
libsoup2.4-dev \
libsqlite3-dev \
libvpx-dev \
libgee-0.8-dev \
meson \
valac \
wget

RUN rm -rf /var/lib/apt/lists/*

RUN wget "https://github.com/TokTok/c-toxcore/archive/v0.2.2.tar.gz" && \
tar -xzf v0.2.2.tar.gz && \
cd c-toxcore-0.2.2 && \
cmake -DCMAKE_INSTALL_PREFIX=/usr && \
make && \
make install && \
cd ..
1 change: 0 additions & 1 deletion INSTALL

This file was deleted.

138 changes: 0 additions & 138 deletions INSTALL.md

This file was deleted.

16 changes: 0 additions & 16 deletions NEWS

This file was deleted.

1 change: 0 additions & 1 deletion README

This file was deleted.

Loading

0 comments on commit fa69454

Please sign in to comment.