Skip to content

Travis: add MAC OSX build #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Travis: add MAC OSX build #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
os:
- linux
- osx

matrix:
allow_failures:
- os: osx

language: cpp

Expand All @@ -10,14 +15,15 @@ compiler:
before_script:
- date -u
- uname -a
- lsb_release -a
- ln -s tools/scons.travis.cfg scons.cfg
- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
- sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
- sudo apt-get update -qq
- sudo apt-get install -qq gcc g++ scons swig swig2.0
- sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev doxygen
- env | sort

- chmod +x tools/CI/travis.linux.install.deps.sh
- chmod +x tools/CI/travis.osx.install.deps.sh
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/CI/travis.linux.install.deps.sh; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then tools/CI/travis.osx.install.deps.sh; fi

- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ln -s tools/scons.travis.linux.cfg scons.cfg; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ln -s tools/scons.travis.osx.cfg scons.cfg; fi

script:
- scons
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ env.Append(
LIBPATH = [
libavLibDir,
"#src",
"#build/src"
"#build/"+mymode+"/src"
],
)

Expand Down
10 changes: 10 additions & 0 deletions tools/CI/travis.linux.install.deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

lsb_release -a

sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
sudo apt-get update -qq
sudo apt-get install -qq gcc g++ scons swig swig2.0
sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev doxygen
6 changes: 6 additions & 0 deletions tools/CI/travis.osx.install.deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

brew update

brew install gcc scons swig
brew install ffmpeg freeglut doxygen
0 tools/scons.travis.cfg → tools/scons.travis.linux.cfg
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions tools/scons.travis.osx.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[COMMON]

[PYTHON]
inc=/usr/include/python2.7/

[JAVA]
inc=/usr/lib/jvm/java-7-openjdk-amd64/include;/usr/lib/jvm/java-7-openjdk-amd64/include/linux/

[LIBAV]
inc=/usr/local/Cellar/ffmpeg/2.3.2/include/
libdir=/usr/local/Cellar/ffmpeg/2.3.2/lib/