tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [2/2] tinkerpop git commit: Merge branch 'tp32'
Date Mon, 18 Sep 2017 19:38:23 GMT
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/4105bcc3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4105bcc3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4105bcc3

Branch: refs/heads/master
Commit: 4105bcc3a78d6c93147aaa9b8dcd13b248d275d1
Parents: 36830f4 b2850f3
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Mon Sep 18 15:37:57 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Mon Sep 18 15:37:57 2017 -0400

----------------------------------------------------------------------
 docker/scripts/build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4105bcc3/docker/scripts/build.sh
----------------------------------------------------------------------
diff --cc docker/scripts/build.sh
index 30544ac,5e6e6cd..36d9edf
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -57,19 -57,15 +57,19 @@@ 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
- touch gremlin-dotnet/src/.glv
- touch gremlin-dotnet/test/.glv
+ # touch gremlin-python/.glv
+ # touch gremlin-dotnet/src/.glv
+ # touch gremlin-dotnet/test/.glv
  
  # use a custom maven settings.xml
  if [ -r "settings.xml" ]; then


Mime
View raw message