zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

move gstreamer dependency to s3 (#3521)

QGC4.4
Daniel Agar 9 years ago committed by GitHub
parent
97abff09af
commit
a35f16d969
2 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .appveyor.yml
  2. 4
      .travis.yml

4
.appveyor.yml
Unescape View File

@ -29,7 +29,7 @@ install:
Write-Host "Installing GStreamer..." -ForegroundColor Cyan Write-Host "Installing GStreamer..." -ForegroundColor Cyan
$msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.8.1.msi" $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.8.1.msi"
Write-Host "Downloading..." Write-Host "Downloading..."
(New-Object Net.WebClient).DownloadFile('https://gstreamer.freedesktop.org/data/pkg/windows/1.8.1/gstreamer-1.0-x86-1.8.1.msi', $msiPath) (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-x86-1.8.1.msi', $msiPath)
Write-Host "Installing..." Write-Host "Installing..."
cmd /c start /wait msiexec /package $msiPath /passive cmd /c start /wait msiexec /package $msiPath /passive
Write-Host "Installed" -ForegroundColor Green Write-Host "Installed" -ForegroundColor Green
@ -37,7 +37,7 @@ install:
Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan
$msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86-1.8.1.msi" $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86-1.8.1.msi"
Write-Host "Downloading..." Write-Host "Downloading..."
(New-Object Net.WebClient).DownloadFile('https://gstreamer.freedesktop.org/data/pkg/windows/1.8.1/gstreamer-1.0-devel-x86-1.8.1.msi', $msiPath) (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-x86-1.8.1.msi', $msiPath)
Write-Host "Installing..." Write-Host "Installing..."
cmd /c start /wait msiexec /package $msiPath /passive cmd /c start /wait msiexec /package $msiPath /passive
Write-Host "Installed" -ForegroundColor Green Write-Host "Installed" -ForegroundColor Green

4
.travis.yml
Unescape View File

@ -105,8 +105,8 @@ install:
; ;
fi fi
- if [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then - if [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then
wget http://gstreamer.freedesktop.org/data/pkg/osx/1.5.2/gstreamer-1.0-devel-1.5.2-x86_64.pkg && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-1.5.2-x86_64.pkg &&
wget http://gstreamer.freedesktop.org/data/pkg/osx/1.5.2/gstreamer-1.0-1.5.2-x86_64.pkg && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-1.5.2-x86_64.pkg &&
sudo installer -verboseR -pkg gstreamer-1.0-devel-1.5.2-x86_64.pkg -target / && sudo installer -verboseR -pkg gstreamer-1.0-devel-1.5.2-x86_64.pkg -target / &&
sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / && sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang.tar.bz2 && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang.tar.bz2 &&

Write Preview
Loading…
Cancel
Save