Skip to content

Commit 233f16e

Browse files
committed
Updates for MQ 9.4.0: zHyperlink
Fix for #1
1 parent d808420 commit 233f16e

35 files changed

+202
-70
lines changed

CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
History (newest at top)
33
=======================
44

5+
Jun 2024 (v5.5)
6+
* Update for MQ 9.4.0
7+
* New stats available for zHyperlink
8+
* Remove trailing spaces for ApplType (#1)
9+
* Initial build option added for MacOS
10+
511
Feb 2024 (v5.4.5)
612
* Update for MQ V9.3.5
713
* QCCT now has info about 64-bit CHIN storage use

bin/aix/convH

0 Bytes
Binary file not shown.

bin/aix/mqsmfcsv

2.84 KB
Binary file not shown.

bin/linux/convH

-16 Bytes
Binary file not shown.

bin/linux/mqsmfcsv

-24 Bytes
Binary file not shown.

bin/win/mqsmfcsv.exe

14.5 KB
Binary file not shown.

src/M

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plat=`uname`
44

55
if [ -z "$VERS" ]
66
then
7-
VERS="935"
7+
VERS="940"
88
fi
99

1010
if [ "$plat" = "AIX" ]
@@ -13,6 +13,13 @@ then
1313
cc="xlc"
1414
targdir="../bin/aix"
1515
optim="-O3"
16+
elif [ "$plat" = "Darwin" ]
17+
then
18+
# Ought to work through the -W flags so they can be removed without compiler warnings
19+
flags="-m64 -Wno-pragma-pack $CCEXTRAFLAGS -D PLATFORM_MACOS"
20+
cc="gcc"
21+
targdir="../bin/macos"
22+
optim="-O3"
1623
else
1724
flags="-m64 $CCEXTRAFLAGS -D PLATFORM_LINUX"
1825
cc="gcc"
@@ -31,14 +38,19 @@ else
3138
flags="$flags $optim"
3239
fi
3340

34-
export PLATFLAGS=$flags CC=$cc VERS=$VERS
41+
PLATFLAGS=$flags
42+
CC=$cc
43+
VERS=$VERS
44+
export PLATFLAGS CC VERS
45+
3546
make -e -f Makefile.unix $*
3647
rc=$?
3748
if [ $rc -ne 0 ]
3849
then
3950
exit $rc
4051
fi
4152

53+
mkdir -p $targdir >/dev/null 2>&1
4254
rm -f $targdir/convH $targdir/mqsmfcsv
4355
cp convH mqsmfcsv $targdir
4456

src/Makefile.gcc.win

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CC=i686-w64-mingw32-gcc
33
# CFLAGS= -I. -m32 -fpack-struct=8 -DPLATFORM_WINDOWS
44
CFLAGS= -I. -m32 -DPLATFORM_WINDOWS
55
PLATFLAGS=
6-
VERS=935
6+
VERS=940
77
SRC = mqsmf.c \
88
smfDDL.c \
99
smfDate.c \
@@ -54,7 +54,7 @@ all: sizeTest shipTest
5454

5555
sizeTest: mqsmfcsv.exe
5656
./mqsmfcsv.exe -v > sizes.tmp
57-
diff -b sizes.tmp sizes.master.$(VERS)
57+
diff -b sizes.tmp sizes/sizes.master.$(VERS)
5858

5959
shipTest: mqsmfcsv.exe
6060
cd ../testing/shipTest;./shipTest.sh csv sql json

src/Makefile.unix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ tests: all
5454

5555
sizeTest: mqsmfcsv
5656
./mqsmfcsv -v > sizes.tmp
57-
diff -b sizes.tmp sizes.master.$(VERS)
57+
diff -b sizes.tmp sizes/sizes.master.$(VERS)
5858

5959
shipTest: mqsmfcsv
6060
cd ../testing/shipTest;./shipTest.sh csv sql json

src/Makefile.win

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
2-
VERS=935
2+
VERS=940
33
SRC = mqsmf.c \
44
smfDDL.c \
55
smfDate.c \
@@ -46,10 +46,10 @@ HDR = mqsmfstrucW.h \
4646

4747
checkSize: mqsmfcsv.exe
4848
mqsmfcsv.exe -v > sizes.tmp
49-
diff -b sizes.tmp sizes.master.$(VERS)
49+
diff -b sizes.tmp sizes/sizes.master.$(VERS)
5050

5151
mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
52-
rm -f $@
52+
del /q $@
5353
$(CC) $(SRC) -I. /Fe$@ $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
5454
del /q *.obj
5555
copy $@ ..\bin\win

0 commit comments

Comments
 (0)