From 8fc729f8a2185505803c7c3d5ea418bb654d0161 Mon Sep 17 00:00:00 2001 From: "rmistry@google.com" Date: Wed, 1 May 2013 14:47:03 +0000 Subject: [PATCH] Housekeeper should not fail when skia-autogen is reset. Created to fix https://code.google.com/p/skia/issues/detail?id=1269 : UpdateDoxygen and UploadDoxygen steps fail when skia-autogen repository is reset. (SkipBuildbotRuns) R=borenet@google.com Review URL: https://codereview.chromium.org/14772003 git-svn-id: http://skia.googlecode.com/svn/trunk@8935 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools/update-doxygen.sh | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/update-doxygen.sh b/tools/update-doxygen.sh index 5351659..348f98f 100755 --- a/tools/update-doxygen.sh +++ b/tools/update-doxygen.sh @@ -13,6 +13,16 @@ # export DOXYGEN_COMMIT=false # bash update-doxygen.sh +function check_out_docs { + svn checkout https://skia-autogen.googlecode.com/svn/docs # writeable + ret_code=$? + if [ $ret_code != 0 ]; then + # docs directory does not exist, skia-autogen must have been reset. + # Create a non svn docs directory instead. + mkdir docs + fi +} + # Prepare a temporary dir and check out Skia trunk and docs. cd DOXYGEN_TEMPDIR=${DOXYGEN_TEMPDIR:-/tmp/skia-doxygen} @@ -28,12 +38,20 @@ else fi if [ -d "docs" ]; then svn update --accept theirs-full docs + svn info docs + ret_code=$? + if [ $ret_code != 0 ]; then + # This is not a valid SVN checkout. + rm -rf docs + check_out_docs + fi else - svn checkout https://skia-autogen.googlecode.com/svn/docs # writeable + check_out_docs +fi + if [ ! -f "docs/static_footer.txt" ]; then cp trunk/tools/doxygen_footer.txt docs/static_footer.txt fi -fi # Run Doxygen. cd trunk -- 2.7.4