Commit ac5287a3 authored by rdubner's avatar rdubner
Browse files

Provisional version 2.5; mostly msys2 package-for-Windows changes

parent cf20e9d8
......@@ -31,6 +31,7 @@ clean:
$(MAKE) -C sfix clean
$(MAKE) -C samples clean
$(MAKE) -C optfde01 clean
$(MAKE) -C msys2 clean
.PHONY : install
install:
......
diff -Naur ./libcob/common.h.orig ./libcob/common.h
--- ./libcob/common.h.orig 2017-09-06 20:37:28.000000000 +0200
+++ ./libcob/common.h 2017-10-25 23:26:58.208945700 +0200
@@ -50,7 +50,7 @@
#endif
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__) /* hack for msys2 patch */
#define CB_FMT_LLD "%I64d"
#define CB_FMT_LLU "%I64u"
@@ -389,12 +389,12 @@
/* Also OK for icc which defines __GNUC__ */
-#if defined(__GNUC__) || (defined(__xlc__) && __IBMC__ >= 700)
+#if defined(__GNUC__) && defined(__MINGW32__) /* hack for msys2 patch */
#define COB_A_NORETURN __attribute__((noreturn))
-#define COB_A_FORMAT12 __attribute__((format(printf, 1, 2)))
-#define COB_A_FORMAT23 __attribute__((format(printf, 2, 3)))
-#define COB_A_FORMAT34 __attribute__((format(printf, 3, 4)))
-#define COB_A_FORMAT45 __attribute__((format(printf, 4, 5)))
+#define COB_A_FORMAT12 __attribute__((format(__MINGW_PRINTF_FORMAT, 1, 2)))
+#define COB_A_FORMAT23 __attribute__((format(__MINGW_PRINTF_FORMAT, 2, 3)))
+#define COB_A_FORMAT34 __attribute__((format(__MINGW_PRINTF_FORMAT, 3, 4)))
+#define COB_A_FORMAT45 __attribute__((format(__MINGW_PRINTF_FORMAT, 4, 5)))
#define DECLNORET
#else
#define COB_A_NORETURN
.PHONY : clean
clean :
rm -fr gnucobol
rm -fr pkg
rm -fr src
rm *.log
rm *.zst
......@@ -5,7 +5,7 @@
_realname=gnucobol
pkgbase=mingw-w64-${_realname}-svn
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-svn
pkgver=.r3538
pkgver=.r3548
_specialversion=-dev
pkgrel=1
pkgdesc="GnuCOBOL, a free and modern COBOL compiler (mingw-w64)"
......
#!/bin/sh
## This routine expects to be running in a folder named
##
## ~/builds/cblgdb/cblgdb-latest/msys2
##
## It also expects to be running in a brand-spanking new instance of
## c:\msys64, one that has been updated with
##
## pacman -Syu pacman
## pacman -Su
##
## and with nothing else, in order to keep the size down as much as
## possible.
##
echo "Remove old /c/msys64-clean...
rm -fr /c/msys64-clean
copy /c/msys64 to /c/msys64-clean...
cp -r /c/msys64 /c/msys64-clean
## Install the prerequisites for the GnuCOBOL package build
pacman --noconfirm -S base-devel
pacman --noconfirm -S mingw-w64-x86_64-toolchain
pacman --noconfirm -S mingw-w64-i686-toolchain
pacman --noconfirm -S mingw-w64-x86_64-db
pacman --noconfirm -S mingw-w64-x86_64-libxml2
pacman --noconfirm -S mingw-w64-i686-db
pacman --noconfirm -S mingw-w64-i686-libxml2
pacman --noconfirm -S apr
pacman --noconfirm -S apr-util
pacman --noconfirm -S libsasl
pacman --noconfirm -S libserf
pacman --noconfirm -S rsync
pacman --noconfirm -S subversion
pacman --noconfirm -S vim
## And it is now time to build the i686 and x_86_64 packages
makepkg-mingw -sCLf
## Having created the packages, install the i686 version:
pacman --noconfirm -U $(ls -t --color=never mingw-w64-i686-gnucobol*.zst | head -n 1)
## Convert over to the MSYS2-MINGW32 environment:
export PATH=/mingw32/bin:$PATH
## Set up the cobc compiler:
export COB_CONFIG_DIR='C:\msys64\mingw32\share\gnucobol\config'
export COB_COPY_DIR='C:\msys64\mingw32\share\gnucobol\copy'
export COB_LIBRARY_PATH='C:\msys64\mingw32\lib\gnucobol'
## With the GnuCOBOL package installed, we can build the cbl-gdb toolchain
cd ..
make clean
make -B
make install
\ No newline at end of file
......@@ -3145,7 +3145,7 @@ if 'gdb' in sys.modules :
## The text "Version x.x" has to appear in square brackets. #
## Don't mess with it! #
###########################################################################
print('registering CPrint (Usage is "print <COBOL identifier>") [Version 2.4]')
print('registering CPrint (Usage is "print <COBOL identifier>") [Version 2.5]')
self.Worker = CPrintWorker()
self.TabFile = TabFileInformation();
......
......@@ -5,4 +5,4 @@
// Linux-only trickery to get the version code in place.
//
#define VERSION "2.4"
#define VERSION "2.5"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment