Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-927-master [created] 120cef66d
Merge branch 'TINKERPOP-927' into TINKERPOP-927-master Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b20921bd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b20921bd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b20921bd Branch: refs/heads/TINKERPOP-927-master Commit: b20921bd4d42a08db6a182b26dd22e4808d837c2 Parents: 54ed33d 5f2d251 Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Mon Sep 19 17:23:47 2016 +0200 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Mon Sep 19 17:23:47 2016 +0200 ---------------------------------------------------------------------- bin/publish-docs.awk | 31 ++++++++++++++++++++++++++++++ bin/publish-docs.sh | 48 +++++++++++++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b20921bd/bin/publish-docs.sh ---------------------------------------------------------------------- diff --cc bin/publish-docs.sh index 5fa4178,43c2cd5..83c9f43 --- a/bin/publish-docs.sh +++ b/bin/publish-docs.sh @@@ -42,26 -39,46 +42,38 @@@ mkdir -p target/sv ${SVN_CMD} co --depth immediates https://svn.apache.org/repos/asf/tinkerpop/site target/svn pushd target/svn - ${SVN_CMD} update --depth empty "docs/${VERSION}" - ${SVN_CMD} update --depth empty "javadocs/${VERSION}" - ${SVN_CMD} rm "docs/${VERSION}" - ${SVN_CMD} rm "javadocs/${VERSION}" - ${SVN_CMD} commit . -m "Docs for TinkerPop ${VERSION} are being replaced." - popd - mkdir -p "target/svn/docs/${VERSION}" - mkdir -p "target/svn/javadocs/${VERSION}/core" - mkdir -p "target/svn/javadocs/${VERSION}/full" + ${SVN_CMD} update "docs/${VERSION}" + ${SVN_CMD} update "javadocs/${VERSION}" - cp -R target/docs/htmlsingle/. "target/svn/docs/${VERSION}" - cp -R target/site/apidocs/core/. "target/svn/javadocs/${VERSION}/core" - cp -R target/site/apidocs/full/. "target/svn/javadocs/${VERSION}/full" + mkdir -p "docs/${VERSION}" + mkdir -p "javadocs/${VERSION}/core" + mkdir -p "javadocs/${VERSION}/full" - pushd target/svn - rm "docs/${VERSION}/images/tinkerpop3.graffle" - ${SVN_CMD} update --depth empty "docs/${VERSION}" - ${SVN_CMD} update --depth empty "javadocs/${VERSION}" + diff -rq -I '^Last updated' docs/${VERSION}/ ../docs/htmlsingle/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.docs + diff -rq -I 'Generated by javadoc' -I '^<meta name="date"' javadocs/${VERSION}/ ../site/apidocs/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.javadocs + + # copy new / modified files + for file in $(cat ../publish-docs.docs | awk '/^[AU]/ {print $2}' | grep -v '.graffle$') + do + cp "../docs/htmlsingle/${file}" "docs/${VERSION}/${file}" + done + for file in $(cat ../publish-docs.javadocs | awk '/^[AU]/ {print $2}') + do + cp "../site/apidocs/${file}" "javadocs/${VERSION}/${file}" + done + + pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | grep -v '.graffle$' | xargs --no-run-if-empty svn add; popd + pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | xargs --no-run-if-empty svn add; popd + + # delete old files + pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd -pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd - -for dir in "docs" "javadocs" -do - CURRENT=$((${SVN_CMD} list "${dir}" ; ls "${dir}") | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1) ++pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd + - ${SVN_CMD} update --depth empty "${dir}/current" - ${SVN_CMD} rm "${dir}/current" ++CHANGES=$(cat target/publish-docs.*docs | grep -v '.graffle$' | wc -l) + - ${SVN_CMD} update --depth empty "${dir}/${CURRENT}" - ln -s "${CURRENT}" "${dir}/current" - ${SVN_CMD} update --depth empty "${dir}/current" - ${SVN_CMD} add "${dir}/current" -done ++if [ ${CHANGES} -gt 0 ]; then ++ ${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}" ++fi - ${SVN_CMD} add * --force --${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}" popd
