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/08/30 20:15:25 UTC
[1/2] qpid-proton git commit: NO-JIRA: link go library with
qpid-proton-core, not qpid-proton
Repository: qpid-proton
Updated Branches:
refs/heads/master 759686f1e -> 280614088
NO-JIRA: link go library with qpid-proton-core, not qpid-proton
The go library doesn't need the extras in libqpid-proton
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d0d61a53
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d0d61a53
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d0d61a53
Branch: refs/heads/master
Commit: d0d61a53795b5fd095ddff48d0e941becaccb269
Parents: 759686f
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Aug 30 15:45:16 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Aug 30 15:49:44 2017 -0400
----------------------------------------------------------------------
proton-c/bindings/go/CMakeLists.txt | 1 +
proton-c/bindings/go/src/qpid.apache.org/amqp/doc.go | 2 +-
proton-c/bindings/go/src/qpid.apache.org/electron/doc.go | 2 +-
proton-c/bindings/go/src/qpid.apache.org/proton/doc.go | 2 +-
proton-c/bindings/go/src/qpid.apache.org/proton/error.go | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d0d61a53/proton-c/bindings/go/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/CMakeLists.txt b/proton-c/bindings/go/CMakeLists.txt
index 7f814b9..d29ac06 100644
--- a/proton-c/bindings/go/CMakeLists.txt
+++ b/proton-c/bindings/go/CMakeLists.txt
@@ -63,6 +63,7 @@ add_custom_target(go-build ALL
add_test(
NAME go-test COMMAND ${GO_TEST} qpid.apache.org/...
+ DEPENDS qpid-proton-core
WORKING_DIRECTORY $ENV{PWD})
# Make available to examples/go/CMakeLists
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d0d61a53/proton-c/bindings/go/src/qpid.apache.org/amqp/doc.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/doc.go b/proton-c/bindings/go/src/qpid.apache.org/amqp/doc.go
index 701af55..c04c2b0 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/doc.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/amqp/doc.go
@@ -32,7 +32,7 @@ AMQP 1.0 is an open standard for inter-operable message exchange, see <http://ww
*/
package amqp
-// #cgo LDFLAGS: -lqpid-proton
+// #cgo LDFLAGS: -lqpid-proton-core
import "C"
// This file is just for the package comment.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d0d61a53/proton-c/bindings/go/src/qpid.apache.org/electron/doc.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/electron/doc.go b/proton-c/bindings/go/src/qpid.apache.org/electron/doc.go
index f4baa31..39137c0 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/electron/doc.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/electron/doc.go
@@ -50,7 +50,7 @@ More realistic examples: https://github.com/apache/qpid-proton/blob/master/examp
*/
package electron
-//#cgo LDFLAGS: -lqpid-proton
+//#cgo LDFLAGS: -lqpid-proton-core
import "C"
// Just for package comment
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d0d61a53/proton-c/bindings/go/src/qpid.apache.org/proton/doc.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/proton/doc.go b/proton-c/bindings/go/src/qpid.apache.org/proton/doc.go
index 1049e71..39716e2 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/proton/doc.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/proton/doc.go
@@ -60,7 +60,7 @@ applications.
*/
package proton
-// #cgo LDFLAGS: -lqpid-proton
+// #cgo LDFLAGS: -lqpid-proton-core
import "C"
// This file is just for the package comment.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d0d61a53/proton-c/bindings/go/src/qpid.apache.org/proton/error.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/proton/error.go b/proton-c/bindings/go/src/qpid.apache.org/proton/error.go
index 80d9680..5232fec 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/proton/error.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/proton/error.go
@@ -20,7 +20,7 @@ under the License.
// Internal implementation details - ignore.
package proton
-// #cgo LDFLAGS: -lqpid-proton
+// #cgo LDFLAGS: -lqpid-proton-core
// #include <proton/error.h>
// #include <proton/codec.h>
import "C"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: NO-JIRA: c++ backwards compatible
thread_safe.hpp stub
Posted by ac...@apache.org.
NO-JIRA: c++ backwards compatible thread_safe.hpp stub
Empty file to prevent compile failures for code with #include thread_safe.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/28061408
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/28061408
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/28061408
Branch: refs/heads/master
Commit: 2806140889079fd082a748e56e383bbc7d091f06
Parents: d0d61a5
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Aug 30 16:13:36 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Aug 30 16:15:04 2017 -0400
----------------------------------------------------------------------
.../bindings/cpp/include/proton/thread_safe.hpp | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/28061408/proton-c/bindings/cpp/include/proton/thread_safe.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/thread_safe.hpp b/proton-c/bindings/cpp/include/proton/thread_safe.hpp
new file mode 100644
index 0000000..7fc1bcd
--- /dev/null
+++ b/proton-c/bindings/cpp/include/proton/thread_safe.hpp
@@ -0,0 +1,26 @@
+#ifndef PROTON_THREAD_SAFE_HPP
+#define PROTON_THREAD_SAFE_HPP
+
+/*
+ * 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. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// DEPRECATED: This file is no longer used and will be removed,
+// you should not include it in your code.
+
+#endif // PROTON_THREAD_SAFE_HPP
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org