You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/09/27 17:50:14 UTC
[1/5] tinkerpop git commit: Upload only diffs in `publish-docs.sh`.
Repository: tinkerpop
Updated Branches:
refs/heads/master 6faf9e218 -> dc60e0754
Upload only diffs in `publish-docs.sh`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/86007ee2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/86007ee2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/86007ee2
Branch: refs/heads/master
Commit: 86007ee2029feeaf592b62978e1b3b0f9cfe2ed0
Parents: 4ed0095
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Sep 19 15:20:50 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 20 14:40:24 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.awk | 31 +++++++++++++++++++++++++++++++
bin/publish-docs.sh | 42 +++++++++++++++++++++++++-----------------
2 files changed, 56 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/86007ee2/bin/publish-docs.awk
----------------------------------------------------------------------
diff --git a/bin/publish-docs.awk b/bin/publish-docs.awk
new file mode 100644
index 0000000..d3e0d64
--- /dev/null
+++ b/bin/publish-docs.awk
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# @author Daniel Kuppitz (http://gremlin.guru)
+#
+/^Files / {
+ print "U " gensub("^[^/]*/[^/]*/", "", "g", $2)
+}
+
+/^Only in (java)?docs/ {
+ print "D " gensub(/:$/, "", "g", gensub("^[^/]*/[^/]*/", "", "g", $3)) "/" $4
+}
+
+/^Only in \.\./ {
+ print "A " gensub(/:$/, "", "g", gensub("^[^/]*/[^/]*/[^/]*/", "", "g", $3)) "/" $4
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/86007ee2/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index 23e2d4d..49ed9bd 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -39,25 +39,33 @@ mkdir -p target/svn
${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
@@ -69,8 +77,8 @@ do
${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
-${SVN_CMD} add * --force
${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
popd
[3/5] tinkerpop git commit: Merge branch 'TINKERPOP-927' into tp31
Posted by dk...@apache.org.
Merge branch 'TINKERPOP-927' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/33225c5c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/33225c5c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/33225c5c
Branch: refs/heads/master
Commit: 33225c5c73cdf080afb7f44a17e6798c0f7f059e
Parents: ac55bd0 86007ee
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 27 19:48:22 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 27 19:48:22 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.awk | 31 +++++++++++++++++++++++++++++++
bin/publish-docs.sh | 42 +++++++++++++++++++++++++-----------------
2 files changed, 56 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[4/5] tinkerpop git commit: Merge branch 'TINKERPOP-927-master'
Posted by dk...@apache.org.
Merge branch '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/619aba51
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/619aba51
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/619aba51
Branch: refs/heads/master
Commit: 619aba512525cd499f108c997ae9550a8803a870
Parents: 6faf9e2 8d718bb
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 27 19:49:48 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 27 19:49:48 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.awk | 31 ++++++++++++++++++++++++++++++
bin/publish-docs.sh | 48 +++++++++++++++++++++++++++++------------------
2 files changed, 61 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[5/5] tinkerpop git commit: Merge branch 'tp31'
Posted by dk...@apache.org.
Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dc60e075
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dc60e075
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dc60e075
Branch: refs/heads/master
Commit: dc60e0754166dc843158e28bd4e408ee538dc0d5
Parents: 619aba5 33225c5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 27 19:49:56 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 27 19:49:56 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/5] tinkerpop git commit: Merge branch 'TINKERPOP-927' into
TINKERPOP-927-master
Posted by dk...@apache.org.
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/master
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