Skip to content

Commit

Permalink
Merge pull request #28 from tatsy/development
Browse files Browse the repository at this point in the history
Plugin system, remove heavy dependencies.
  • Loading branch information
tatsy committed Jul 13, 2018
2 parents 713f2fb + d56c4df commit ac7e872
Show file tree
Hide file tree
Showing 306 changed files with 13,102 additions and 17,739 deletions.
31 changes: 31 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
image: Visual Studio 2017

platform:
- x86
- x64

configuration:
- Debug
- Release

install:
- mkdir build
- cd build

build_script:
- if %platform%==x86 set generator=Visual Studio 15 2017
- if %platform%==x64 set generator=Visual Studio 15 2017 Win64
- cmake -G "%generator%" -D CMAKE_BUILD_TYPE="%configuration%" -D SPICA_BUILD_MAIN=ON -D WITH_SSE=ON ..

branches:
only:
- master
- development

notifications:
- provider: Email
to:
- tatsy.mail@gmail.com
on_build_success: false
on_build_failure: true
on_build_status_changed: true
13 changes: 8 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Common ignore files
build
tmp
output
data/tmp
build/*
testdata/tmp
.cccc
spica_dirs.h
test_params.h

scenes/*
!scenes/README.md
Expand All @@ -14,6 +12,11 @@ shader_location.h

docs/xml

# CLion
.idea/*
cmake-build-debug/*
cmake-build-release/*

# MacOSX ignore files
.DS_Store
.cproject
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,12 @@
path = docs/html
url = https://github.com/tatsy/spica.git
branch = gh-pages
[submodule "sources/submodules/tinyobjloader"]
path = sources/submodules/tinyobjloader
url = https://github.com/syoyo/tinyobjloader.git
[submodule "sources/submodules/tinyxml2"]
path = sources/submodules/tinyxml2
url = https://github.com/leethomason/tinyxml2
[submodule "sources/submodules/stb"]
path = sources/submodules/stb
url = https://github.com/nothings/stb
64 changes: 40 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,59 @@ language: cpp
sudo: required
compiler:
- gcc
- clang

services:
- docker

before_install:
- sudo apt-get -qq update
# Install required packages
- sudo apt -qq update
# - sudo apt -qq upgrade
- sudo apt -qq install build-essential software-properties-common cmake lcov
- sudo apt -qq install byobu curl wget git htop man unzip vim wget subversion
- if [ $TRAVIS_BRANCH = "master" ]; then sudo apt-get -qq install doxygen; fi

install:
# Pull Docker image
- docker pull tatsy/ubuntu-cxx:default
# Install gcc/g++ v7
- sudo add-apt-repository -yy ppa:ubuntu-toolchain-r/test
- sudo apt -qq update
- sudo apt install -qq gcc-7 g++-7
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
- gcc --version
- g++ --version
- export CC=gcc
- export CXX=g++

# Dynamically generate Dockerfile
- sed -i -e "s/@C_COMPILER@/$CC/;s/@CXX_COMPILER@/$CXX/;s/@BRANCH_NAME@/$TRAVIS_BRANCH/;s/@PULL_REQUEST@/$TRAVIS_PULL_REQUEST/" Dockerfile
# Install GoogleTest
- git clone --depth=1 -b release-1.8.0 https://github.com/google/googletest.git
- mkdir googletest/build && cd googletest/build
- cmake -D CMAKE_BUILD_TYPE=Release .. && make -j4
- sudo make install
- cd ../../

# Build Dockerfile
- docker build --tag=spica-env .
# Install Gcovr
- sudo apt-get -qq install python-pip ruby
- sudo pip install gcovr
- sudo gem install coveralls-lcov

install:
# Build
- mkdir build && cd build
- cmake -D CMAKE_BUILD_TYPE=Release -D SPICA_BUILD_MAIN=ON -D SPICA_BUILD_TESTS=ON -D WITH_SSE=ON ..
- cmake --build .

# Run container
- docker run --name spica-env --env="CI=true" --env="TRAVIS_JOB_ID=$TRAVIS_JOB_ID" --env="CTEST_OUTPUT_ON_FAILURE=TRUE" -c 2048 -m 8192m -itd spica-env
before_script:
- lcov --directory . --zerocounters

script:
# Run test on Docker container
- docker exec spica-env make check
# Testing
- make check

after_success:
## Collect coverage data
- if [ $CXX = "g++" ]; then docker exec spica-env lcov --directory . --capture --output-file coverage.info; fi
- if [ $CXX = "clang++" ]; then docker exec spica-env lcov --directory . --capture --output-file coverage.info; fi
- docker exec spica-env lcov --remove coverage.info '3rdparty/*' 'sources/renderer/*' 'sources/viewer/*' 'tests/*' '/usr/*' 'CMakeFiles/*' --output-file coverage.info
- docker exec spica-env lcov --list coverage.info
- docker exec spica-env coveralls-lcov --repo-token RiYcPJSCbPZoogMd1PE10696EAqG8sl5q coverage.info
- lcov --directory . --capture --output-file coverage.info
- lcov --remove coverage.info 'tests/*' '/usr/*' 'CMakeFiles/*' --output-file coverage.info
- lcov --list coverage.info
- coveralls-lcov --repo-token RiYcPJSCbPZoogMd1PE10696EAqG8sl5q coverage.info

before_deploy:
- pip install sphinx breathe sphinx_rtd_theme
- sudo pip install sphinx breathe sphinx_rtd_theme
- "cd docs; /bin/bash deploy.sh; cd -"
- mkdir packages
- tar czvf packages/releases-$TRAVIS_TAG.tar.gz $(ls -I packages)
Expand All @@ -47,13 +64,12 @@ deploy:
skip_cleanup: true
provider: releases
api_key:
secure: WR9ks1pmxzB6QBS+8lJNxGpZIhaBzgK4luAQm4zeTGOFCZp12GoLZ9lTo1OOb+omwrjFx43/n/NqwFPNVR6ugWdo9Iu3U+kqsl2Ygk+97dJNg1gYDmvKr7UkTHU/O+1f6QP6aQkJT/HWaD7m4bKeNVc+WWy8B2e2FPpMfhsH+GA=
secure: dR/19nZXBFiOxKl6iKqZcI2yjHYpoITGEvjtXJNCRtVm0vPqY/rCocQI8ZB2sBJ7osdP/Sc1nrNiN4EZ7cTi8D6q20xImus2Ox0V3fZycof4fropLLVklfQY71j+g/8MMJ6bRG0WUXj9rnDHRIxjW68fMn73dS0dfZYlsOALCBs=
file:
- packages/releases-$TRAVIS_TAG.tar.gz
- packages/releases-$TRAVIS_TAG.zip
on:
tags: true
condition: $CXX=clang++

branches:
only:
Expand Down
4 changes: 0 additions & 4 deletions 3rdparty/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit ac7e872

Please sign in to comment.