Skip to content

Commit ccfa57e

Browse files
parrobeparrobe
authored
Merge pull request #59 from ibm-messaging/dev91
Dev91
2 parents 1b2a2ad + b8de948 commit ccfa57e

19 files changed

+58
-44
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changelog
2+
## August 2018
3+
* Added V9.1 constant definitions
4+
* Updated build comments
25

36
## May 2018
47

@@ -94,4 +97,4 @@
9497

9598
## 08 Jul 2016
9699

97-
* Initial release
100+
* Initial release

‎README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The ibmmq directory contains a Go package, exposing an MQI-like interface.
1919

2020
The intention is to give an API that is more natural for Go programmers than the common procedural MQI. For example, fixed length string arrays from the C API such as MQCHAR48 are represented by the native Go string type. Conversion between these types is handled within the ibmmq package itself, removing the need for Go programmers to know about it.
2121

22-
A short program in the mqitest directory gives an example of using this interface, to put and get messages and to subscribe to a topic.
22+
A short program in the samples/mqitest directory gives an example of using this interface, to put and get messages and to subscribe to a topic.
2323

2424
Feedback on the utility of this package, thoughts about whether it should be changed or extended are welcomed.
2525

@@ -66,7 +66,6 @@ If you are unfamiliar with Go, the following steps can help create a working env
6666

6767
* The `CGO_LDFLAGS_ALLOW` variable is not needed on Windows
6868
* Install the git client
69-
* Make sure the MQ include files and libraries are in a path that does not include spaces or other special characters, as discussed above.
7069

7170
### Common
7271

@@ -114,4 +113,4 @@ you accept the terms in the CLA.
114113

115114
## Copyright
116115

117-
© Copyright IBM Corporation 2016, 2018
116+
© Copyright IBM Corporation 2016, 2018

‎ibmmq/cmqc_linux.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package ibmmq
1414
* for each value; those can be found in other header files such as
1515
* cmqc.h.
1616
****************************************************************
17-
* Copyright (c) IBM Corporation 1993, 2017
17+
* Copyright (c) IBM Corporation 1993, 2018
1818
*
1919
* Licensed under the Apache License, Version 2.0 (the "License");
2020
* you may not use this file except in compliance with the License.
@@ -25,13 +25,14 @@ package ibmmq
2525
* Unless required by applicable law or agreed to in writing, software
2626
* distributed under the License is distributed on an "AS IS" BASIS,
2727
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
28-
* See the License for the specific
28+
* See the License for the specific language governing permissions and
29+
* limitations under the License.
2930
*
3031
****************************************************************
3132
*
3233
* <BEGIN_BUILDINFO>
33-
* Generated on: 04/03/18 12:08
34-
* Build Level: rockall-20180304-120825-MQ90XHDR
34+
* Generated on: 30/07/18 13:07
35+
* Build Level: rockall-20180730-130655-MQ9XXHDR
3536
* Build Type: Production
3637
* Pointer Size: 64 Bit
3738
* <END_BUILDINFO>
@@ -980,7 +981,7 @@ var (
980981
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
981982
MQCMDI_SEC_TIMER_ZERO int32 = 14
982983
MQCMDI_SEC_UPPERCASE int32 = 21
983-
MQCMDL_CURRENT_LEVEL int32 = 905
984+
MQCMDL_CURRENT_LEVEL int32 = 910
984985
MQCMDL_LEVEL_1 int32 = 100
985986
MQCMDL_LEVEL_101 int32 = 101
986987
MQCMDL_LEVEL_110 int32 = 110
@@ -1015,6 +1016,7 @@ var (
10151016
MQCMDL_LEVEL_903 int32 = 903
10161017
MQCMDL_LEVEL_904 int32 = 904
10171018
MQCMDL_LEVEL_905 int32 = 905
1019+
MQCMDL_LEVEL_910 int32 = 910
10181020
MQCMD_ACCOUNTING_MQI int32 = 167
10191021
MQCMD_ACCOUNTING_Q int32 = 168
10201022
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1080,7 +1082,6 @@ var (
10801082
MQCMD_DELETE_BUFFER_POOL int32 = 157
10811083
MQCMD_DELETE_CF_STRUC int32 = 112
10821084
MQCMD_DELETE_CHANNEL int32 = 24
1083-
MQCMD_DELETE_CLIENTQMGRITEM int32 = 211
10841085
MQCMD_DELETE_COMM_INFO int32 = 194
10851086
MQCMD_DELETE_LISTENER int32 = 96
10861087
MQCMD_DELETE_NAMELIST int32 = 35
@@ -1110,7 +1111,6 @@ var (
11101111
MQCMD_INQUIRE_CHANNEL_NAMES int32 = 20
11111112
MQCMD_INQUIRE_CHANNEL_STATUS int32 = 42
11121113
MQCMD_INQUIRE_CHLAUTH_RECS int32 = 204
1113-
MQCMD_INQUIRE_CLIENTQMGRITEM int32 = 212
11141114
MQCMD_INQUIRE_CLUSTER_Q_MGR int32 = 70
11151115
MQCMD_INQUIRE_CMD_SERVER int32 = 117
11161116
MQCMD_INQUIRE_COMM_INFO int32 = 191
@@ -1149,7 +1149,6 @@ var (
11491149
MQCMD_INQUIRE_TRACE int32 = 125
11501150
MQCMD_INQUIRE_USAGE int32 = 126
11511151
MQCMD_INQUIRE_XR_CAPABILITY int32 = 214
1152-
MQCMD_INSERT_CLIENTQMGRITEM int32 = 210
11531152
MQCMD_LOGGER_EVENT int32 = 91
11541153
MQCMD_MOVE_Q int32 = 127
11551154
MQCMD_MQXR_DIAGNOSTICS int32 = 196
@@ -3945,6 +3944,7 @@ var (
39453944
MQRC_SUBSCRIPTION_REFRESH int32 = 2582
39463945
MQRC_SUB_ALREADY_EXISTS int32 = 2432
39473946
MQRC_SUB_INHIBITED int32 = 2503
3947+
MQRC_SUB_JOIN_NOT_ALTERABLE int32 = 29440
39483948
MQRC_SUB_NAME_ERROR int32 = 2440
39493949
MQRC_SUB_USER_DATA_ERROR int32 = 2431
39503950
MQRC_SUITE_B_ERROR int32 = 2592

‎ibmmq/cmqc_windows.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package ibmmq
1414
* for each value; those can be found in other header files such as
1515
* cmqc.h.
1616
****************************************************************
17-
* Copyright (c) IBM Corporation 1993, 2017
17+
* Copyright (c) IBM Corporation 1993, 2018
1818
*
1919
* Licensed under the Apache License, Version 2.0 (the "License");
2020
* you may not use this file except in compliance with the License.
@@ -25,13 +25,14 @@ package ibmmq
2525
* Unless required by applicable law or agreed to in writing, software
2626
* distributed under the License is distributed on an "AS IS" BASIS,
2727
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
28-
* See the License for the specific
28+
* See the License for the specific language governing permissions and
29+
* limitations under the License.
2930
*
3031
****************************************************************
3132
*
3233
* <BEGIN_BUILDINFO>
33-
* Generated on: 04/03/18 12:08
34-
* Build Level: rockall-20180304-120825-MQ90XHDR
34+
* Generated on: 30/07/18 13:07
35+
* Build Level: rockall-20180730-130655-MQ9XXHDR
3536
* Build Type: Production
3637
* Pointer Size: 64 Bit
3738
* <END_BUILDINFO>
@@ -980,7 +981,7 @@ var (
980981
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
981982
MQCMDI_SEC_TIMER_ZERO int32 = 14
982983
MQCMDI_SEC_UPPERCASE int32 = 21
983-
MQCMDL_CURRENT_LEVEL int32 = 905
984+
MQCMDL_CURRENT_LEVEL int32 = 910
984985
MQCMDL_LEVEL_1 int32 = 100
985986
MQCMDL_LEVEL_101 int32 = 101
986987
MQCMDL_LEVEL_110 int32 = 110
@@ -1015,6 +1016,7 @@ var (
10151016
MQCMDL_LEVEL_903 int32 = 903
10161017
MQCMDL_LEVEL_904 int32 = 904
10171018
MQCMDL_LEVEL_905 int32 = 905
1019+
MQCMDL_LEVEL_910 int32 = 910
10181020
MQCMD_ACCOUNTING_MQI int32 = 167
10191021
MQCMD_ACCOUNTING_Q int32 = 168
10201022
MQCMD_ACTIVITY_MSG int32 = 69
@@ -3942,6 +3944,7 @@ var (
39423944
MQRC_SUBSCRIPTION_REFRESH int32 = 2582
39433945
MQRC_SUB_ALREADY_EXISTS int32 = 2432
39443946
MQRC_SUB_INHIBITED int32 = 2503
3947+
MQRC_SUB_JOIN_NOT_ALTERABLE int32 = 29440
39453948
MQRC_SUB_NAME_ERROR int32 = 2440
39463949
MQRC_SUB_USER_DATA_ERROR int32 = 2431
39473950
MQRC_SUITE_B_ERROR int32 = 2592

‎ibmmq/mqi.go

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@ type is returned containing the MQCC/MQRC values as
1414
a formatted string. Use mqreturn:= err(*ibmmq.MQReturn) to access
1515
the particular MQRC or MQCC values.
1616
17-
The build directives for Windows assume the header and library files have
18-
been copied to a temporary location, because the default paths are not
19-
acceptable to Go (it does not like spaces or special characters like ~).
20-
Note: This problem appears to have been fixed in Go 1.9, and once that
21-
is fully available, the directives will be changed to a more reasonable
22-
path in this file. For example
23-
cgo windows CFLAGS -I"c:/Program Files/IBM/MQ/tools/c/include" -m64
24-
25-
The build directives for Linux assume the default MQ installation path
26-
in /opt/mqm. These would need to be changed in this file if you use a
17+
The build directives assume the default MQ installation path
18+
which is in /opt/mqm (Linux) and c:\Program Files\IBM\MQ (Windows).
19+
These would need to be changed in this file if you use a
2720
non-default path.
2821
*/
2922
package ibmmq
@@ -40,16 +33,18 @@ package ibmmq
4033
Unless required by applicable law or agreed to in writing, software
4134
distributed under the License is distributed on an "AS IS" BASIS,
4235
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
43-
See the License for the specific
36+
See the License for the specific language governing permissions and
37+
limitations under the License.
4438
4539
Contributors:
4640
Mark Taylor - Initial Contribution
4741
*/
4842

4943
/*
5044
#cgo !windows CFLAGS: -I/opt/mqm/inc -D_REENTRANT
51-
#cgo windows CFLAGS: -I"C:/Program Files/IBM/MQ/Tools/c/include"
52-
#cgo !windows LDFLAGS: -L/opt/mqm/lib64 -lmqm_r -Wl,-rpath=/opt/mqm/lib64 -Wl,-rpath=/usr/lib64
45+
#cgo windows CFLAGS: -I"C:/Program Files/IBM/MQ/Tools/c/include"
46+
#cgo !windows,!darwin LDFLAGS: -L/opt/mqm/lib64 -lmqm_r -Wl,-rpath=/opt/mqm/lib64 -Wl,-rpath=/usr/lib64
47+
#cgo darwin LDFLAGS: -L/opt/mqm/lib64 -lmqm_r -Wl,-rpath,/opt/mqm/lib64 -Wl,-rpath=/usr/lib64
5348
#cgo windows LDFLAGS: -L "C:/Program Files/IBM/MQ/bin64" -lmqm
5449
5550
#include <stdlib.h>

‎ibmmq/mqiMQCD.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ package ibmmq
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
1414
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
1718
Contributors:
1819
Mark Taylor - Initial Contribution

‎ibmmq/mqiMQCNO.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ package ibmmq
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
1414
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
1718
Contributors:
1819
Mark Taylor - Initial Contribution

‎ibmmq/mqiMQGMO.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ package ibmmq
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
1414
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
1718
Contributors:
1819
Mark Taylor - Initial Contribution

‎ibmmq/mqiMQMD.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ package ibmmq
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
1414
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
1718
Contributors:
1819
Mark Taylor - Initial Contribution

‎ibmmq/mqiMQOD.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ package ibmmq
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
1414
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
1718
Contributors:
1819
Mark Taylor - Initial Contribution

0 commit comments

Comments
 (0)