Skip to content

Commit

Permalink
Consistent servo-deps download URLs
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkspirit committed Nov 6, 2018
1 parent e217672 commit 357f23f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -17,7 +17,7 @@ matrix:
- 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 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
- 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
Expand Down
2 changes: 1 addition & 1 deletion python/servo/build_commands.py
Expand Up @@ -437,7 +437,7 @@ def build(self, target=None, release=False, dev=False, jobs=None,
# Follow these instructions to build and deploy new binaries
# https://github.com/servo/libgstreamer_android_gen#build
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)
urllib.urlretrieve(gst_url, gst_lib_zip)
zip_ref = zipfile.ZipFile(gst_lib_zip, "r")
Expand Down
4 changes: 2 additions & 2 deletions support/android/openssl.makefile
Expand Up @@ -2,13 +2,13 @@
all: openssl
@: # 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
openssl: openssl-${OPENSSL_VERSION}/libssl.so

openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure
./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION}

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 -
2 changes: 1 addition & 1 deletion support/linux/gstreamer/gstreamer.sh
Expand Up @@ -6,7 +6,7 @@

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
rm gstreamer.tar.gz
sed -i "s;prefix=/root/gstreamer;prefix=${PWD}/gstreamer;g" ${PWD}/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc
2 changes: 1 addition & 1 deletion support/magicleap/openssl.sh
Expand Up @@ -25,7 +25,7 @@ fi

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"

if [[ ! -d "${OPENSSL_DIR}/src/openssl-${OPENSSL_VERSION}" ]]; then
Expand Down

0 comments on commit 357f23f

Please sign in to comment.