You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/06/01 19:25:19 UTC
incubator-tinkerpop git commit: worked with @dkuppitz to get his
preprocess.sh script working on MacOSX.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/preprocessor ec86c7c2f -> 130d94556
worked with @dkuppitz to get his preprocess.sh script working on MacOSX.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/130d9455
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/130d9455
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/130d9455
Branch: refs/heads/preprocessor
Commit: 130d94556e252bc7bb32247e9e3f7cdf362f7f2a
Parents: ec86c7c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jun 1 11:25:14 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jun 1 11:25:14 2015 -0600
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 2 +-
docs/preprocessor/preprocess.sh | 2 +-
docs/preprocessor/processor.groovy | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/130d9455/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index 5dd21c8..0bb621d 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -33,7 +33,7 @@ if [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
bin/gremlin.sh -e ${TP_HOME}/docs/preprocessor/processor.groovy ${input} > ${input}.groovy
ec=${PIPESTATUS[0]}
if [ ${ec} -eq 0 ]; then
- HADOOP_GREMLIN_LIBS="${CONSOLE_HOME}/ext/hadoop-gremlin/lib" bin/gremlin.sh ${input}.groovy | awk 'BEGIN {b=1} /\1IGNORE/ {b=!b} !/\1IGNORE/ {if(a&&b)print} /\1START/ {a=1}' | grep -v '^WARN ' | sed 's/^==>\x01//' > ${output}
+ HADOOP_GREMLIN_LIBS="${CONSOLE_HOME}/ext/hadoop-gremlin/lib" bin/gremlin.sh ${input}.groovy | awk 'BEGIN {b=1} /¶IGNORE/ {b=!b} !/¶IGNORE/ {if(a&&b)print} /¶START/ {a=1}' | grep -v '^WARN ' | sed 's/^==>¶//' > ${output}
ec=${PIPESTATUS[0]}
rm -f ${input}.groovy
fi
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/130d9455/docs/preprocessor/preprocess.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess.sh b/docs/preprocessor/preprocess.sh
index 5fc9463..66f3367 100755
--- a/docs/preprocessor/preprocess.sh
+++ b/docs/preprocessor/preprocess.sh
@@ -86,7 +86,7 @@ fi
cp ${TP_HOME}/hadoop-gremlin/conf/* "${CONSOLE_HOME}/conf/"
# process *.asciidoc files
-find "${TP_HOME}/docs/src/" -name "*.asciidoc" | xargs -n1 -P8 "${TP_HOME}/docs/preprocessor/preprocess-file.sh" "${CONSOLE_HOME}"
+find "${TP_HOME}/docs/src/" -name "*.asciidoc" | xargs -n1 -P4 "${TP_HOME}/docs/preprocessor/preprocess-file.sh" "${CONSOLE_HOME}"
cleanup
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/130d9455/docs/preprocessor/processor.groovy
----------------------------------------------------------------------
diff --git a/docs/preprocessor/processor.groovy b/docs/preprocessor/processor.groovy
index a33c42a..37b88ab 100644
--- a/docs/preprocessor/processor.groovy
+++ b/docs/preprocessor/processor.groovy
@@ -51,7 +51,7 @@ format = { def codeLine ->
}
stringify = { def string ->
- "\"\1" + string.replaceAll("\\\\", "\\\\\\\\").replaceAll(/"/, "\\\\\"").replaceAll(/\$/, "\\\\\\\$") + "\""
+ "\"¶" + string.replaceAll("\\\\", "\\\\\\\\").replaceAll(/"/, "\\\\\"").replaceAll(/\$/, "\\\\\\\$") + "\""
}
//println "try {"