You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/09/28 16:57:00 UTC
[02/44] tinkerpop git commit: Merge branch 'TINKERPOP-927' into
TINKERPOP-927-master
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/8d718bb2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8d718bb2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8d718bb2
Branch: refs/heads/TINKERPOP-944
Commit: 8d718bb2ea16a8f8f4f3ca5f72b932445564229a
Parents: 54ed33d 86007ee
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 20 14:53:52 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 20 14:53:52 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/8d718bb2/bin/publish-docs.sh
----------------------------------------------------------------------
diff --cc bin/publish-docs.sh
index 5fa4178,49ed9bd..1c374da
--- 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.javadocs | 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.javadocs | 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)
-
- ${SVN_CMD} update --depth empty "${dir}/current"
- ${SVN_CMD} rm "${dir}/current"
++CHANGES=$(cat ../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