Merge pull request #87 from cchampet/build_MACOSX_Travis

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 50fe91eb882d · 2014-09-11T05:08:25.000-07:00
Travis: add MAC OSX build
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 os:
   - linux
+  - osx
 
 language: cpp
 
@@ -8,15 +9,15 @@ compiler:
   - clang
 
 before_script:
+  - env | sort  
   - date -u
   - uname -a
-  - 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 libxmu-dev doxygen
+  
+  - chmod +x tools/travis.linux.install.deps.sh
+  - chmod +x tools/travis.osx.install.deps.sh
+  
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
 
 script:
   - mkdir build
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -73,8 +73,10 @@ if(SWIG_FOUND)
 
 		# Create 'avtranscoder-py' shared lib
 		swig_add_module(avtranscoder-py python ${AVTRANSCODER_BINDING_FILE})
-		set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
-		set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+		if(NOT APPLE)
+			set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
+			set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+		endif()
 		swig_link_libraries(avtranscoder-py avtranscoder-shared ${PYTHON_LIBRARIES})
 
 		# Install python interface
@@ -101,8 +103,10 @@ if(SWIG_FOUND)
 
 		# Create 'avtranscoder-java' shared lib
 		swig_add_module(avtranscoder-java java ${AVTRANSCODER_BINDING_FILE})
-		set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
-		set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+		if(NOT APPLE)
+			set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
+			set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+		endif()
 		swig_link_libraries(avtranscoder-java avtranscoder-shared)
 
 		# Post build of java binding : compile java files (generate class files) and create jar
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -0,0 +1,9 @@
+#!/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++ cmake swig swig2.0
+sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev libxmu-dev doxygen
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+brew update
+
+brew install gcc cmake swig
+brew install ffmpeg freeglut doxygen
