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

Unified Diff: third_party/dom_distiller_js/update_domdistiller_js.sh

Issue 987793002: Update DOM Distiller roll script DEPS in out/package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DEPS in all of package Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/dom_distiller_js/update_domdistiller_js.sh
diff --git a/third_party/dom_distiller_js/update_domdistiller_js.sh b/third_party/dom_distiller_js/update_domdistiller_js.sh
index 8fbe7f2243bd1c289459b770eb5f830c5f3ce78d..aff1e1af72a9624da17cade27735facc91751d80 100755
--- a/third_party/dom_distiller_js/update_domdistiller_js.sh
+++ b/third_party/dom_distiller_js/update_domdistiller_js.sh
@@ -24,9 +24,10 @@
rm -rf $tmpdir
mkdir $tmpdir
-
pushd $tmpdir
- git clone https://github.com/chromium/dom-distiller/ .
+
+ git clone https://github.com/chromium/dom-distiller.git
+ pushd dom-distiller
# The new git SHA1 is HEAD or the first command line parameter.
[[ -z "$1" ]] && gitsha_target="HEAD" || gitsha_target="$1"
@@ -52,14 +53,25 @@
echo >> $bugs # add a newline
ant package
- popd
-
- rm -rf $dom_distiller_js_package
- mkdir $dom_distiller_js_package
- cp -rf $tmpdir/out/package/* $dom_distiller_js_package
- git add $dom_distiller_js_package
- cp $tmpdir/LICENSE $dom_distiller_js_path/
+ popd # dom-distiller
+
+ git clone https://github.com/chromium/dom-distiller-package.git $tmpdir/dom-distiller-package
+ rm -rf $tmpdir/dom-distiller-package/*
+ pushd dom-distiller-package
+ cp -r $tmpdir/dom-distiller/out/package/* .
+ git add .
+ if [[ $(git status --short | wc -l) -ne 0 ]]; then
+ git commit -a -m "Package for ${new_gitsha}"
+ git push origin master
+ fi
cjhopman 2015/03/12 02:12:22 Is there a case where i hit the else clause here a
nyquist 2015/03/17 00:46:21 There used to be when only tests where checked out
+ package_gitsha=$(git rev-parse HEAD)
+ popd # dom-distiller-package
+
+ popd # tmpdir
+
+ cp $tmpdir/dom-distiller/LICENSE $dom_distiller_js_path/
sed -i "s/Version: [0-9a-f]*/Version: $new_gitsha/" $readme_chromium
+ sed -i -e "s/\('\/external\/github.com\/chromium\/dom-distiller-package.git' + '@' + '\)\([0-9a-f]\+\)'/\1$package_gitsha'/" DEPS
gen_message () {
echo "Roll DomDistillerJS"

Powered by Google App Engine
This is Rietveld 408576698