Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Side by Side Diff: update_libvpx.sh

Issue 290653003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« generate_gypi.sh ('K') | « source/libvpx/vpxenc.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash -e 1 #!/bin/bash -e
2 # 2 #
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This tool is used to update libvpx source code with the latest git 7 # This tool is used to update libvpx source code with the latest git
8 # repository. 8 # repository.
9 # 9 #
10 # Make sure you run this in a svn checkout of deps/third_party/libvpx! 10 # Make sure you run this in a svn checkout of deps/third_party/libvpx!
11 11
12 # Usage: 12 # Usage:
13 # 13 #
14 # $ ./update_libvpx.sh [branch | revision | file containing a revision] 14 # $ ./update_libvpx.sh [branch | revision | file or url containing a revision]
15 # When specifying a branch it may be necessary to prefix with origin/ 15 # When specifying a branch it may be necessary to prefix with origin/
16 16
17 # Tools required for running this tool: 17 # Tools required for running this tool:
18 # 18 #
19 # 1. Linux / Mac 19 # 1. Linux / Mac
20 # 2. svn 20 # 2. svn
21 # 3. git 21 # 3. git
22 22
23 export LC_ALL=C 23 export LC_ALL=C
24 24
25 # Location for the remote git repository. 25 # Location for the remote git repository.
26 GIT_REPO="http://git.chromium.org/webm/libvpx.git" 26 GIT_REPO="http://git.chromium.org/webm/libvpx.git"
27 27
28 GIT_BRANCH="origin/master" 28 GIT_BRANCH="origin/master"
29 LIBVPX_SRC_DIR="source/libvpx" 29 LIBVPX_SRC_DIR="source/libvpx"
30 BASE_DIR=`pwd` 30 BASE_DIR=`pwd`
31 31
32 if [ -n "$1" ]; then 32 if [ -n "$1" ]; then
33 GIT_BRANCH="$1" 33 GIT_BRANCH="$1"
34 if [ -f "$1" ]; then 34 if [ -f "$1" ]; then
35 GIT_BRANCH=$(<"$1") 35 GIT_BRANCH=$(<"$1")
36 elif [[ $1 = http* ]]; then
37 GIT_BRANCH=`curl $1`
36 fi 38 fi
37 fi 39 fi
38 40
39 prev_hash="$(egrep "^Commit: [[:alnum:]]" README.chromium | awk '{ print $2 }')" 41 prev_hash="$(egrep "^Commit: [[:alnum:]]" README.chromium | awk '{ print $2 }')"
40 echo "prev_hash:$prev_hash" 42 echo "prev_hash:$prev_hash"
41 43
42 rm -rf $(svn ls $LIBVPX_SRC_DIR) 44 rm -rf $(svn ls $LIBVPX_SRC_DIR)
43 svn update $LIBVPX_SRC_DIR 45 svn update $LIBVPX_SRC_DIR
44 46
45 cd $LIBVPX_SRC_DIR 47 cd $LIBVPX_SRC_DIR
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 # Update SVN with the added and deleted files. 87 # Update SVN with the added and deleted files.
86 echo "$add" | xargs -I {} svn add --parents {} 88 echo "$add" | xargs -I {} svn add --parents {}
87 echo "$delete" | xargs -I {} svn rm {} 89 echo "$delete" | xargs -I {} svn rm {}
88 90
89 # Find empty directories and remove them from SVN. 91 # Find empty directories and remove them from SVN.
90 find . -type d -empty -not -iwholename '*.svn*' -exec svn rm {} \; 92 find . -type d -empty -not -iwholename '*.svn*' -exec svn rm {} \;
91 93
92 chmod 755 build/make/*.sh build/make/*.pl configure 94 chmod 755 build/make/*.sh build/make/*.pl configure
93 95
94 cd $BASE_DIR 96 cd $BASE_DIR
OLDNEW
« generate_gypi.sh ('K') | « source/libvpx/vpxenc.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698