You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/12/04 15:29:19 UTC
qpid-proton git commit: PROTON-1705: [go] output to build tree,
fix .gitignore and config.sh
Repository: qpid-proton
Updated Branches:
refs/heads/master e60e2faeb -> 3fed547e3
PROTON-1705: [go] output to build tree, fix .gitignore and config.sh
- remove .gitignore entries for Go output in source tree
- fix config.sh GOPATH to point to build tree
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3fed547e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3fed547e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3fed547e
Branch: refs/heads/master
Commit: 3fed547e3d4f5ffad4181f82e7b21c3599eb2ed7
Parents: e60e2fa
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Nov 30 17:26:39 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Mon Dec 4 10:27:25 2017 -0500
----------------------------------------------------------------------
.gitignore | 7 -------
config.sh.in | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3fed547e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 58fa003..77eb77d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,16 +31,9 @@ eclipse-classes
# The usual location for proton-c build files
proton-c/build
-# Executables built by go binding tests
-proton-c/bindings/go/bin
-
# Testresults from the jenkins build script
testresults
-# Go binding build output
-/proton-c/bindings/go/pkg
-/proton-c/bindings/go/bin
-
# Python TOX test build output
/proton-c/bindings/python/MANIFEST
/proton-c/bindings/python/build
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3fed547e/config.sh.in
----------------------------------------------------------------------
diff --git a/config.sh.in b/config.sh.in
index 1873cc3..d3f50ff 100755
--- a/config.sh.in
+++ b/config.sh.in
@@ -59,7 +59,7 @@ export RUBYLIB=$RUBY_BINDINGS:$RUBY_SRC/lib:$RUBY_SRC/tests:$RUBY_SRC/spec
export PERL5LIB=$PERL5LIB:$PERL_BINDINGS:$PROTON_HOME/proton-c/bindings/perl/lib
# Go
-export GOPATH="$(merge_paths $PROTON_HOME/proton-c/bindings/go $GOPATH)"
+export GOPATH="$PROTON_BUILD/proton-c/bindings/go"
# Help Go compiler find libraries and include files.
export C_INCLUDE_PATH="$(merge_paths $PROTON_HOME/proton-c/include $PROTON_BUILD/proton-c/include $C_INCLUDE_PATH)"
export LIBRARY_PATH="$(merge_paths $PROTON_BUILD/proton-c $LIBRARY_PATH)"
@@ -73,7 +73,7 @@ export PATH="$(merge_paths $PATH $PROTON_BUILD/tests/tools/apps/c $PROTON_HOME/t
# can the test harness use valgrind?
if [[ -x "$(type -p valgrind)" && "@ENABLE_VALGRIND@" == "ON" ]] ; then
export VALGRIND=$(type -p valgrind)
- export VALGRIND_ARGS=@VALGRIND_OPTIONS@
+ export VALGRIND_ARGS="@VALGRIND_OPTIONS@"
fi
# can the test harness use saslpasswd2?
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org