Merge pull request #59 from ibm-messaging/dev91

Dev91

Author: parrobe

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## August 2018
+* Added V9.1 constant definitions
+* Updated build comments
 
 ## May 2018
 
@@ -94,4 +97,4 @@
 
 ## 08 Jul 2016
 
-* Initial release
+* Initial release

README.md

@@ -19,7 +19,7 @@ The ibmmq directory contains a Go package, exposing an MQI-like interface.
 
 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.
 
-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.
+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.
 
 Feedback on the utility of this package, thoughts about whether it should be changed or extended are welcomed.
 
@@ -66,7 +66,6 @@ If you are unfamiliar with Go, the following steps can help create a working env
 
 * The `CGO_LDFLAGS_ALLOW` variable is not needed on Windows
 * Install the git client
-* Make sure the MQ include files and libraries are in a path that does not include spaces or other special characters, as discussed above.
 
 ### Common
 
@@ -114,4 +113,4 @@ you accept the terms in the CLA.
 
 ## Copyright
 
-© Copyright IBM Corporation 2016, 2018
+© Copyright IBM Corporation 2016, 2018

ibmmq/cmqc_linux.go

@@ -14,7 +14,7 @@ package ibmmq
 * for each value; those can be found in other header files such as
 * cmqc.h.
 ****************************************************************
-* Copyright (c) IBM Corporation 1993, 2017
+* Copyright (c) IBM Corporation 1993, 2018
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,13 +25,14 @@ package ibmmq
 * 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
+* See the License for the specific language governing permissions and
+* limitations under the License.
 *
 ****************************************************************
 *
 *  <BEGIN_BUILDINFO>
-*  Generated on:  04/03/18 12:08
-*  Build Level:   rockall-20180304-120825-MQ90XHDR
+*  Generated on:  30/07/18 13:07
+*  Build Level:   rockall-20180730-130655-MQ9XXHDR
 *  Build Type:    Production
 *  Pointer Size:  64 Bit
 *  <END_BUILDINFO>
@@ -980,7 +981,7 @@ var (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32 = 17
 	MQCMDI_SEC_TIMER_ZERO          int32 = 14
 	MQCMDI_SEC_UPPERCASE           int32 = 21
-	MQCMDL_CURRENT_LEVEL           int32 = 905
+	MQCMDL_CURRENT_LEVEL           int32 = 910
 	MQCMDL_LEVEL_1                 int32 = 100
 	MQCMDL_LEVEL_101               int32 = 101
 	MQCMDL_LEVEL_110               int32 = 110
@@ -1015,6 +1016,7 @@ var (
 	MQCMDL_LEVEL_903               int32 = 903
 	MQCMDL_LEVEL_904               int32 = 904
 	MQCMDL_LEVEL_905               int32 = 905
+	MQCMDL_LEVEL_910               int32 = 910
 	MQCMD_ACCOUNTING_MQI           int32 = 167
 	MQCMD_ACCOUNTING_Q             int32 = 168
 	MQCMD_ACTIVITY_MSG             int32 = 69
@@ -1080,7 +1082,6 @@ var (
 	MQCMD_DELETE_BUFFER_POOL       int32 = 157
 	MQCMD_DELETE_CF_STRUC          int32 = 112
 	MQCMD_DELETE_CHANNEL           int32 = 24
-	MQCMD_DELETE_CLIENTQMGRITEM    int32 = 211
 	MQCMD_DELETE_COMM_INFO         int32 = 194
 	MQCMD_DELETE_LISTENER          int32 = 96
 	MQCMD_DELETE_NAMELIST          int32 = 35
@@ -1110,7 +1111,6 @@ var (
 	MQCMD_INQUIRE_CHANNEL_NAMES    int32 = 20
 	MQCMD_INQUIRE_CHANNEL_STATUS   int32 = 42
 	MQCMD_INQUIRE_CHLAUTH_RECS     int32 = 204
-	MQCMD_INQUIRE_CLIENTQMGRITEM   int32 = 212
 	MQCMD_INQUIRE_CLUSTER_Q_MGR    int32 = 70
 	MQCMD_INQUIRE_CMD_SERVER       int32 = 117
 	MQCMD_INQUIRE_COMM_INFO        int32 = 191
@@ -1149,7 +1149,6 @@ var (
 	MQCMD_INQUIRE_TRACE            int32 = 125
 	MQCMD_INQUIRE_USAGE            int32 = 126
 	MQCMD_INQUIRE_XR_CAPABILITY    int32 = 214
-	MQCMD_INSERT_CLIENTQMGRITEM    int32 = 210
 	MQCMD_LOGGER_EVENT             int32 = 91
 	MQCMD_MOVE_Q                   int32 = 127
 	MQCMD_MQXR_DIAGNOSTICS         int32 = 196
@@ -3945,6 +3944,7 @@ var (
 	MQRC_SUBSCRIPTION_REFRESH      int32 = 2582
 	MQRC_SUB_ALREADY_EXISTS        int32 = 2432
 	MQRC_SUB_INHIBITED             int32 = 2503
+	MQRC_SUB_JOIN_NOT_ALTERABLE    int32 = 29440
 	MQRC_SUB_NAME_ERROR            int32 = 2440
 	MQRC_SUB_USER_DATA_ERROR       int32 = 2431
 	MQRC_SUITE_B_ERROR             int32 = 2592

ibmmq/cmqc_windows.go

@@ -14,7 +14,7 @@ package ibmmq
 * for each value; those can be found in other header files such as
 * cmqc.h.
 ****************************************************************
-* Copyright (c) IBM Corporation 1993, 2017
+* Copyright (c) IBM Corporation 1993, 2018
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,13 +25,14 @@ package ibmmq
 * 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
+* See the License for the specific language governing permissions and
+* limitations under the License.
 *
 ****************************************************************
 *
 *  <BEGIN_BUILDINFO>
-*  Generated on:  04/03/18 12:08
-*  Build Level:   rockall-20180304-120825-MQ90XHDR
+*  Generated on:  30/07/18 13:07
+*  Build Level:   rockall-20180730-130655-MQ9XXHDR
 *  Build Type:    Production
 *  Pointer Size:  64 Bit
 *  <END_BUILDINFO>
@@ -980,7 +981,7 @@ var (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32 = 17
 	MQCMDI_SEC_TIMER_ZERO          int32 = 14
 	MQCMDI_SEC_UPPERCASE           int32 = 21
-	MQCMDL_CURRENT_LEVEL           int32 = 905
+	MQCMDL_CURRENT_LEVEL           int32 = 910
 	MQCMDL_LEVEL_1                 int32 = 100
 	MQCMDL_LEVEL_101               int32 = 101
 	MQCMDL_LEVEL_110               int32 = 110
@@ -1015,6 +1016,7 @@ var (
 	MQCMDL_LEVEL_903               int32 = 903
 	MQCMDL_LEVEL_904               int32 = 904
 	MQCMDL_LEVEL_905               int32 = 905
+	MQCMDL_LEVEL_910               int32 = 910
 	MQCMD_ACCOUNTING_MQI           int32 = 167
 	MQCMD_ACCOUNTING_Q             int32 = 168
 	MQCMD_ACTIVITY_MSG             int32 = 69
@@ -3942,6 +3944,7 @@ var (
 	MQRC_SUBSCRIPTION_REFRESH      int32 = 2582
 	MQRC_SUB_ALREADY_EXISTS        int32 = 2432
 	MQRC_SUB_INHIBITED             int32 = 2503
+	MQRC_SUB_JOIN_NOT_ALTERABLE    int32 = 29440
 	MQRC_SUB_NAME_ERROR            int32 = 2440
 	MQRC_SUB_USER_DATA_ERROR       int32 = 2431
 	MQRC_SUITE_B_ERROR             int32 = 2592

ibmmq/mqi.go

@@ -14,16 +14,9 @@ type is returned containing the MQCC/MQRC values as
 a formatted string. Use mqreturn:= err(*ibmmq.MQReturn) to access
 the particular MQRC or MQCC values.
 
-The build directives for Windows assume the header and library files have
-been copied to a temporary location, because the default paths are not
-acceptable to Go (it does not like spaces or special characters like ~).
-Note: This problem appears to have been fixed in Go 1.9, and once that
-is fully available, the directives will be changed to a more reasonable
-path in this file. For example
-    cgo windows CFLAGS -I"c:/Program Files/IBM/MQ/tools/c/include" -m64
-
-The build directives for Linux assume the default MQ installation path
-in /opt/mqm. These would need to be changed in this file if you use a
+The build directives assume the default MQ installation path
+which is in /opt/mqm (Linux) and c:\Program Files\IBM\MQ (Windows).
+These would need to be changed in this file if you use a
 non-default path.
 */
 package ibmmq
@@ -40,16 +33,18 @@ package ibmmq
   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
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
    Contributors:
      Mark Taylor - Initial Contribution
 */
 
 /*
 #cgo !windows CFLAGS: -I/opt/mqm/inc -D_REENTRANT
-#cgo windows CFLAGS:  -I"C:/Program Files/IBM/MQ/Tools/c/include"
-#cgo !windows LDFLAGS: -L/opt/mqm/lib64 -lmqm_r -Wl,-rpath=/opt/mqm/lib64 -Wl,-rpath=/usr/lib64
+#cgo  windows CFLAGS:  -I"C:/Program Files/IBM/MQ/Tools/c/include"
+#cgo !windows,!darwin LDFLAGS: -L/opt/mqm/lib64 -lmqm_r -Wl,-rpath=/opt/mqm/lib64 -Wl,-rpath=/usr/lib64
+#cgo darwin   LDFLAGS: -L/opt/mqm/lib64 -lmqm_r -Wl,-rpath,/opt/mqm/lib64 -Wl,-rpath=/usr/lib64
 #cgo windows LDFLAGS: -L "C:/Program Files/IBM/MQ/bin64" -lmqm
 
 #include <stdlib.h>

ibmmq/mqiMQCD.go

@@ -12,7 +12,8 @@ package ibmmq
   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
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
    Contributors:
      Mark Taylor - Initial Contribution

ibmmq/mqiMQCNO.go

@@ -12,7 +12,8 @@ package ibmmq
   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
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
    Contributors:
      Mark Taylor - Initial Contribution

ibmmq/mqiMQGMO.go

@@ -12,7 +12,8 @@ package ibmmq
   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
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
    Contributors:
      Mark Taylor - Initial Contribution

ibmmq/mqiMQMD.go

@@ -12,7 +12,8 @@ package ibmmq
   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
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
    Contributors:
      Mark Taylor - Initial Contribution

ibmmq/mqiMQOD.go

@@ -12,7 +12,8 @@ package ibmmq
   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
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
    Contributors:
      Mark Taylor - Initial Contribution