Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Consistent servo-deps download URLs

Browse source
This commit is contained in:
Jan Andre Ikenmeyer 2018-11-06 12:20:10 +01:00
parent e217672c1a
commit 357f23fae1
No known key found for this signature in database
GPG key ID: 28F9E42748DD95AE
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -17,7 +17,7 @@ matrix:
- sudo add-apt-repository 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.9 main' -y - sudo add-apt-repository 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.9 main' -y
- sudo apt-get update -q - sudo apt-get update -q
- sudo apt-get install clang-3.9 llvm-3.9 llvm-3.9-runtime -y - sudo apt-get install clang-3.9 llvm-3.9 llvm-3.9-runtime -y
- curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-x86_64-linux-gnu.tar.gz | tar xz - curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-x86_64-linux-gnu.tar.gz | tar xz
- sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc - sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc
- export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig - export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig
- export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0 - export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0

2
python/servo/build_commands.py
View file

@ -437,7 +437,7 @@ class MachCommands(CommandBase):
# Follow these instructions to build and deploy new binaries # Follow these instructions to build and deploy new binaries
# https://github.com/servo/libgstreamer_android_gen#build # https://github.com/servo/libgstreamer_android_gen#build
print("Downloading GStreamer dependencies") print("Downloading GStreamer dependencies")
gst_url = "http://servo-deps.s3.amazonaws.com/gstreamer/%s" % gst_lib_zip gst_url = "https://servo-deps.s3.amazonaws.com/gstreamer/%s" % gst_lib_zip
print(gst_url) print(gst_url)
urllib.urlretrieve(gst_url, gst_lib_zip) urllib.urlretrieve(gst_url, gst_lib_zip)
zip_ref = zipfile.ZipFile(gst_lib_zip, "r") zip_ref = zipfile.ZipFile(gst_lib_zip, "r")

4
support/android/openssl.makefile
View file

@ -2,7 +2,7 @@
all: openssl all: openssl
@: # No-op to silence the "make: Nothing to be done for 'all'." message. @: # No-op to silence the "make: Nothing to be done for 'all'." message.
# From http://wiki.openssl.org/index.php/Android # From https://wiki.openssl.org/index.php/Android
.PHONY: openssl .PHONY: openssl
openssl: openssl-${OPENSSL_VERSION}/libssl.so openssl: openssl-${OPENSSL_VERSION}/libssl.so
@ -10,5 +10,5 @@ openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure
./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION} ./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION}
openssl-${OPENSSL_VERSION}/Configure: openssl-${OPENSSL_VERSION}/Configure:
URL=https://s3.amazonaws.com/servo-deps/android-deps/openssl-${OPENSSL_VERSION}.tar.gz; \ URL=https://servo-deps.s3.amazonaws.com/android-deps/openssl-${OPENSSL_VERSION}.tar.gz; \
curl $$URL | tar xzf - curl $$URL | tar xzf -

2
support/linux/gstreamer/gstreamer.sh
View file

@ -6,7 +6,7 @@
set -o errexit set -o errexit
wget http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-x86_64-linux-gnu.tar.gz -O gstreamer.tar.gz wget https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-x86_64-linux-gnu.tar.gz -O gstreamer.tar.gz
tar -zxf gstreamer.tar.gz tar -zxf gstreamer.tar.gz
rm gstreamer.tar.gz rm gstreamer.tar.gz
sed -i "s;prefix=/root/gstreamer;prefix=${PWD}/gstreamer;g" ${PWD}/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc sed -i "s;prefix=/root/gstreamer;prefix=${PWD}/gstreamer;g" ${PWD}/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc

2
support/magicleap/openssl.sh
View file

@ -25,7 +25,7 @@ fi
echo "Building ${OPENSSL_DIR}/lib/libssl.so" echo "Building ${OPENSSL_DIR}/lib/libssl.so"
S3_BUCKET="https://s3.amazonaws.com/servo-deps/android-deps" S3_BUCKET="https://servo-deps.s3.amazonaws.com/android-deps"
S3_URL="${S3_BUCKET}/openssl-${OPENSSL_VERSION}.tar.gz" S3_URL="${S3_BUCKET}/openssl-${OPENSSL_VERSION}.tar.gz"
if [[ ! -d "${OPENSSL_DIR}/src/openssl-${OPENSSL_VERSION}" ]]; then if [[ ! -d "${OPENSSL_DIR}/src/openssl-${OPENSSL_VERSION}" ]]; then