tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [05/14] tinkerpop git commit: TINKERPOP-1731 Fix encoding of template CTR
Date Wed, 20 Sep 2017 16:32:20 GMT
TINKERPOP-1731 Fix encoding of template CTR

The template file included BOM bytes which resulted in an invalid csproj file when docker
was used for the build. The template engine still has problems with special characters with
docker, but at least the build works now.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3bf128ae
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3bf128ae
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3bf128ae

Branch: refs/heads/TINKERPOP-1784
Commit: 3bf128ae9f9d6f73675705a958b7b4102572eaaa
Parents: 9402e4e
Author: florianhockmann <fh@florian-hockmann.de>
Authored: Sun Sep 17 16:26:53 2017 +0200
Committer: florianhockmann <fh@florian-hockmann.de>
Committed: Sun Sep 17 16:26:53 2017 +0200

----------------------------------------------------------------------
 docker/scripts/build.sh                           | 6 ++----
 gremlin-dotnet/glv/Gremlin.Net.csproj.template    | 2 +-
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bf128ae/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index dff60b5..bc22de9 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -64,10 +64,8 @@ if [ -d "/usr/src/tinkermem" ]; then
 fi
 
 touch gremlin-python/.glv
-
-# remove these until TINKERPOP-1731 is settled
-rm gremlin-dotnet/src/.glv
-rm gremlin-dotnet/test/.glv
+touch gremlin-dotnet/src/.glv
+touch gremlin-dotnet/test/.glv
 
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bf128ae/gremlin-dotnet/glv/Gremlin.Net.csproj.template
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
index b55eecb..58fad18 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
@@ -1,4 +1,4 @@
-<!--
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bf128ae/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 6fa445d..1b76771 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.


Mime
View raw message