Merge pull request #2 from SolaceDev/main

Release v1.0.1

README.md

@@ -33,7 +33,7 @@ See the list of [contributors](https://github.com/SolaceProducts/pubsubplus-go-c
 
 This project is licensed under the Apache License, Version 2.0. - See the [LICENSE](LICENSE.txt) file for details.
 
-This project packages and links against a variety of C dependencies, and any usage of this API is subject to the terms and conditions of these dependencies. See [the licenses](./lib/licenses.txt) for details.
+This project packages and links against a variety of C dependencies, and any usage of this API is subject to the terms and conditions of these dependencies. See [the licenses](./internal/ccsmp/lib/licenses.txt) for details.
 
 ## Code of Conduct
 

internal/ccsmp/dummy.go

@@ -0,0 +1,29 @@
+// pubsubplus-go-client
+//
+// Copyright 2021-2022 Solace Corporation. All rights reserved.
+//
+// Licensed 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.
+
+//go:build dummy
+// +build dummy
+
+// dummy.go includes the relevant ccsmp library directories to suport go vendoring.
+// It is excluded from all builds and exists as a workaround for https://github.com/golang/go/issues/26366.
+
+package ccsmp
+
+import (
+	_ "solace.dev/go/messaging/internal/ccsmp/lib/darwin"
+	_ "solace.dev/go/messaging/internal/ccsmp/lib/include/solclient"
+	_ "solace.dev/go/messaging/internal/ccsmp/lib/linux"
+)

internal/ccsmp/includes_darwin.go

@@ -18,7 +18,7 @@ package ccsmp
 
 /*
 // specific flags for darwin static builds in C
-#cgo CFLAGS: -I${SRCDIR}/../../lib/darwin/include
-#cgo LDFLAGS: -L/usr/local/opt/[email protected]/lib ${SRCDIR}/../../lib/darwin/lib/libsolclient.a -lssl -lcrypto -framework Kerberos
+#cgo CFLAGS: -I${SRCDIR}/lib/include
+#cgo LDFLAGS: -L/usr/local/opt/[email protected]/lib ${SRCDIR}/lib/darwin/libsolclient.a -lssl -lcrypto -framework Kerberos
 */
 import "C"

internal/ccsmp/includes_linux.go

@@ -18,8 +18,8 @@ package ccsmp
 
 /*
 // specific flags for linux static builds in C
-#cgo CFLAGS: -I${SRCDIR}/../../lib/linux/include
-#cgo LDFLAGS: ${SRCDIR}/../../lib/linux/lib/libsolclient.a -lm -ldl -lpthread -lrt
+#cgo CFLAGS: -I${SRCDIR}/lib/include
+#cgo LDFLAGS: ${SRCDIR}/lib/linux/libsolclient.a -lm -ldl -lpthread -lrt
 
 #include <dlfcn.h>
 */

internal/ccsmp/lib/darwin/dummy.go

@@ -0,0 +1,22 @@
+// pubsubplus-go-client
+//
+// Copyright 2021-2022 Solace Corporation. All rights reserved.
+//
+// Licensed 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.
+
+//go:build dummy
+// +build dummy
+
+// Package darwin is provided as a workaround for go vendoring and contains no go code.
+// See internal/ccsmp/dummy.go for more information.
+package darwin

internal/ccsmp/lib/include/solclient/dummy.go

@@ -0,0 +1,22 @@
+// pubsubplus-go-client
+//
+// Copyright 2021-2022 Solace Corporation. All rights reserved.
+//
+// Licensed 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.
+
+//go:build dummy
+// +build dummy
+
+// Package solclient is provided as a workaround for go vendoring and contains no go code.
+// See internal/ccsmp/dummy.go for more information.
+package solclient

internal/ccsmp/lib/linux/dummy.go

@@ -0,0 +1,22 @@
+// pubsubplus-go-client
+//
+// Copyright 2021-2022 Solace Corporation. All rights reserved.
+//
+// Licensed 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.
+
+//go:build dummy
+// +build dummy
+
+// Package linux is provided as a workaround for go vendoring and contains no go code.
+// See internal/ccsmp/dummy.go for more information.
+package linux