Răsfoiți Sursa

Merge pull request #838 from DDRBoxman/cef

CI: Fix cef version variable
Gol-D-Ace 8 ani în urmă
părinte
comite
ed6c25e14b
2 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 1 1
      CI/before-script-osx.sh
  2. 3 3
      CI/install-dependencies-osx.sh

+ 1 - 1
CI/before-script-osx.sh

@@ -1,3 +1,3 @@
 mkdir build
 mkdir build
 cd build
 cd build
-cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_$CEF_BUILD_VERSION_macosx64 ..
+cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..

+ 3 - 3
CI/install-dependencies-osx.sh

@@ -32,9 +32,9 @@ mkdir ./sparkle
 tar -xf ./sparkle.tar.bz2 -C ./sparkle
 tar -xf ./sparkle.tar.bz2 -C ./sparkle
 
 
 # CEF Stuff
 # CEF Stuff
-curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2 -f --retry 5 -C -
-tar -xf ./cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2
-cd ./cef_binary_$CEF_BUILD_VERSION_macosx64
+curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2 -f --retry 5 -C -
+tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
+cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
 mkdir build
 mkdir build
 cd ./build
 cd ./build
 cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..
 cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..