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 2015/07/03 15:14:44 UTC
[1/2] incubator-tinkerpop git commit: minor tweaks for the docs
processing / publishing
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 896cdfab2 -> 38ae135e7
minor tweaks for the docs processing / publishing
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fbbd35f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fbbd35f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fbbd35f3
Branch: refs/heads/master
Commit: fbbd35f35bcb757bf2400fc7a0dd94176ab49a48
Parents: d68c09b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Jul 3 15:13:54 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Jul 3 15:13:54 2015 +0200
----------------------------------------------------------------------
bin/process-docs.sh | 4 ++--
bin/publish-docs.sh | 2 +-
docs/preprocessor/preprocess-file.sh | 4 ++++
docs/preprocessor/preprocess.sh | 5 +++++
4 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fbbd35f3/bin/process-docs.sh
----------------------------------------------------------------------
diff --git a/bin/process-docs.sh b/bin/process-docs.sh
index d88da74..39cd8e9 100755
--- a/bin/process-docs.sh
+++ b/bin/process-docs.sh
@@ -29,10 +29,10 @@ function cleanup() {
}
-if [ ! `nc -z localhost 8080` ]; then
+nc -z localhost 8080 || (
bin/gephi-mock.py > /dev/null 2>&1 &
GEPHI_MOCK=$!
-fi
+)
docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc && docs/postprocessor/postprocess.sh
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fbbd35f3/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index 7b42893..7cad91a 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -30,7 +30,7 @@ fi
SVN_CMD="svn --no-auth-cache --username=${USERNAME}"
VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep '<version>' | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
-rm -rf target
+rm -rf target/svn
bin/process-docs.sh
mvn process-resources -Djavadoc
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fbbd35f3/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index fd68687..7a7cfd1 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -70,6 +70,10 @@ if [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
done
if [ ${ec} -eq 0 ]; then
+ ec=`grep -c '\bpb([0-9][0-9]*);' ${output}`
+ fi
+
+ if [ ${ec} -eq 0 ]; then
processed
fi
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fbbd35f3/docs/preprocessor/preprocess.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess.sh b/docs/preprocessor/preprocess.sh
index d1d840d..d1df978 100755
--- a/docs/preprocessor/preprocess.sh
+++ b/docs/preprocessor/preprocess.sh
@@ -36,6 +36,11 @@ do
fi
done
+nc -z localhost 2181 || (
+ echo "ZooKeeper is not running, be sure to start it before processing the docs."
+ exit 1
+)
+
if [ -e /tmp/neo4j ]; then
echo "The directory '/tmp/neo4j' is required by the pre-processor, be sure to delete it before processing the docs."
exit 1
[2/2] incubator-tinkerpop git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Posted by dk...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/38ae135e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/38ae135e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/38ae135e
Branch: refs/heads/master
Commit: 38ae135e7a1bfb40961723b0a22d21bb14b3b4dc
Parents: fbbd35f 896cdfa
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Jul 3 15:14:27 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Jul 3 15:14:27 2015 +0200
----------------------------------------------------------------------
README.asciidoc | 2 +-
docs/src/gremlin-applications.asciidoc | 4 ++--
docs/src/implementations.asciidoc | 2 ++
docs/src/intro.asciidoc | 6 +++---
docs/src/the-graph.asciidoc | 6 ++++--
docs/src/the-traversal.asciidoc | 20 ++++++++++----------
6 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------