diff --git a/.travis.yml b/.travis.yml index 2ea03e9b..fec94c68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,10 +35,10 @@ matrix: - os: osx env: _macos_build osx_image: xcode8.3 - before_install: "./CI/install-dependencies-osx.sh" - script: "./CI/build-osx.sh" + before_install: "./CI/install-dependencies-macos.sh" + script: "./CI/build-macos.sh" after_success: - - ./CI/package-osx.sh + - ./CI/package-macos.sh deploy: - provider: s3 diff --git a/CI/build-osx.sh b/CI/build-macos.sh similarity index 89% rename from CI/build-osx.sh rename to CI/build-macos.sh index 0609f9cd..073eb802 100755 --- a/CI/build-osx.sh +++ b/CI/build-macos.sh @@ -7,6 +7,7 @@ mkdir build && cd build cmake .. \ -DQTDIR=/usr/local/opt/qt \ -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \ + -DLIBOBS_LIB=../../obs-studio/libobs \ -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \ -DCMAKE_INSTALL_PREFIX=/usr \ && make -j4 diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-macos.sh similarity index 53% rename from CI/install-dependencies-osx.sh rename to CI/install-dependencies-macos.sh index a9e06aa9..d2fa4114 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-macos.sh @@ -7,22 +7,26 @@ brew install ffmpeg brew install libav # qtwebsockets deps -brew install qt5 +# qt latest +#brew install qt5 + +# qt 5.9.2 +brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/2b121c9a96e58a5da14228630cb71d5bead7137e/Formula/qt.rb + #echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" # Build obs-studio cd .. git clone --recursive https://github.com/jp9000/obs-studio cd obs-studio -git checkout 19.0.3 +git checkout 20.1.0 mkdir build && cd build cmake .. \ -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \ && make -j4 -sudo make install - # Packages app cd .. -curl -L -O https://www.slepin.fr/obs-websocket/ci/Packages.pkg -f --retry 5 -C - -sudo installer -pkg ./Packages.pkg -target / +curl -L -O http://s.sudre.free.fr/Software/files/Packages.dmg -f --retry 5 -C - +hdiutil attach ./Packages.dmg +sudo installer -pkg /Volumes/Packages\ 1.2/packages/Packages.pkg -target / diff --git a/CI/osx/obs-websocket.pkgproj b/CI/macos/obs-websocket.pkgproj similarity index 100% rename from CI/osx/obs-websocket.pkgproj rename to CI/macos/obs-websocket.pkgproj diff --git a/CI/package-osx.sh b/CI/package-macos.sh similarity index 98% rename from CI/package-osx.sh rename to CI/package-macos.sh index 3448a608..69b131bb 100755 --- a/CI/package-osx.sh +++ b/CI/package-macos.sh @@ -59,7 +59,7 @@ otool -L ./build/obs-websocket.so chmod -w ./build/QtWebSockets ./build/QtNetwork echo "-- Actual package build" -packagesbuild ./CI/osx/obs-websocket.pkgproj +packagesbuild ./CI/macos/obs-websocket.pkgproj echo "-- Renaming obs-websocket.pkg to $FILENAME" mv ./release/obs-websocket.pkg ./release/$FILENAME