From 76b3ac9eff95e385e59ff2706b11facd695234fd Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 21 Nov 2014 11:41:35 -0800 Subject: [PATCH] Simplfy DEPS: always pull all deps, remove unused barelinux platform. Left some notes about where we might further clean up. BUG=skia: Review URL: https://codereview.chromium.org/753633002 --- DEPS | 55 +++------- platform_tools/barelinux/bin/arm64_download | 150 ---------------------------- platform_tools/barelinux/bin/arm64_make | 55 ---------- platform_tools/barelinux/bin/barelinux_make | 83 --------------- platform_tools/barelinux/bin/download_deps | 29 ------ 5 files changed, 16 insertions(+), 356 deletions(-) delete mode 100755 platform_tools/barelinux/bin/arm64_download delete mode 100755 platform_tools/barelinux/bin/arm64_make delete mode 100755 platform_tools/barelinux/bin/barelinux_make delete mode 100755 platform_tools/barelinux/bin/download_deps diff --git a/DEPS b/DEPS index bf00291..1a489f2 100644 --- a/DEPS +++ b/DEPS @@ -5,53 +5,30 @@ use_relative_paths = True deps = { "common": "https://skia.googlesource.com/common.git@d7c2e2b9464e70e0f3847a330b930d008dc8c8db", + # There is some duplication here that might be worth cleaning up: + # - both Android and ChromeOS pull the same giflib; + # - can use use our existing t_p/e/libjpeg instead of pulling it for Android? + "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@23a8a433529d9db23882c702a29d5e594841563d", "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1", "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@f1c42f73e4cc2912460aab113f9cd31ee3fafd38", - "third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3", + "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35", "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@1afff032c83e26ddf7f2776e8b43de5ad666c1fa", + "third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3", "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39", "third_party/externals/nanomsg": "https://skia.googlesource.com/third_party/nanomsg.git@0.4-beta", - "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35", - # The line below is needed for compiling SkV8Example. Do not delete. - #"third_party/externals/v8": "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4", -} - -recursedeps = [ - "common", -] + "platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-4.2.2_r1.2", + "platform_tools/android/third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git@android-4.2.2_r1.2", + "platform_tools/android/third_party/externals/jpeg" : "https://android.googlesource.com/platform/external/jpeg.git@ef1b83013e7814622a9d11579878d342e84580b7", + "platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git@android-4.2.2_r1.2", -deps_os = { - "android": { - "platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-4.2.2_r1.2", - "platform_tools/android/third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git@android-4.2.2_r1.2", - "platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git@android-4.2.2_r1.2", - "platform_tools/android/third_party/externals/jpeg" : - "https://android.googlesource.com/platform/external/jpeg.git@ef1b83013e7814622a9d11579878d342e84580b7", - }, - "chromeos": { - "platform_tools/chromeos/third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git@android-4.2.2_r1.2", - "platform_tools/chromeos/toolchain/src/third_party/chromite": "https://chromium.googlesource.com/chromiumos/chromite.git@d6a4c7e0ee4d53ddc5238dbddfc0417796a70e54", - "platform_tools/chromeos/toolchain/src/third_party/pyelftools": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e", - }, + "platform_tools/chromeos/third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git@android-4.2.2_r1.2", + "platform_tools/chromeos/toolchain/src/third_party/chromite": "https://chromium.googlesource.com/chromiumos/chromite.git@d6a4c7e0ee4d53ddc5238dbddfc0417796a70e54", + "platform_tools/chromeos/toolchain/src/third_party/pyelftools": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e", - # barelinux is a DEPS target that has no shared libraries to link - # to, similar to android or chromeos. - "barelinux": { - "third_party/externals/giflib" : - "https://android.googlesource.com/platform/external/giflib.git@android-4.2.2_r1.2", - "third_party/externals/libpng" : - "https://android.googlesource.com/platform/external/libpng.git@android-4.2.2_r1.2", - "third_party/externals/zlib" : - "https://android.googlesource.com/platform/external/zlib.git@android-4.2.2_r1.2", - } + # The line below is needed for compiling SkV8Example. Do not delete. + #"third_party/externals/v8": "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4", } -#hooks = [ -# { -# # A change to a .gyp, .gypi, or to GYP itself should run the generator. -# "pattern": ".", -# "action": ["python", "trunk/gyp_skia"], -# }, -#] +recursedeps = [ "common" ] diff --git a/platform_tools/barelinux/bin/arm64_download b/platform_tools/barelinux/bin/arm64_download deleted file mode 100755 index 257d464..0000000 --- a/platform_tools/barelinux/bin/arm64_download +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/sh - -# Copyright 2014 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -usage() { - cat >&2 <&2 - return $ret - fi -} - -download_necessary_software_to_dir() ( - cd "$1" - local location="chromium-skia-gm/arm64env" - try gsutil cp "gs://${location}/md5sum.txt" . || return - if md5sum -c --quiet "md5sum.txt"; then - return 0 - fi - try gsutil cp "gs://${location}/*" . || return -) - -install_compiler() { - local working_dir="$1" - local toolchain="gcc-linaro-aarch64-linux-gnu-4.8-2013.12_linux" - ( - try cd "$working_dir" || return - try test -f "${toolchain}.tar.xz" || return - try xz --decompress --stdout < "${toolchain}.tar.xz" | \ - try tar xf - || return - ) - local dir="${working_dir}/${toolchain}" - try test -d "$dir" || return - try test -x "${dir}/bin/aarch64-linux-gnu-gcc" || return - try test -x "${dir}/bin/aarch64-linux-gnu-g++" || return -} - -install_runtime() { - local working_dir="$1" - - local firmware='img-foundation.axf' - local rootfs='vexpress64-openembedded_lamp-armv8-gcc-4.8_20131215-557' - local compressed_rootfs="${rootfs}.img.CLEAN_AND_CONFIGURED.xz" - local compressed_foundation_model='FM000-KT-00035-r0p8-52rel06.tgz' - local keyfile='CLEAN_AND_CONFIGURED_key' - - try cp "${working_dir}/$firmware" "${working_dir}/firmware" || return - - try xz --decompress --stdout \ - < "${working_dir}/${compressed_rootfs}" \ - > "${working_dir}/rootfs" || return - try test -f "${working_dir}/rootfs" || return - - ( - try cd "$working_dir" || return - try test -f "$compressed_foundation_model" || return - try gunzip -c "$compressed_foundation_model" | try tar xf - || return - try test -d "Foundation_v8pkg" || return # Assert. - ) - - try cp "${working_dir}/${keyfile}" "${working_dir}/key" || return - chmod 'go=' "${working_dir}/key" -} - -start_arm64_image() { - local working_dir="$1" - local foundation_dir="${working_dir}/Foundation_v8pkg" - local foundation="${foundation_dir}/models/Linux64_GCC-4.1/Foundation_v8" - local firmware="${working_dir}/firmware" - local rootfs="${working_dir}/rootfs" - - try test -d "$foundation_dir" || return - try test -x "$foundation" || return - try test -f "$firmware" || return - try test -f "$rootfs" || return - - for PID in $(ps -o 'pid=' -C 'Foundation_v8') ; do - kill $PID - done - - DISPLAY='' nohup \ - "$foundation" \ - --image="${firmware}" \ - --cores=4 \ - --block-device="${rootfs}" \ - --network="nat" \ - --network-nat-subnet="192.168.31.0/24" \ - --network-nat-ports="8022=22" \ - > /dev/null 2>&1 & - echo 'Waiting for foundation model to boot...' - while ! ssh -i "${working_dir}/key" \ - -o NoHostAuthenticationForLocalhost=yes \ - -p 8022 user@localhost true 2> /dev/null; do - sleep 5 - done - echo 'Listening to SSH on port 8022.' -} - -arm64_download() { - local working_directory="$1" - try mkdir -p "$working_directory" || return - - try download_necessary_software_to_dir "$working_directory" || return - - try install_compiler "$working_directory" || return - - try install_runtime "$working_directory" || return - - try start_arm64_image "$working_directory" || return -} - -for command in gsutil xz tar md5sum gunzip; do - try command -v "$command" > /dev/null || usage || exit -done - -if [ -z "$1" ] ; then - usage || exit -fi -try arm64_download "$1" diff --git a/platform_tools/barelinux/bin/arm64_make b/platform_tools/barelinux/bin/arm64_make deleted file mode 100755 index 9797df8..0000000 --- a/platform_tools/barelinux/bin/arm64_make +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -# Copyright 2014 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -set -e # When any command fails, the shell will immediately exit. - -usage() { - cat >&2 <&2; - usage || exit;; - esac -done -OPTIND=1 # Reset this variable for calling barelinux_make with -t command flag. - -export GYP_DEFINES="${GYP_DEFINES} \ - skia_gpu=0 \ - skia_arch_type=arm64 \ - " - -. "$(dirname "$0")/barelinux_make" -t "$BUILD_TYPE" - diff --git a/platform_tools/barelinux/bin/barelinux_make b/platform_tools/barelinux/bin/barelinux_make deleted file mode 100755 index 7673fd2..0000000 --- a/platform_tools/barelinux/bin/barelinux_make +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -# Copyright 2014 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -set -e # When any command fails, the shell will immediately exit. - -if echo $- | grep -q 'x'; then - # Debug mode - trap 'echo exit status = $?' EXIT -fi - -usage() { - cat >&2 <&2; - usage || exit;; - esac -done -# Append exra arguments to GYP_DEFINES variable. -shift $(( $OPTIND - 1 )) -GYP_DEFINES="${GYP_DEFINES} $*" - -# If you move this script, this must be changed. -SKIA_SRC_DIR="$(cd "$(dirname "$0")/../../.."; pwd)" - -# Set a reasonable default. -export SKIA_OUT="${SKIA_OUT:-${SKIA_SRC_DIR}/out/barelinux}" - -mkdir -p "$SKIA_OUT" - -export GYP_GENERATORS="ninja" -export GYP_GENERATOR_FLAGS="" -export GYP_DEFINES="${GYP_DEFINES} \ - skia_warnings_as_errors=0 \ - skia_giflib_static=1 \ - skia_libpng_static=1 \ - skia_zlib_static=1 \ - skia_freetype_static=1 \ - skia_no_fontconfig=1 \ - skia_poppler_enabled=0 \ - skia_skip_gui=1 \ - " - -"${SKIA_SRC_DIR}/gyp_skia" - -ninja -C "${SKIA_OUT}/${BUILD_TYPE}" - diff --git a/platform_tools/barelinux/bin/download_deps b/platform_tools/barelinux/bin/download_deps deleted file mode 100755 index 0676961..0000000 --- a/platform_tools/barelinux/bin/download_deps +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# Copyright 2014 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# download_deps - download Skia's dependencies for a bare Linux system -# (the normal dependecies plus giflib, libpng, and zlib.) - -try() { - # print an error on nonzero return code - "$@" - local ret=$? - if [ $ret != 0 ] ; then - echo "'$@' failed and returned ${ret}." >&2 - return $ret - fi -} - -try command -v gclient > /dev/null || exit -cd "$(dirname "$0")/../../.." - -try gclient config --unmanaged --name . \ - 'https://skia.googlesource.com/skia.git' || exit - -echo 'target_os = ["barelinux"]' >> ./.gclient - -try gclient sync --jobs=1 || exit -- 2.7.4