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 2016/05/19 21:50:24 UTC
qpid-proton git commit: PROTON-1199: Remove symbolic links used by Go
binding.
Repository: qpid-proton
Updated Branches:
refs/heads/master fa7240ff0 -> b6248ba74
PROTON-1199: Remove symbolic links used by Go binding.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/b6248ba7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/b6248ba7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/b6248ba7
Branch: refs/heads/master
Commit: b6248ba74a99a1201e95f4ac0650032e57cd7997
Parents: fa7240f
Author: Alan Conway <ac...@redhat.com>
Authored: Thu May 19 17:49:18 2016 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu May 19 17:49:18 2016 -0400
----------------------------------------------------------------------
examples/go/electron/broker.go | 2 +-
examples/go/electron/receive.go | 2 +-
examples/go/electron/send.go | 2 +-
examples/go/electron/util | 1 -
examples/go/proton/broker.go | 2 +-
examples/go/proton/util | 1 -
proton-c/bindings/go/CMakeLists.txt | 1 +
proton-c/bindings/go/README.md | 1 -
proton-c/bindings/go/src/qpid.apache.org/amqp/interop | 1 -
proton-c/bindings/go/src/qpid.apache.org/amqp/interop_test.go | 3 ++-
10 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/examples/go/electron/broker.go
----------------------------------------------------------------------
diff --git a/examples/go/electron/broker.go b/examples/go/electron/broker.go
index 9849328..d7aedcc 100644
--- a/examples/go/electron/broker.go
+++ b/examples/go/electron/broker.go
@@ -27,7 +27,7 @@ under the License.
package main
import (
- "./util"
+ "../util"
"flag"
"fmt"
"log"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/examples/go/electron/receive.go
----------------------------------------------------------------------
diff --git a/examples/go/electron/receive.go b/examples/go/electron/receive.go
index d631726..94ee509 100644
--- a/examples/go/electron/receive.go
+++ b/examples/go/electron/receive.go
@@ -20,7 +20,7 @@ under the License.
package main
import (
- "./util"
+ "../util"
"flag"
"fmt"
"log"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/examples/go/electron/send.go
----------------------------------------------------------------------
diff --git a/examples/go/electron/send.go b/examples/go/electron/send.go
index 4c9a0bf..04ec2ef 100644
--- a/examples/go/electron/send.go
+++ b/examples/go/electron/send.go
@@ -20,7 +20,7 @@ under the License.
package main
import (
- "./util"
+ "../util"
"flag"
"fmt"
"log"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/examples/go/electron/util
----------------------------------------------------------------------
diff --git a/examples/go/electron/util b/examples/go/electron/util
deleted file mode 120000
index 40c3fc5..0000000
--- a/examples/go/electron/util
+++ /dev/null
@@ -1 +0,0 @@
-../util
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/examples/go/proton/broker.go
----------------------------------------------------------------------
diff --git a/examples/go/proton/broker.go b/examples/go/proton/broker.go
index 6458665..8f0efda 100644
--- a/examples/go/proton/broker.go
+++ b/examples/go/proton/broker.go
@@ -30,7 +30,7 @@ under the License.
package main
import (
- "./util"
+ "../util"
"flag"
"fmt"
"log"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/examples/go/proton/util
----------------------------------------------------------------------
diff --git a/examples/go/proton/util b/examples/go/proton/util
deleted file mode 120000
index 40c3fc5..0000000
--- a/examples/go/proton/util
+++ /dev/null
@@ -1 +0,0 @@
-../util
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/proton-c/bindings/go/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/CMakeLists.txt b/proton-c/bindings/go/CMakeLists.txt
index 186da3d..269f9bf 100644
--- a/proton-c/bindings/go/CMakeLists.txt
+++ b/proton-c/bindings/go/CMakeLists.txt
@@ -41,6 +41,7 @@ set(GO_ENV ${env_py} --
"GOPATH=${CMAKE_CURRENT_SOURCE_DIR}"
"CGO_CFLAGS=-I${CMAKE_SOURCE_DIR}/proton-c/include -I${CMAKE_BINARY_DIR}/proton-c/include"
"CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/proton-c"
+ "PN_INTEROP_DIR=${CMAKE_SOURCE_DIR}/tests/interop"
CACHE INTERNAL "Run a command with Go environment variables")
set(GO ${GO_ENV} ${GO_EXE} CACHE INTERNAL "Run go with environment set")
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/proton-c/bindings/go/README.md
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/README.md b/proton-c/bindings/go/README.md
deleted file mode 120000
index 38521ba..0000000
--- a/proton-c/bindings/go/README.md
+++ /dev/null
@@ -1 +0,0 @@
-src/qpid.apache.org/README.md
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/proton-c/bindings/go/src/qpid.apache.org/amqp/interop
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/interop b/proton-c/bindings/go/src/qpid.apache.org/amqp/interop
deleted file mode 120000
index ad6fcad..0000000
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/interop
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../tests/interop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6248ba7/proton-c/bindings/go/src/qpid.apache.org/amqp/interop_test.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/interop_test.go b/proton-c/bindings/go/src/qpid.apache.org/amqp/interop_test.go
index b36ef64..d118523 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/interop_test.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/amqp/interop_test.go
@@ -41,7 +41,8 @@ func checkEqual(want interface{}, got interface{}) error {
}
func getReader(name string) (r io.Reader) {
- r, err := os.Open("interop/" + name + ".amqp")
+ dir := os.Getenv("PN_INTEROP_DIR")
+ r, err := os.Open(dir + "/" + name + ".amqp")
if err != nil {
panic(fmt.Errorf("Can't open %#v: %v", name, err))
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org