You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/04/06 11:34:06 UTC
[39/50] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4ae1462a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4ae1462a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4ae1462a
Branch: refs/heads/TINKERPOP-1443
Commit: 4ae1462a09842f2c829742dd2a46330d47591054
Parents: 43c207b a4a646d
Author: Robert Dale <ro...@gmail.com>
Authored: Thu Mar 30 10:36:09 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Thu Mar 30 10:36:09 2017 -0400
----------------------------------------------------------------------
.gitignore | 1 +
docker/scripts/build.sh | 7 +++++++
docs/src/reference/the-graphcomputer.asciidoc | 1 +
3 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ae1462a/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ae1462a/docker/scripts/build.sh
----------------------------------------------------------------------
diff --cc docker/scripts/build.sh
index 980b1db,626c1be..ea3bd19
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -57,18 -57,19 +57,25 @@@ TINKERPOP_BUILD_OPTIONS="
[ -z "${BUILD_JAVA_DOCS}" ] && TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -Dmaven.javadoc.skip=true"
# If the tmpfs (in-memory filesystem exists, use it)
-if [ -d "/usr/src/tinkermem" ]; then
- echo Copying source to in-memory tmpfs
- rsync -a . /usr/src/tinkermem
- cd /usr/src/tinkermem
+TINKERMEM_PATH=$(cd .. ; echo `pwd`/tinkermem)
+if [ -d "${TINKERMEM_PATH}" ]; then
+ echo "Moving source to in-memory tmpfs"
+ rsync --remove-source-files -a . ${TINKERMEM_PATH}
+ cd ..
+ rm -rf ${OLDPWD}
+ ln -s ${TINKERMEM_PATH} ${OLDPWD}
+ cd ${TINKERMEM_PATH}
fi
+touch gremlin-python/.glv
+
+ # use a custom maven settings.xml
+ if [ -r "settings.xml" ]; then
+ echo "Copying settings.xml"
+ mkdir -p ~/.m2
+ cp settings.xml ~/.m2/
+ fi
+
mvn clean install process-resources ${TINKERPOP_BUILD_OPTIONS} || exit 1
[ -z "${BUILD_JAVA_DOCS}" ] || mvn process-resources -Djavadoc || exit 1