Merge pull request #27 from tatsy/development

.gitignore

@@ -1,5 +1,20 @@
+# Common ignore files
 build
 tmp
 output
+data/tmp
 .cccc
 spica_dirs.h
+
+scenes/*
+!scenes/README.md
+!scenes/download.py
+
+shader_location.h
+
+docs/xml
+
+# MacOSX ignore files
+.DS_Store
+.cproject
+.project

.travis.yml

@@ -16,7 +16,7 @@ install:
   - docker pull tatsy/ubuntu-cxx:default
 
   # Dynamically generate Dockerfile
-  - sed -e "s/@C_COMPILER@/$CC/;s/@CXX_COMPILER@/$CXX/;s/@BRANCH_NAME@/$TRAVIS_BRANCH/;s/@PULL_REQUEST@/$TRAVIS_PULL_REQUEST/" Dockerfile.in > Dockerfile
+  - sed -i -e "s/@C_COMPILER@/$CC/;s/@CXX_COMPILER@/$CXX/;s/@BRANCH_NAME@/$TRAVIS_BRANCH/;s/@PULL_REQUEST@/$TRAVIS_PULL_REQUEST/" Dockerfile
 
   # Build Dockerfile
   - docker build --tag=spica-env .
@@ -32,37 +32,36 @@ 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 --gcov-tool llvm-cov-3.5; fi
-  - docker exec spica-env lcov --remove coverage.info '3rdparty/*' 'src/renderer/*' 'src/viewer/*' 'src/bsdf/*' 'test/*' 'example/*' '/usr/*' 'CMakeFiles/*' --output-file coverage.info
+  - docker exec spica-env lcov --remove coverage.info '3rdparty/*' 'sources/renderer/*' 'sources/viewer/*' 'sources/bsdf/*' 'test/*' 'example/*' '/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
 
 before_deploy:
+  - 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)
-  - zip -q packages/releases-$TRAVIS_TAG.zip -r $(ls)
+  - tar czvf packages/releases-$TRAVIS_TAG.tar.gz $(ls -I packages)
+  - zip -q packages/releases-$TRAVIS_TAG.zip -r $(ls -I packages)
+  - git tag $TRAVIS_TAG -a -m "Commit from Travis CI for build $TRAVIS_BUILD_NUMBER"
+  - git push --tags --quiet https://$GH_TOKEN@github.com/tatsy/lime.git 2> /dev/null
 
 deploy:
   skip_cleanup: true
   provider: releases
   api_key:
-    secure: FvLmuzyUsyy8PN3u/RjsZUt4mUsuuAdG4O4FdSogAPFVeu1oathhntC8q4x1Qw7aQ+5Tper0yX7oJxKHjyuh3oCU+eNHMHGcpj1L21QzzEglUtzS/NW2/QhINt1WXB3onCxhcL9lq+NzWMOdCqPAfe/egbNX/ERCTrGZMtoFNgo=
+    secure: WR9ks1pmxzB6QBS+8lJNxGpZIhaBzgK4luAQm4zeTGOFCZp12GoLZ9lTo1OOb+omwrjFx43/n/NqwFPNVR6ugWdo9Iu3U+kqsl2Ygk+97dJNg1gYDmvKr7UkTHU/O+1f6QP6aQkJT/HWaD7m4bKeNVc+WWy8B2e2FPpMfhsH+GA=
   file:
     - packages/releases-$TRAVIS_TAG.tar.gz
     - packages/releases-$TRAVIS_TAG.zip
   on:
-    tags: true
+    tags: false
     condition: $CXX=clang++
 
 branches:
   only:
     - master
     - development
 
-env:
-  global:
-    secure: FvLmuzyUsyy8PN3u/RjsZUt4mUsuuAdG4O4FdSogAPFVeu1oathhntC8q4x1Qw7aQ+5Tper0yX7oJxKHjyuh3oCU+eNHMHGcpj1L21QzzEglUtzS/NW2/QhINt1WXB3onCxhcL9lq+NzWMOdCqPAfe/egbNX/ERCTrGZMtoFNgo=
-
 notifications:
   email:
     recipients: tatsy.mail@gmail.com

3rdparty/CMakeLists.txt

@@ -0,0 +1,4 @@
+set(THIRD_PARTY_INCLUDE_DIRS
+    "${CMAKE_CURRENT_LIST_DIR}/stb"
+    "${CMAKE_CURRENT_LIST_DIR}/tinyobjloader"
+    CACHE INTERNAL "")