Update to MQ 9.1.5; include filtered headerfile for complete build experience

Author: ibmmqmet

CHANGES.md

@@ -1,6 +1,9 @@
 
 History (newest at top)
 =======================
+Apr 2020 (v5.2.1)
+* Update for MQ V9.1.5
+* Include mqsmfstruc.h so you can build without copying a header from z/OS
 
 Dec 2019 (v5.2.0)
 * Add support for MQ 9.1.4 encrypted datasets and logs

bin/aix/convH

@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
 
 plat=`uname`
 
@@ -26,7 +26,7 @@ else
   flags="$flags $optim"
 fi
 
-export PLATFLAGS=$flags CC=$cc VERS=914
+export PLATFLAGS=$flags CC=$cc VERS=915
 make -e -f Makefile.unix $*
 
 rm -f $targdir/convH $targdir/mqsmfcsv

bin/aix/mqsmfcsv

@@ -3,7 +3,7 @@ CC=i686-w64-mingw32-gcc
 # CFLAGS= -I. -m32 -fpack-struct=8 -DPLATFORM_WINDOWS 
 CFLAGS= -I. -m32  -DPLATFORM_WINDOWS 
 PLATFLAGS=
-VERS=914
+VERS=915
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
@@ -49,16 +49,16 @@ sizeTest: mqsmfcsv.exe
 	diff -b sizes.tmp sizes.master
 
 shipTest: mqsmfcsv.exe
-	cd ../testing/shipTest;./shipTest.sh
+	cd ../testing/shipTest;./shipTest.sh csv sql json
 
-mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
+mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy 
 	-rm -f $@
 	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
 	-mkdir out >/dev/null 2>&1 || true
 	cp $@ ../bin/win
 
-mqsmfstruc.h: csqdsmfc-$(VERS).h convH.exe dummy	
-	./convH.exe < csqdsmfc-$(VERS).h > $@
+mqsmfstruc.h: convH.exe  dummy
+	./convH.exe $(VERS) < csqdsmfc-$(VERS).h > $@
 
 convH.exe: convH64.c
 	$(CC) $(CFLAGS) -o $@ convH64.c