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

Unified Diff: docs/src/make_docs.sh

Issue 223053002: Have depot_tools manpage generation pin asciidoc version too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: rebase Created 6 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
« no previous file with comments | « docs/src/.gitignore ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/src/make_docs.sh
diff --git a/docs/src/make_docs.sh b/docs/src/make_docs.sh
index 5c0240dd3b4f6789d9b43c4c7ab9ddd74119d1a0..497ed3c8e72da5f075b2b18ddd93fc2f73b678f2 100755
--- a/docs/src/make_docs.sh
+++ b/docs/src/make_docs.sh
@@ -20,7 +20,6 @@ ensure_in_path() {
}
ensure_in_path xmlto
-ensure_in_path asciidoc
DFLT_CATALOG_PATH="/usr/local/etc/xml/catalog"
if [[ ! $XML_CATALOG_FILES && -f "$DFLT_CATALOG_PATH" ]]
@@ -30,10 +29,24 @@ then
echo Using \'$DFLT_CATALOG_PATH\' for \$XML_CATALOG_FILES.
fi
+# We pull asciidoc to get the right version
+BRANCH=8.6.9
+HASH=7fed0aff1b30
ghost stip (do not use) 2014/04/02 23:04:50 ASCIIDOC_HASH?
+if [[ ! -d asciidoc || $(cd asciidoc && hg id -i) != $HASH ]]
+then
+ echo Cloning asciidoc
+ rm -rf asciidoc
+ hg clone -r $BRANCH https://asciidoc.googlecode.com/hg/ asciidoc
+ (cd asciidoc && ln -s asciidoc.py asciidoc)
+fi
+echo Asciidoc up to date at $HASH \($BRANCH\)
+
+export PATH=`pwd`/asciidoc:$PATH
+
# We pull git to get its documentation toolchain
BRANCH=v1.9.0
-GITHASH=5f95c9f850b19b368c43ae399cc831b17a26a5ac
ghost stip (do not use) 2014/04/02 23:04:50 why not leave this at GITHASH
-if [[ ! -d git || $(git -C git rev-parse HEAD) != $GITHASH ]]
+HASH=5f95c9f850b19b368c43ae399cc831b17a26a5ac
+if [[ ! -d git || $(git -C git rev-parse HEAD) != $HASH ]]
then
echo Cloning git
rm -rf git
@@ -93,7 +106,7 @@ wq
EOF
fi
-echo Git up to date at $GITHASH \($BRANCH\)
+echo Git up to date at $HASH \($BRANCH\)
# build directory files for 'essential' and 'helper' sections of the depot_tools
# manpage.
« no previous file with comments | « docs/src/.gitignore ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698