updated to obs 17.0.2, change jansson to build statically to work with cef_bootstrap application

Author: sslivins

CI/before-deploy-osx.sh

@@ -1,8 +1,10 @@
 export GIT_HASH=$(git rev-parse --short HEAD)
 export FILE_DATE=$(date +%Y-%m-%d.%H:%M:%S)
-export FILENAME=$FILE_DATE-$GIT_HASH-osx.zip
+export FILENAME=$FILE_DATE-$GIT_HASH-osx.pkg
 mkdir nightly
 cd ./build
 sudo python ../CI/install/osx/build_app.py
-zip -r -X $FILENAME OBS.app
-mv ./$FILENAME ../nightly
+packagesbuild ../CI/install/osx/CMakeLists.pkgproj
+
+sudo cp OBS.pkg ./$FILENAME
+sudo mv ./$FILENAME ../nightly

CI/before-script-osx.sh

@@ -1,3 +1,3 @@
 mkdir build
 cd build
-cmake -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2704.1434.gec3e9ed_macosx64 ..
+cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2883.1540.gedbfb20_macosx64 ..

CI/install-dependencies-osx.sh

@@ -1,17 +1,22 @@
+curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
+sudo installer -pkg ./Packages.pkg -target /
+
 brew update
 
 #Base OBS Deps
-brew install ffmpeg x264 qt5
+brew install qt5
+
+curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz
+tar -xf ./osx-deps.tar.gz -C /tmp
 
 # CEF Stuff
 cd ../
-curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2704.1434.gec3e9ed_macosx64.tar.bz2
-tar -xf ./cef_binary_3.2704.1434.gec3e9ed_macosx64.tar.bz2
-cd ./cef_binary_3.2704.1434.gec3e9ed_macosx64
+curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2
+tar -xf ./cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2
+cd ./cef_binary_3.2883.1540.gedbfb20_macosx64
 mkdir build
 cd ./build
-cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" ..
+cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..
 make -j4
 mkdir libcef_dll
-mv ./libcef_dll_wrapper/libcef_dll_wrapper.a ./libcef_dll/libcef_dll_wrapper.a
 cd ../../