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/02/19 19:38:48 UTC
[5/8] incubator-tinkerpop git commit: deactivate Spark plugin for
implementations-neo4j.asciidoc and Neo4j plugin for
implementations-hadoop.asciidoc
deactivate Spark plugin for implementations-neo4j.asciidoc and Neo4j plugin for implementations-hadoop.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e9c6465c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e9c6465c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e9c6465c
Branch: refs/heads/tp31
Commit: e9c6465c9060b2ad4a537bd75ab71c5bae25cf22
Parents: bbf5b3f
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Feb 18 23:53:44 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Feb 18 23:53:44 2016 +0100
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e9c6465c/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index a8bd3e3..fdc4799 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -37,7 +37,7 @@ fi
trap cleanup INT
function cleanup {
- rm -rf ${output}
+ rm -rf ${output} ${CONSOLE_HOME}/.ext
exit 255
}
@@ -57,6 +57,27 @@ if [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
fi
pushd "${CONSOLE_HOME}" > /dev/null
+ doc=`basename ${input} .asciidoc`
+
+ case "${doc}" in
+ "implementations-neo4j")
+ # deactivate Spark plugin to prevent version conflicts between TinkerPop's Spark jars and Neo4j's Spark jars
+ mkdir .ext
+ mv ext/spark-gremlin .ext/
+ cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'SparkGremlinPlugin' > .ext/plugins.txt
+ ;;
+ "implementations-hadoop")
+ # deactivate Neo4j plugin to prevent version conflicts between TinkerPop's Spark jars and Neo4j's Spark jars
+ mkdir .ext
+ mv ext/neo4j-gremlin .ext/
+ cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'Neo4jGremlinPlugin' > .ext/plugins.txt
+ ;;
+ esac
+
+ if [ -d ".ext" ]; then
+ mv .ext/plugins.txt ext/
+ fi
+
awk -f ${AWK_SCRIPTS}/prepare.awk ${input} |
awk -f ${AWK_SCRIPTS}/init-code-blocks.awk |
awk -f ${AWK_SCRIPTS}/progressbar.awk -v tpl=${AWK_SCRIPTS}/progressbar.groovy.template | HADOOP_GREMLIN_LIBS="${CONSOLE_HOME}/ext/giraph-gremlin/lib:${CONSOLE_HOME}/ext/tinkergraph-gremlin/lib" bin/gremlin.sh |
@@ -70,6 +91,12 @@ if [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
[ ${ec} -eq 0 ] || break
done
+ if [ -d ".ext" ]; then
+ mv .ext/plugins.all ext/plugins.txt
+ mv .ext/* ext/
+ rm -r .ext/
+ fi
+
if [ ${ec} -eq 0 ]; then
ec=`grep -c '\bpb([0-9][0-9]*);' ${output}`
fi