From: Scott <sr55.hb@outlook.com>
Date: Mon, 10 Dec 2018 10:47:07 +0000 (+0000)
Subject: Setup the Macos Build + Fixes
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae66ab060ecabd2394b29a0d40f6e995a9add76b;p=handbrake

Setup the Macos Build + Fixes
---

diff --git a/.travis.yml b/.travis.yml
index a63b0760b..74adf1ea1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,19 +27,19 @@ script:
 - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_MINGW" == false  ]]; then ./configure --disable-gtk --disable-gst --launch --launch-jobs=0 ; fi
 
 # MinGW Build Support
-- if [[ "$BUILD_MINGW" == true && ! -d "$HOME/toolchains/mingw-w64-5.0.2-gcc-7.1.0" ]]; then ./scripts/mingw-w64-build x86_64 && ./scripts/mingw-w64-build x86_64.clean ; fi
+- if [[ "$BUILD_MINGW" == true && ! -d ~/toolchains/mingw-w64-5.0.2-gcc-7.1.0 ]]; then ./scripts/mingw-w64-build x86_64  ; fi
+- if [[ "$BUILD_MINGW" == true && ! -d ~/toolchains/mingw-w64-5.0.2-gcc-7.1.0 ]]; then ./scripts/mingw-w64-build x86_64.clean  ; fi
 - if [[ "$BUILD_MINGW" == true ]]; then wget https://www.nasm.us/pub/nasm/releasebuilds/2.14/nasm-2.14.tar.gz ; fi
 - if [[ "$BUILD_MINGW" == true ]]; then tar xvf nasm-2.14.tar.gz ; fi
 - if [[ "$BUILD_MINGW" == true ]]; then cd nasm-2.14/ && ./configure && make ; fi
 - if [[ "$BUILD_MINGW" == true ]]; then pwd && cd .. ; fi
-- if [[ "$BUILD_MINGW" == true ]]; then export PATH=$HOME/toolchains/mingw-w64-5.0.2-gcc-7.1.0/mingw-w64-x86_64/bin:$HOME/build/HandBrake/HandBrake/nasm-2.14:$PATH ; fi
+- if [[ "$BUILD_MINGW" == true ]]; then export PATH=/home/travis/build/HandBrake/HandBrake/nasm-2.14:$HOME/toolchains/mingw-w64-5.0.2-gcc-7.1.0/mingw-w64-x86_64/bin:$PATH ; fi
 - if [[ "$BUILD_MINGW" == true ]]; then ./configure --cross=x86_64-w64-mingw32 --enable-nvenc --enable-qsv --enable-vce --launch --launch-jobs=1 ; fi
 
 # Macos Build Support
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo ./scripts/mac-toolchain-build  ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -la ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd ~/ ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -la ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" && ! -d "$HOME/toolchains/mac" ]]; then sudo ./scripts/mac-toolchain-build ~/toolchains/mac  ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$HOME/toolchains/mac/bin:$PATH ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./configure --launch --launch-jobs=0 ; fi
 
 
 cache: