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

Side by Side Diff: update_libvpx.sh

Issue 232133009: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 8 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
« no previous file with comments | « source/libvpx/y4minput.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!
(...skipping 14 matching lines...) Expand all
25 GIT_REPO="http://git.chromium.org/webm/libvpx.git" 25 GIT_REPO="http://git.chromium.org/webm/libvpx.git"
26 26
27 GIT_BRANCH="master" 27 GIT_BRANCH="master"
28 LIBVPX_SRC_DIR="source/libvpx" 28 LIBVPX_SRC_DIR="source/libvpx"
29 BASE_DIR=`pwd` 29 BASE_DIR=`pwd`
30 30
31 if [ -n "$1" ]; then 31 if [ -n "$1" ]; then
32 GIT_BRANCH="$1" 32 GIT_BRANCH="$1"
33 fi 33 fi
34 34
35 prev_hash="$(egrep "Commit: [a-Z0-9]" README.chromium | awk '{ print $2 }')" 35 prev_hash="$(egrep "^Commit: [[:alnum:]]" README.chromium | awk '{ print $2 }')"
36 echo "prev_hash:$prev_hash" 36 echo "prev_hash:$prev_hash"
37 37
38 rm -rf $(svn ls $LIBVPX_SRC_DIR) 38 rm -rf $(svn ls $LIBVPX_SRC_DIR)
39 svn update $LIBVPX_SRC_DIR 39 svn update $LIBVPX_SRC_DIR
40 40
41 cd $LIBVPX_SRC_DIR 41 cd $LIBVPX_SRC_DIR
42 42
43 # Make sure git doesn't mess up with svn. 43 # Make sure git doesn't mess up with svn.
44 echo ".svn" >> .gitignore 44 echo ".svn" >> .gitignore
45 45
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 # Update SVN with the added and deleted files. 78 # Update SVN with the added and deleted files.
79 echo "$add" | xargs -I {} svn add --parents {} 79 echo "$add" | xargs -I {} svn add --parents {}
80 echo "$delete" | xargs -I {} svn rm {} 80 echo "$delete" | xargs -I {} svn rm {}
81 81
82 # Find empty directories and remove them from SVN. 82 # Find empty directories and remove them from SVN.
83 find . -type d -empty -not -iwholename '*.svn*' -exec svn rm {} \; 83 find . -type d -empty -not -iwholename '*.svn*' -exec svn rm {} \;
84 84
85 chmod 755 build/make/*.sh build/make/*.pl configure 85 chmod 755 build/make/*.sh build/make/*.pl configure
86 86
87 cd $BASE_DIR 87 cd $BASE_DIR
OLDNEW
« no previous file with comments | « source/libvpx/y4minput.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698