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/05/30 01:21:59 UTC
incubator-tinkerpop git commit: more adjustments for OSX
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/preprocessor ab91eb293 -> ec86c7c2f
more adjustments for OSX
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ec86c7c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ec86c7c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ec86c7c2
Branch: refs/heads/preprocessor
Commit: ec86c7c2feceeb408807efc4f6545ec85bd25a58
Parents: ab91eb2
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sat May 30 01:21:05 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sat May 30 01:21:05 2015 +0200
----------------------------------------------------------------------
docs/preprocessor/preprocess.sh | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ec86c7c2/docs/preprocessor/preprocess.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess.sh b/docs/preprocessor/preprocess.sh
index c83f512..5fc9463 100755
--- a/docs/preprocessor/preprocess.sh
+++ b/docs/preprocessor/preprocess.sh
@@ -43,12 +43,12 @@ cp -R docs/{static,stylesheets} target/postprocess-asciidoc/
TP_HOME=`pwd`
CONSOLE_HOME=`directory "${TP_HOME}/gremlin-console/target/apache-gremlin-console-*-standalone"`
PLUGIN_DIR="${CONSOLE_HOME}/ext"
-TP_VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep -Po '(?<=<version>).*(?=</version>)')
+TP_VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep -o 'version>[^<]*' | grep -o '>.*' | grep -o '[^>]*')
# install Hadoop plugin
hadoopPlugin=$(find . -name "HadoopGremlinPlugin.java")
hadoopPluginName=`echo ${hadoopPlugin} | cut -d '/' -f2`
-hadoopPluginClass=`echo ${hadoopPlugin} | grep -Po '(?<=src/main/java/).*(?=\.java)' | tr '/' '.'`
+hadoopPluginClass=`echo ${hadoopPlugin} | sed -e 's@.*src/main/java/@@' -e 's/\.java$//' | tr '/' '.'`
hadoopPluginDirectory="${PLUGIN_DIR}/${hadoopPluginName}"
match=`grep -c "$hadoopPluginClass" ${PLUGIN_DIR}/plugins.txt`
@@ -68,18 +68,15 @@ if [ ! -z "${hadoopPluginName}" ] && [ ! -d "${hadoopPluginDirectory}" ] && [ ${
rmHadoopPlugin=1
echo -e "\n${hadoopPluginClass}" >> "${PLUGIN_DIR}/plugins.txt"
mkdir -p "${PLUGIN_DIR}/${hadoopPluginName}/"{lib,plugin}
- #cp ${hadoopPluginName}/target/*${TP_VERSION}.jar "${PLUGIN_DIR}/${hadoopPluginName}/lib"
cp ${hadoopPluginName}/target/*${TP_VERSION}.jar "${PLUGIN_DIR}/${hadoopPluginName}/plugin"
libdir=`directory "${hadoopPluginName}/target/*-standalone/lib/"`
if [ -d "${libdir}" ]; then
- #cp ${libdir}/*.jar "${PLUGIN_DIR}/${hadoopPluginName}/lib"
cp ${libdir}/*.jar "${PLUGIN_DIR}/${hadoopPluginName}/plugin"
fi
cp */target/*${TP_VERSION}.jar "${PLUGIN_DIR}/${hadoopPluginName}/lib"
for libdir in $(find . -name lib | grep -v ext); do
cp ${libdir}/*.jar "${PLUGIN_DIR}/${hadoopPluginName}/lib"
done
- #rm -f "${PLUGIN_DIR}/hadoop-gremlin"/*/slf4j-*.jar
rm -f "${PLUGIN_DIR}/hadoop-gremlin"/plugin/slf4j-*.jar
echo "System.exit(0)" > "${PLUGIN_DIR}/${hadoopPluginName}/init.groovy"
${CONSOLE_HOME}/bin/gremlin.sh "${PLUGIN_DIR}/${hadoopPluginName}/init.groovy" > /dev/null 2> /dev/null