diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-09-30 16:56:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-30 22:19:20 +0000 |
| commit | f3c874a9848d7315b87ccdee7203dbff8d6cf774 (patch) | |
| tree | cd6db27c4000a7bf41fad22a56ac7f73138b38c1 | |
| parent | 7a02f019f25c13e95d5e021bc6d8ce8f9d99292a (diff) | |
There are no more cmake bots, so clean up their old scripts.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2854
Change-Id: Ieb94788182b35d8fd3197ce090d5f28a65903204
Reviewed-on: https://skia-review.googlesource.com/2854
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | DEPS | 1 | ||||
| -rwxr-xr-x | cmake/cmake_build | 42 |
2 files changed, 0 insertions, 43 deletions
@@ -11,7 +11,6 @@ deps = { # - 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@d445357315299e30c18c756f657ff928653128c2", - "third_party/externals/cmake" : "https://cmake.googlesource.com/cmake.git@v3.3.1", "third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@4d3f7ca8cedbddad40b9e93a82926618e3fb4265", "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@87ac4d0e63fc7dd8152a350327fea8dcf031bf56", "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@1.3.0", diff --git a/cmake/cmake_build b/cmake/cmake_build deleted file mode 100755 index 956f1a44b5..0000000000 --- a/cmake/cmake_build +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Copyright 2015 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Script for building with CMake on Skia build bots. -# If you have CMake installed on your system, you can just use it normally. - -set -e -set -x - -here=$(cd `dirname $0`; echo `pwd`) -cores=32 - -if [[ -z "$BUILDTYPE" || -z "$SKIA_OUT" ]]; then - echo "If you're a bot, you should be setting BUILDTYPE ($BUILDTYPE) and SKIA_OUT ($SKIA_OUT)." - echo "If you're not a bot, you don't want to run this script." - exit 1 -fi - -echo "Bootstrapping CMake" -pushd $here/../third_party/externals/cmake -./bootstrap --parallel=$cores -make -j $cores cmake -popd - -echo "Building static library with bootstrapped CMake" -mkdir -p $SKIA_OUT/$BUILDTYPE -pushd $SKIA_OUT/$BUILDTYPE -$here/../third_party/externals/cmake/bin/cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE \ - $here -G Ninja -ninja -popd - -echo "Building shared library with bootstrapped CMake" -mkdir -p $SKIA_OUT/$BUILDTYPE -pushd $SKIA_OUT/$BUILDTYPE -$here/../third_party/externals/cmake/bin/cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=1 \ - $here -G Ninja -ninja -popd |